From 9cf134b743045b1529abe5c4abcf0691d77f3ed0 Mon Sep 17 00:00:00 2001 From: Emagi Date: Wed, 28 Aug 2024 09:37:42 -0400 Subject: [PATCH] update makefiles for 5.4 lua --- source/LoginServer/makefile | 2 +- source/WorldServer/makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/LoginServer/makefile b/source/LoginServer/makefile index e6915c3..5071072 100644 --- a/source/LoginServer/makefile +++ b/source/LoginServer/makefile @@ -14,7 +14,7 @@ CC=g++ LINKER=gcc DFLAGS=-DEQ2 -DLOGIN WFLAGS=-Wall -Wuninitialized -Wwrite-strings -Wcast-qual -Wcomment -Wcast-align -Wno-deprecated -COPTS=$(WFLAGS) -ggdb -march=native -pthread -pipe -DFX -D_GNU_SOURCE -DINVERSEXY $(DFLAGS) -I/usr/include/mariadb -I/usr/local/include/boost -I/usr/include/lua5.3 -std=c++17 +COPTS=$(WFLAGS) -ggdb -march=native -pthread -pipe -DFX -D_GNU_SOURCE -DINVERSEXY $(DFLAGS) -I/usr/include/mariadb -I/usr/local/include/boost -I/usr/include/lua5.4 -std=c++17 LINKOPTS=-rdynamic -L. -lstdc++ -lm -lz -L/usr/lib/x86_64-linux-gnu -lmariadb -lboost_system -lboost_thread -lboost_filesystem -lssl -lcrypto -lpthread -ldl all: $(APP) diff --git a/source/WorldServer/makefile b/source/WorldServer/makefile index ed526bc..b8f661f 100644 --- a/source/WorldServer/makefile +++ b/source/WorldServer/makefile @@ -18,8 +18,8 @@ APP = eq2world Lua_C_Flags = -DLUA_COMPAT_ALL -DLUA_USE_LINUX Lua_W_Flags = -Wall -C_Flags = -I/eq2emu/fmt/include -I/eq2emu/recastnavigation/Detour/Include -I/usr/include/mariadb -I/usr/local/include/boost -I/usr/include/glm -I/usr/include/lua5.3 -march=native -pipe -pthread -std=c++17 -LD_Flags = -L/usr/lib/x86_64-linux-gnu -lmariadb -lz -lpthread -L/eq2emu/recastnavigation/RecastDemo/Build/gmake2/lib/Debug -lDebugUtils -lDetour -lDetourCrowd -lDetourTileCache -lRecast -llua5.3-c++ -L/usr/local/lib -rdynamic -lm -Wl,-E -ldl -lreadline -lssl -lcrypto -lboost_system -lboost_filesystem -lboost_iostreams -lboost_regex +C_Flags = -I/eq2emu/fmt/include -I/eq2emu/recastnavigation/Detour/Include -I/usr/include/mariadb -I/usr/local/include/boost -I/usr/include/glm -I/usr/include/lua5.4 -march=native -pipe -pthread -std=c++17 +LD_Flags = -L/usr/lib/x86_64-linux-gnu -lmariadb -lz -lpthread -L/eq2emu/recastnavigation/RecastDemo/Build/gmake2/lib/Debug -lDebugUtils -lDetour -lDetourCrowd -lDetourTileCache -lRecast -llua5.4-c++ -L/usr/local/lib -rdynamic -lm -Wl,-E -ldl -lreadline -lssl -lcrypto -lboost_system -lboost_filesystem -lboost_iostreams -lboost_regex # World flags W_Flags = -Wall -Wno-reorder