Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CentOS7'

Browse Source
This commit is contained in:
Kayne Ruse
2016-12-02 22:34:59 +11:00
parent 3ddb63700c e1bea5e571
commit afa869f4e6
8 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/Inventory/inventory.cpp → server/inventory/inventory.cpp
View File
server/Inventory/inventory.hpp → server/inventory/inventory.hpp
View File
server/Inventory/inventory_manager.cpp → server/inventory/inventory_manager.cpp
View File
server/Inventory/inventory_manager.hpp → server/inventory/inventory_manager.hpp
View File
server/Inventory/item_data.cpp → server/inventory/item_data.cpp
View File
server/Inventory/item_data.hpp → server/inventory/item_data.hpp
View File
server/Inventory/makefile → server/inventory/makefile
View File
server/makefile
+4 -2
View File
@@ -7,10 +7,12 @@ LIBS+=server.a ../libcommon.a ../libturtlegui.a ../libturtlemap.a -lSDL2_net
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
LIBS+=-lwsock32 -liphlpapi -lmingw32 LIBS+=-lwsock32 -liphlpapi -lmingw32
endif endif
LIBS+=-lSDL2main -lSDL2 -llua -lsqlite3 LIBS+=-lSDL2main -lSDL2 -lsqlite3
ifeq ($(shell uname), Linux) ifeq ($(shell uname), Linux)
#I don't know what this does, but Ubuntu needs it (dynamic linking for lua) #I don't know what this does, but Ubuntu needs it (dynamic linking for lua)
LIBS+=-ldl LIBS+=/usr/local/lib/liblua.a -ldl
else
LIBS+=-llua
endif endif
#flags #flags