From e1bea5e571df5c40a72bbca7fde23457246addad Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 2 Dec 2016 23:25:39 +1100 Subject: [PATCH] Entire project builds on CentOS7, server runs --- server/{Inventory => inventory}/inventory.cpp | 0 server/{Inventory => inventory}/inventory.hpp | 0 server/{Inventory => inventory}/inventory_manager.cpp | 0 server/{Inventory => inventory}/inventory_manager.hpp | 0 server/{Inventory => inventory}/item_data.cpp | 0 server/{Inventory => inventory}/item_data.hpp | 0 server/{Inventory => inventory}/makefile | 0 server/makefile | 6 ++++-- 8 files changed, 4 insertions(+), 2 deletions(-) rename server/{Inventory => inventory}/inventory.cpp (100%) rename server/{Inventory => inventory}/inventory.hpp (100%) rename server/{Inventory => inventory}/inventory_manager.cpp (100%) rename server/{Inventory => inventory}/inventory_manager.hpp (100%) rename server/{Inventory => inventory}/item_data.cpp (100%) rename server/{Inventory => inventory}/item_data.hpp (100%) rename server/{Inventory => inventory}/makefile (100%) diff --git a/server/Inventory/inventory.cpp b/server/inventory/inventory.cpp similarity index 100% rename from server/Inventory/inventory.cpp rename to server/inventory/inventory.cpp diff --git a/server/Inventory/inventory.hpp b/server/inventory/inventory.hpp similarity index 100% rename from server/Inventory/inventory.hpp rename to server/inventory/inventory.hpp diff --git a/server/Inventory/inventory_manager.cpp b/server/inventory/inventory_manager.cpp similarity index 100% rename from server/Inventory/inventory_manager.cpp rename to server/inventory/inventory_manager.cpp diff --git a/server/Inventory/inventory_manager.hpp b/server/inventory/inventory_manager.hpp similarity index 100% rename from server/Inventory/inventory_manager.hpp rename to server/inventory/inventory_manager.hpp diff --git a/server/Inventory/item_data.cpp b/server/inventory/item_data.cpp similarity index 100% rename from server/Inventory/item_data.cpp rename to server/inventory/item_data.cpp diff --git a/server/Inventory/item_data.hpp b/server/inventory/item_data.hpp similarity index 100% rename from server/Inventory/item_data.hpp rename to server/inventory/item_data.hpp diff --git a/server/Inventory/makefile b/server/inventory/makefile similarity index 100% rename from server/Inventory/makefile rename to server/inventory/makefile diff --git a/server/makefile b/server/makefile index 02a9386..419f62e 100644 --- a/server/makefile +++ b/server/makefile @@ -7,10 +7,12 @@ LIBS+=server.a ../libcommon.a ../libturtlegui.a ../libturtlemap.a -lSDL2_net ifeq ($(OS),Windows_NT) LIBS+=-lwsock32 -liphlpapi -lmingw32 endif -LIBS+=-lSDL2main -lSDL2 -llua -lsqlite3 +LIBS+=-lSDL2main -lSDL2 -lsqlite3 ifeq ($(shell uname), Linux) #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 #flags