List of commits:
Subject Hash Author Date (UTC)
Make C++ standard version configurable b100287447ddf4aa503ebac88710b0b92e25aa7f mse 2021-11-04 15:56:47
Fix zoom for particles 5c80a4a30c13672f00df8f3d74297908c132f45d mse 2021-11-04 14:54:34
Use 2 different speed curves for smart zoom 56f9cd38408e4cd3ed08b75b00b131a0bc236b56 mse 2021-10-22 01:51:47
Improve smart zoom math 87da264dca8c443c24a6340002a8cd8169a1446b mse 2021-10-17 10:11:14
Add smart zoom cc57dc0952db6c59d06ef7a9b5c5526f7801945f mse 2021-10-16 09:13:49
Housekeeping 76d7571c34241141c6e2a6315de5e5b513db5209 mse 2021-10-07 07:33:20
Fix font kerning support ab4cbabbed82f629d616f8878790e7d2666524eb mse 2021-10-02 21:10:14
Add default soundspec volume 82a658f2e2bd786618228346bc1848c1be894054 mse 2021-09-30 05:23:43
Fix Windows build and update SDL d8f30e756bc4d5a63e5b7524db2b69ae5af4f88f mse 2021-09-29 23:31:25
Update gamecontrollerdb 3da6ad2629e0b28cad34b3ff7a89c0fe0d96a2fd mse 2021-09-29 23:02:39
Parse newline escape sequences in caption ff33cfb3e88098ae24a6afa1cc7ac9049b6e4c1f mse 2021-09-27 23:45:58
Fix loadOBJ(...) 0b307ff98c2aa8f79d62770b3e2aff6fb7d8670a mse 2021-09-25 05:18:15
Add uploadModelTransforms(...) 53530b8cabe72cfa6c71148bd484a1b5a17df565 mse 2021-09-23 14:33:47
Readability a5885db68a6134c7c3930b6cf10650f0b340088d mse 2021-09-13 15:56:30
Pad HUD health with 0 267304751e17901c276108d8899d096e2094cb2a mse 2021-09-13 11:02:57
Housekeeping 6ff79e3a21829e267e866a8472777e180d337ff4 mse 2021-09-13 07:33:00
Add CSL comments 7a818e8b57cb38c9bfef922e66bd6f735b4962e4 mse 2021-09-12 09:26:07
Add Confectioner Scripting Language (CSL) & change array separator to ; 8d980bfac5d649574f749b7c04a19af766f71091 mse 2021-09-11 12:31:58
Fix console /set bug 7c45e27e7f40472bea317b0316e4367135b49704 mse 2021-09-11 01:32:11
Scriptable lines@, ids@, bugfix 9f606fd2a793fd76a9d1b9e186434d231b973085 mse 2021-09-10 14:43:50
Commit b100287447ddf4aa503ebac88710b0b92e25aa7f - Make C++ standard version configurable
Author: mse
Author date (UTC): 2021-11-04 15:56
Committer name: mse
Committer date (UTC): 2021-11-04 15:56
Parent(s): 5c80a4a30c13672f00df8f3d74297908c132f45d
Signing key:
Tree: fae84bd2e45db443cf53d2845c80ca678e9735dc
File Lines added Lines deleted
Makefile 6 4
File Makefile changed (mode: 100644) (index ca1d7e8..81629dc)
1 1 PROGRAM=confec PROGRAM=confec
2 2 PROGRAM_DRMFREE=cave-confec PROGRAM_DRMFREE=cave-confec
3 3 INCLUDES=include/fworld.h include/civilian.h INCLUDES=include/fworld.h include/civilian.h
4 # Change the value of CXXSTD depending on what is supported by your compiler. Older compilers may require c++1z
5 CXXSTD=c++17
4 6
5 7 # SDL2 # SDL2
6 8 SDL2_VER=2.0.16 SDL2_VER=2.0.16
 
