Browse Source

makefile updates for nix support

Fixes #83
updates to have the makefiles in linux include all necessary files/libs
Image 4 years ago
parent
commit
91c4ff20bd
2 changed files with 4 additions and 4 deletions
  1. 2 2
      EQ2/source/LoginServer/makefile
  2. 2 2
      EQ2/source/WorldServer/makefile

+ 2 - 2
EQ2/source/LoginServer/makefile

@@ -12,8 +12,8 @@ CC=g++
 LINKER=gcc
 DFLAGS=-DEQ2 -DLOGIN
 WFLAGS=-Wall -Wuninitialized -Wwrite-strings -Wcast-qual  -Wcomment -Wcast-align -Wno-deprecated
-COPTS=$(WFLAGS) -g -march=native -O -pthread -pipe -DFX -D_GNU_SOURCE -DINVERSEXY $(DFLAGS) -I/usr/include/mysql -I/usr/mysql/include
-LINKOPTS=-rdynamic -L. -lstdc++ -lm -lz -L/usr/lib/mysql -L/usr/mysql/lib -lmysqlclient -ldl
+COPTS=$(WFLAGS) -g -march=native -O -pthread -pipe -DFX -D_GNU_SOURCE -DINVERSEXY $(DFLAGS) -I/usr/include/mariadb -I/usr/mariadb/include
+LINKOPTS=-rdynamic -L. -lstdc++ -lm -lz -L/usr/lib/x86_64-linux-gnu -lmariadbclient -ldl
 all: $(APP)
 
 $(APP): $(SF)

+ 2 - 2
EQ2/source/WorldServer/makefile

@@ -20,8 +20,8 @@ Lua_W_Flags	= -Wall
 
 
 # World flags
-C_Flags		= `mysql_config --cflags` -march=native -pipe -pthread -std=c++0x
-LD_Flags	= `mysql_config --libs` -rdynamic -lm -Wl,-E -ldl -lreadline
+C_Flags		= -I/usr/include/mariadb -I../depends/fmt/include -I../depends/recastnavigation/Detour/Include -I/usr/local/include/boost -I../depends/glm/ -march=native -pipe -pthread -std=c++0x
+LD_Flags	= -L/usr/lib/x86_64-linux-gnu -lz -lpthread -lmariadbclient -L../depends/recastnavigation/RecastDemo/Build/gmake/lib/Debug -lDebugUtils -lDetour -lDetourCrowd -lDetourTileCache -lRecast -L/usr/local/lib -rdynamic -lm -Wl,-E -ldl -lreadline
 W_Flags		= -Wall -Wno-reorder
 D_Flags		= -DEQ2 -DWORLD -D_GNU_SOURCE