Moved server/server_utilities up one directory

Also modified makefiles to account for the change.
This commit is contained in:
2016-03-21 19:07:09 +11:00
parent 19792f8aec
commit fd11f4e0e6
17 changed files with 27 additions and 41 deletions
+1 -2
View File
@@ -1,5 +1,5 @@
#include directories
INCLUDES+=. accounts characters clients entities rooms server_utilities triggers ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
INCLUDES+=. accounts characters clients entities rooms triggers ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities
#libraries
#the order of the $(LIBS) is important, at least for MinGW
@@ -35,7 +35,6 @@ all: $(OBJ) $(OUT)
$(MAKE) -C entities
# $(MAKE) -C monsters
$(MAKE) -C rooms
$(MAKE) -C server_utilities
$(MAKE) -C triggers
$(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS)