List of commits:
Subject Hash Author Date (UTC)
Remove Poco from the makefile e6274074304b40f0eaae0e591acadc604388fbaa mse 2022-03-19 17:00:54
Disable texture wrapping in VN 75ed1c845f4643fa4e012f22f5a2bbeacca9d51e mse 2022-03-18 21:39:00
Menu improvements 2ee4efdb3fedb69cbf56711841fc961bd1b4877c mse 2022-03-17 19:32:45
Menu navigation fixes 362878a56a72a43f671d4c6022e53ce124a0cf99 mse 2022-03-17 18:47:50
Rewrite VN engine 4c88d574d4f72794ab17fb5ecdc57fbd2a93cb7e mse 2022-03-16 07:19:06
Add commandKey() function 066858b9a80610248bed69ac7095129a9f142a78 mse 2022-03-14 00:05:46
Fix a multiple selection bug on the trading screen 0c64d03fed96234183bf7bb69819f48472c1aafd mse 2022-03-10 07:14:13
Right joystick moves mouse f59369b8be29e9910ef3e5e807495b46a6403c19 mse 2022-03-06 09:50:35
Add CLEARSCREEN command 57f55faa0fec4c558e8c9a7942cb0f47ddca07d7 mse 2022-03-01 09:35:11
Tint rain ambient color & bump version to v0.7.8 56888b00706faddf9aea8a1930ee784b535c50bf mse 2022-01-31 03:02:45
Add controlKey function 6997d5afe5971694fe0222917f8125dd44b23aa3 mse 2022-01-21 17:23:00
Start CSL function library 4f2a3417450dc7389548cb39e245939c17f03fe9 mse 2021-12-28 19:16:57
Fix non-owning reference bug 65e4d1a89c656acbaced0923dd5f64fd8908b025 mse 2021-12-28 18:45:37
Translate 'Get closer' 86563edde1ef9fd574382b772b34ee78636af82b mse 2021-12-18 16:06:58
Bump version to v0.7.7 e1e9703ff5eec4b0003082052f9035a46a82767a mse 2021-12-18 04:23:49
Add item translation system & change trading text de19b57c624f0317b4fe57086eff3e57f16e3361 mse 2021-12-17 22:32:45
Fix fg3 depth buffer format 65eef1b171eb937c6c213f7af1f1206053183832 mse 2021-12-16 00:57:55
Upgrade fg3 depth precision 153ff3855ec6f47b18eef4b262e42e4c4ccee90b mse 2021-12-15 16:20:26
Translate confec_select and confec_name to Greek 285a98c703de8afd92129cd08147562573785a29 mse 2021-12-15 01:51:04
Update game controller DB 1bc318197ae0f77693da7b7b4f754d7c89f800f6 mse 2021-12-14 14:22:51
Commit e6274074304b40f0eaae0e591acadc604388fbaa - Remove Poco from the makefile
Author: mse
Author date (UTC): 2022-03-19 17:00
Committer name: mse
Committer date (UTC): 2022-03-19 17:00
Parent(s): 75ed1c845f4643fa4e012f22f5a2bbeacca9d51e
Signer:
Signing key:
Signing status: N
Tree: cd8099ee931a992c1bff2d25a4618c743da93079
File Lines added Lines deleted
Makefile 4 40
File Makefile changed (mode: 100644) (index 2698129..011b8a7)
... ... SDL2_DIR=SDL2-$(SDL2_VER)
10 10 SDL2_TAR=$(SDL2_DIR).tar.gz SDL2_TAR=$(SDL2_DIR).tar.gz
11 11 SDL2_WIN_TAR=SDL2-devel-$(SDL2_VER)-mingw.tar.gz SDL2_WIN_TAR=SDL2-devel-$(SDL2_VER)-mingw.tar.gz
12 12
13 # Poco
14 POCO_OPTIONS=-DENABLE_DATA=OFF -DENABLE_DATA_MYSQL=OFF
15 POCO_VER=1.10.1
16 # Checks libversion every invocation.
17 POCO_LIBVER=$(shell tr -d '\r\n' < $(POCO_DIR)/libversion)
18 POCO_DIR=poco-$(POCO_VER)-all
19 POCO_TAR=$(POCO_DIR).tar.bz2
20 POCO_FOUNDATION=libPocoFoundation.so.$(POCO_LIBVER)
21 POCO_NET=libPocoNet.so.$(POCO_LIBVER)
22 POCO_NETSSL=libPocoNetSSL.so.$(POCO_LIBVER)
23 POCO_CRYPTO=libPocoCrypto.so.$(POCO_LIBVER)
24 POCO_LINKS=-l:$(POCO_FOUNDATION) -l:$(POCO_NET) -l:$(POCO_NETSSL) -l:$(POCO_CRYPTO)
25
26 13 # Boost # Boost
27 14 BOOST_VER_MAJOR=1 BOOST_VER_MAJOR=1
28 15 BOOST_VER_MINOR=76 BOOST_VER_MINOR=76
 