... ... LINCXX := $(CXX) -march=x86-64 -include $(shell readlink -f include/force_link_g
42 44 CXXDYNAMIC=$(LINCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -o $(PROGRAM)-dynamic $(PROGRAM).cpp libs.o libboost_system.a -Wl,-rpath,. -L. -l:libSDL2.so -lssl -lcrypto -pthread CXXDYNAMIC=$(LINCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -o $(PROGRAM)-dynamic $(PROGRAM).cpp libs.o libboost_system.a -Wl,-rpath,. -L. -l:libSDL2.so -lssl -lcrypto -pthread
43 45 MACCXX=clang++ -march=x86-64 MACCXX=clang++ -march=x86-64
44 46 WINCXX=i686-w64-mingw32-g++-posix -march=pentium4 -static-libgcc -static-libstdc++ WINCXX=i686-w64-mingw32-g++-posix -march=pentium4 -static-libgcc -static-libstdc++
45 CXXFLAGS=-Iinclude -I$(OPENSSL_DIR)/include -I$(BOOST_DIR) -I$(POCO_DIR)/Foundation/include -I$(POCO_DIR)/Net/include -I$(POCO_DIR)/NetSSL_OpenSSL/include -I$(POCO_DIR)/Crypto/include -std=c++17 -Wall -Wextra -Wfatal-errors
47 CXXFLAGS=-Iinclude -I$(OPENSSL_DIR)/include -I$(BOOST_DIR) -I$(POCO_DIR)/Foundation/include -I$(POCO_DIR)/Net/include -I$(POCO_DIR)/NetSSL_OpenSSL/include -I$(POCO_DIR)/Crypto/include -std=$(CXXSTD) -Wall -Wextra -Wfatal-errors
46 48 WIN_CMAKE_FLAGS=-DCMAKE_C_COMPILER=i686-w64-mingw32-gcc-win32 -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++-win32 -DCMAKE_C_COMPILER_WORKS=1 -DCMAKE_CXX_COMPILER_WORKS=1 WIN_CMAKE_FLAGS=-DCMAKE_C_COMPILER=i686-w64-mingw32-gcc-win32 -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++-win32 -DCMAKE_C_COMPILER_WORKS=1 -DCMAKE_CXX_COMPILER_WORKS=1
47 49 MAC_OPENSSL_SSL=libssl-mac.a MAC_OPENSSL_SSL=libssl-mac.a
48 50 MAC_OPENSSL_CRYPTO=libcrypto-mac.a MAC_OPENSSL_CRYPTO=libcrypto-mac.a
 
... ... ccvr: libs.o libboost_system.a libSDL2.a $(PROGRAM).cpp $(INCLUDES)
79 81 -Wl,-rpath,. -L. -ldl -lssl -lcrypto -pthread -lopenxr_loader -lsteam_api -Wl,-rpath,. -L. -ldl -lssl -lcrypto -pthread -lopenxr_loader -lsteam_api
80 82
81 83 debug: clean libs.o libboost_system.a libSDL2.a $(PROGRAM).cpp debug: clean libs.o libboost_system.a libSDL2.a $(PROGRAM).cpp
82 $(LINCXX) -Iinclude -I$(BOOST_DIR) -std=c++17 -Wall -Wextra -Wfatal-errors -g -D__STEAM__ -o $@ $(PROGRAM).cpp libs.o libboost_system.a libSDL2.a -Wl,-rpath,. -L. -ldl -lssl -lcrypto -pthread -lsteam_api $(POCO_LINKS)
84 $(LINCXX) -Iinclude -I$(BOOST_DIR) -std=$(CXXSTD) -Wall -Wextra -Wfatal-errors -g -D__STEAM__ -o $@ $(PROGRAM).cpp libs.o libboost_system.a libSDL2.a -Wl,-rpath,. -L. -ldl -lssl -lcrypto -pthread -lsteam_api $(POCO_LINKS)
83 85
84 86 lint: lint:
85 87 clang-tidy $(PROGRAM).cpp -checks=cert-*-cpp -header-filter=fdungeon.h -- $(CXXDYNAMIC) clang-tidy $(PROGRAM).cpp -checks=cert-*-cpp -header-filter=fdungeon.h -- $(CXXDYNAMIC)
 
... ... libboost_system-win.a: $(BOOST_DIR)
225 227 cd $(BOOST_DIR) && \ cd $(BOOST_DIR) && \
226 228 echo "using gcc : mingw32 : i686-w64-mingw32-g++-posix ;" > win-config.jam && \ echo "using gcc : mingw32 : i686-w64-mingw32-g++-posix ;" > win-config.jam && \
227 229 ./bootstrap.sh && \ ./bootstrap.sh && \
228 ./b2 --with-system --user-config=win-config.jam toolset=gcc-mingw32 target-os=windows cxxflags="-std=c++17" --layout=tagged architecture=x86 address-model=32 release
230 ./b2 --with-system --user-config=win-config.jam toolset=gcc-mingw32 target-os=windows cxxflags="-std=$(CXXSTD)" --layout=tagged architecture=x86 address-model=32 release
229 231 touch $(BOOST_DIR) touch $(BOOST_DIR)
230 232 cp $(BOOST_DIR)/stage/lib/libboost_system-mt-x32.a $@ cp $(BOOST_DIR)/stage/lib/libboost_system-mt-x32.a $@
231 233 touch $@ touch $@
 
... ... $(BOOST_DIR): $(BOOST_TAR)
234 236 $(RM) -r $@ $(RM) -r $@
235 237 tar xvf $(BOOST_TAR) tar xvf $(BOOST_TAR)
236 238 # POSIX target # POSIX target
237 cd $@ && ./bootstrap.sh && ./b2 --with-system cxxflags="-std=c++17" release
239 cd $@ && ./bootstrap.sh && ./b2 --with-system cxxflags="-std=$(CXXSTD)" release
238 240 touch $@ touch $@
239 241
240 242 $(BOOST_TAR): $(BOOST_TAR):
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using git:
git clone git://git.rocketgit.com/user/mse/ConfectionerEngine

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main