From a2f5e367b2483b6c07db5e43296723016ef2d266 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sun, 27 Nov 2016 21:55:21 +1100 Subject: [PATCH] Project builds, don't run it --- client/entities/makefile | 2 +- client/makefile | 4 ++-- client/scenes/makefile | 2 +- makefile | 4 ++-- server/Inventory/makefile | 2 +- server/barriers/makefile | 2 +- server/battles/makefile | 2 +- server/characters/makefile | 2 +- server/creatures/makefile | 2 +- server/linit.cpp | 4 ++-- server/makefile | 4 ++-- server/rooms/makefile | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/client/entities/makefile b/client/entities/makefile index 6d25c17..ca1d809 100644 --- a/client/entities/makefile +++ b/client/entities/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/utilities +INCLUDES+=. .. ../../common/global_defines ../../common/utilities ../../TurtleGUI LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/client/makefile b/client/makefile index 204eff8..f4778e6 100644 --- a/client/makefile +++ b/client/makefile @@ -1,9 +1,9 @@ #include directories -INCLUDES+=. entities scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities +INCLUDES+=. entities scenes ../common/debugging ../common/global_defines ../common/network ../common/network/packet_types ../common/utilities ../TurtleGUI ../TurtleMap #libraries #the order of the $(LIBS) is important, at least for MinGW -LIBS+=client.a ../common/libcommon.a -lSDL2_net +LIBS+=client.a ../libcommon.a ../libturtlegui.a ../libturtlemap.a -lSDL2_net ifeq ($(OS),Windows_NT) LIBS+=-lwsock32 -liphlpapi -lmingw32 endif diff --git a/client/scenes/makefile b/client/scenes/makefile index 40fc4ee..5ab1aaa 100644 --- a/client/scenes/makefile +++ b/client/scenes/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../client_utilities ../entities ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/network/packet_types ../../common/ui ../../common/utilities +INCLUDES+=. .. ../entities ../../common/debugging ../../common/global_defines ../../common/network ../../common/network/packet_types ../../common/utilities ../../TurtleGUI ../../TurtleMap LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/makefile b/makefile index 8a569a6..bcedd4c 100644 --- a/makefile +++ b/makefile @@ -11,8 +11,8 @@ all: $(OUTDIR) dll $(MAKE) -C TurtleGUI $(MAKE) -C TurtleMap $(MAKE) -C common -# $(MAKE) -C server -# $(MAKE) -C client + $(MAKE) -C server + $(MAKE) -C client debug: export CXXFLAGS+=-g debug: clean all diff --git a/server/Inventory/makefile b/server/Inventory/makefile index 8ec0cec..d05cd6a 100644 --- a/server/Inventory/makefile +++ b/server/Inventory/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. ../../common/gameplay +INCLUDES+=. ../../common/global_defines LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/barriers/makefile b/server/barriers/makefile index 169231d..46aa154 100644 --- a/server/barriers/makefile +++ b/server/barriers/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../characters ../creatures ../entities ../inventory ../../common/gameplay ../../common/utilities +INCLUDES+=. .. ../characters ../creatures ../entities ../inventory ../../common/global_defines ../../common/utilities LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/battles/makefile b/server/battles/makefile index 169231d..46aa154 100644 --- a/server/battles/makefile +++ b/server/battles/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../characters ../creatures ../entities ../inventory ../../common/gameplay ../../common/utilities +INCLUDES+=. .. ../characters ../creatures ../entities ../inventory ../../common/global_defines ../../common/utilities LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/characters/makefile b/server/characters/makefile index 624661c..dc3efde 100644 --- a/server/characters/makefile +++ b/server/characters/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../barriers ../battles ../creatures ../entities ../monsters ../inventory ../rooms ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities +INCLUDES+=. .. ../barriers ../battles ../creatures ../entities ../monsters ../inventory ../rooms ../triggers ../../common/global_defines ../../common/network ../../common/network/packet_types ../../common/utilities ../../TurtleMap LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/creatures/makefile b/server/creatures/makefile index 338a917..872d58b 100644 --- a/server/creatures/makefile +++ b/server/creatures/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../entities ../../common/gameplay ../../common/utilities +INCLUDES+=. .. ../entities ../../common/global_defines ../../common/utilities LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/linit.cpp b/server/linit.cpp index 572f902..93da3a3 100644 --- a/server/linit.cpp +++ b/server/linit.cpp @@ -77,8 +77,8 @@ static const luaL_Reg preloadedlibs[] = { {TORTUGA_CREATURE_API, openCreatureAPI}, {TORTUGA_CREATURE_MANAGER_API, openCreatureManagerAPI}, {TORTUGA_NETWORK_API, openNetworkAPI}, - {TORTUGA_REGION_API, openRegionAPI}, - {TORTUGA_REGION_PAGER_API, openRegionPagerAPI}, + {TURTLEMAP_REGION_API, openRegionAPI}, + {TURTLEMAP_REGION_PAGER_API, openRegionPagerAPI}, {TORTUGA_ROOM_API, openRoomAPI}, {TORTUGA_ROOM_MANAGER_API, openRoomManagerAPI}, {TORTUGA_TRIGGER_API, openTriggerAPI}, diff --git a/server/makefile b/server/makefile index 9968c92..02a9386 100644 --- a/server/makefile +++ b/server/makefile @@ -1,9 +1,9 @@ #include directories -INCLUDES+=. accounts barriers battles characters clients creatures entities inventory rooms triggers ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities +INCLUDES+=. accounts barriers battles characters clients creatures entities inventory rooms triggers ../common/debugging ../common/global_defines ../common/network ../common/network/packet_types ../common/utilities ../TurtleGUI ../TurtleMap #libraries #the order of the $(LIBS) is important, at least for MinGW -LIBS+=server.a ../common/libcommon.a -lSDL2_net +LIBS+=server.a ../libcommon.a ../libturtlegui.a ../libturtlemap.a -lSDL2_net ifeq ($(OS),Windows_NT) LIBS+=-lwsock32 -liphlpapi -lmingw32 endif diff --git a/server/rooms/makefile b/server/rooms/makefile index e1170a5..a226648 100644 --- a/server/rooms/makefile +++ b/server/rooms/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. .. ../barriers ../battles ../characters ../creatures ../entities ../inventory ../monsters ../triggers ../../common/gameplay ../../common/map ../../common/network ../../common/network/packet_types ../../common/utilities +INCLUDES+=. .. ../barriers ../battles ../characters ../creatures ../entities ../inventory ../monsters ../triggers ../../common/global_defines ../../common/network ../../common/network/packet_types ../../common/utilities ../../TurtleMap LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))