... ... LINCXX := $(CXX) -march=x86-64 -include $(shell readlink -f include/force_link_g
45 32 CXXDYNAMIC=$(LINCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -o $(PROGRAM)-dynamic $(PROGRAM).cpp libs.o -Wl,-rpath,. -L. -l:libSDL2.so -pthread CXXDYNAMIC=$(LINCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -o $(PROGRAM)-dynamic $(PROGRAM).cpp libs.o -Wl,-rpath,. -L. -l:libSDL2.so -pthread
46 33 MACCXX=clang++ -march=x86-64 MACCXX=clang++ -march=x86-64
47 34 WINCXX=i686-w64-mingw32-g++-posix -march=pentium4 -static-libgcc -static-libstdc++ WINCXX=i686-w64-mingw32-g++-posix -march=pentium4 -static-libgcc -static-libstdc++
48 #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
35 #CXXFLAGS=-Iinclude -I$(OPENSSL_DIR)/include -I$(BOOST_DIR) -std=$(CXXSTD) -Wall -Wextra -Wfatal-errors
49 36 CXXFLAGS=-Iinclude -I$(BOOST_DIR) -std=$(CXXSTD) -Wall -Wextra -Wfatal-errors CXXFLAGS=-Iinclude -I$(BOOST_DIR) -std=$(CXXSTD) -Wall -Wextra -Wfatal-errors
50 37 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
51 38 MAC_OPENSSL_SSL=libssl-mac.a MAC_OPENSSL_SSL=libssl-mac.a
 
... ... ccvr: libs.o libboost_system.a libSDL2.a $(PROGRAM).cpp $(INCLUDES)
89 76
90 77 # debug build settings may be outdated and broken # debug build settings may be outdated and broken
91 78 debug: clean libs.o libboost_system.a libSDL2.a $(PROGRAM).cpp debug: clean libs.o libboost_system.a libSDL2.a $(PROGRAM).cpp
92 $(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)
79 $(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
93 80
94 81 lint: lint:
95 82 clang-tidy $(PROGRAM).cpp -checks=cert-*-cpp -header-filter=fdungeon.h -- $(CXXDYNAMIC) clang-tidy $(PROGRAM).cpp -checks=cert-*-cpp -header-filter=fdungeon.h -- $(CXXDYNAMIC)
 
... ... $(PROGRAM)-demo.exe: libs-win.o libboost_system-win.a $(WIN_OPENSSL_SSL) $(WIN_O
108 95 -L. -l:$(WIN_OPENSSL_SSL) -l:$(WIN_OPENSSL_CRYPTO) -lwsock32 -lws2_32 -lmingw32 -l:SDL2.dll -l:libSDL2main.a -l:steam_api.dll \ -L. -l:$(WIN_OPENSSL_SSL) -l:$(WIN_OPENSSL_CRYPTO) -lwsock32 -lws2_32 -lmingw32 -l:SDL2.dll -l:libSDL2main.a -l:steam_api.dll \
109 96 -static -lpthread -static -lpthread
110 97
98 # TODO: Rewrite server.
111 99 ccserver: ccserver.cpp $(INCLUDES) ccserver: ccserver.cpp $(INCLUDES)
112 $(LINCXX) $(CXXFLAGS) -O3 -o $@ ccserver.cpp -Wl,-rpath,. -L. -pthread -l:$(POCO_FOUNDATION) -l:$(POCO_NET)
100 $(LINCXX) $(CXXFLAGS) -O3 -o $@ ccserver.cpp -Wl,-rpath,. -L. -pthread
113 101
114 102 # Uncomment the line with the $(BOOST_DIR) dependency when building with Boost::Beast. # Uncomment the line with the $(BOOST_DIR) dependency when building with Boost::Beast.
115 103 #libs.o: libs.cpp micropather.cpp include/tm_json.h $(BOOST_DIR) #libs.o: libs.cpp micropather.cpp include/tm_json.h $(BOOST_DIR)
 
... ... $(SDL2_DIR): $(SDL2_TAR)
217 205 $(SDL2_TAR): $(SDL2_TAR):
218 206 wget https://libsdl.org/release/$(SDL2_TAR) wget https://libsdl.org/release/$(SDL2_TAR)
219 207
220 $(POCO_NET): $(POCO_DIR)
221 mkdir -p $(POCO_DIR)/build
222 cd $(POCO_DIR)/build; cmake $(POCO_OPTIONS) -DCMAKE_BUILD_TYPE=Release .. && make
223 mv $(POCO_DIR)/build/lib/$(POCO_FOUNDATION) .
224 mv $(POCO_DIR)/build/lib/$(POCO_NET) .
225 mv $(POCO_DIR)/build/lib/$(POCO_NETSSL) .
226 mv $(POCO_DIR)/build/lib/$(POCO_CRYPTO) .
227
228 winpoco: $(POCO_DIR)
229 mkdir -p $(POCO_DIR)/build
230 cd $(POCO_DIR)/build; cmake $(POCO_OPTIONS) $(WIN_CMAKE_FLAGS) -DCMAKE_TOOLCHAIN_FILE=../../cross-mingw32-linux.cmake -DCMAKE_BUILD_TYPE=Release .. && make
231 #mv $(POCO_DIR)/build/lib/$(WIN_POCO_FOUNDATION) .
232 #mv $(POCO_DIR)/build/lib/$(WIN_POCO_NET) .
233 #mv $(POCO_DIR)/build/lib/$(WIN_POCO_NETSSL) .
234 #mv $(POCO_DIR)/build/lib/$(WIN_POCO_CRYPTO) .
235
236 $(POCO_DIR): $(POCO_TAR)
237 $(RM) -r $@
238 tar xvf $(POCO_TAR)
239 touch $@
240
241 $(POCO_TAR):
242 wget https://pocoproject.org/releases/poco-$(POCO_VER)/$(POCO_TAR)
243
244 208 libboost_system.a: $(BOOST_DIR) libboost_system.a: $(BOOST_DIR)
245 209 cp $(BOOST_DIR)/stage/lib/$@ . cp $(BOOST_DIR)/stage/lib/$@ .
246 210 touch $@ touch $@
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