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

Removed common/ from the build process, and the DEBUG flag

Browse Source 
The common/ directory is empty, only containing more directories to be
built, and the DEBUG flag isn't being used.
This commit is contained in:
Kayne Ruse
2014-05-26 02:21:56 +10:00
parent c2eb08bd5e
commit a47e76845f
11 changed files with 21 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/makefile
+2 -2
View File
@@ -1,7 +1,7 @@
#config
INCLUDES+=. scenes ../common ../common/gameplay ../common/graphics ../common/map ../common/network ../common/ui ../common/utilities
INCLUDES+=. scenes ../common/gameplay ../common/graphics ../common/map ../common/network ../common/ui ../common/utilities
LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)
client/scenes/makefile
+2 -2
View File
@@ -1,7 +1,7 @@
#config
INCLUDES+=. .. ../../common ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/ui ../../common/utilities
INCLUDES+=. .. ../../common/gameplay ../../common/graphics ../../common/map ../../common/network ../../common/ui ../../common/utilities
LIBS+=libclient.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)
common/gameplay/makefile
+2 -2
View File
@@ -1,7 +1,7 @@
#config
INCLUDES+=. ..
INCLUDES+=.
LIBS+=
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)
common/graphics/makefile
+2 -2
View File
@@ -1,7 +1,7 @@
#config
INCLUDES+=. .. ../map
INCLUDES+=. ../map
LIBS+=
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)
common/makefile
+1 -32
View File
@@ -1,22 +1,4 @@
#config
INCLUDES+=. ..
LIBS+=
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)
#objects
OBJDIR=obj
OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
#output
OUTDIR=../..
OUT=$(addprefix $(OUTDIR)/,libcommon.a)
#targets
all: $(OBJ) $(OUT)
ar -crs $(OUT) $(OBJ)
all:
$(MAKE) -C gameplay
$(MAKE) -C graphics
$(MAKE) -C map
@@ -25,19 +7,6 @@ all: $(OBJ) $(OUT)
$(MAKE) -C ui
$(MAKE) -C utilities
$(OBJ): | $(OBJDIR)
$(OUT): | $(OUTDIR)
$(OBJDIR):
mkdir $(OBJDIR)
$(OUTDIR):
mkdir $(OUTDIR)
$(OBJDIR)/%.o: %.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
clean:
$(RM) *.o *.a *.exe
common/map/makefile
+2 -2
View File
@@ -1,7 +1,7 @@
#config
INCLUDES+=. .. ../utilities
INCLUDES+=. ../utilities
LIBS+=
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)
common/network/makefile
+2 -2
View File
@@ -1,7 +1,7 @@
#config
INCLUDES+=. .. ../gameplay ../map ../utilities
INCLUDES+=. ../gameplay ../map ../utilities
LIBS+=
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)
common/script/makefile
+2 -2
View File
@@ -1,7 +1,7 @@
#config
INCLUDES+=. .. ../map ../utilities
INCLUDES+=. ../map ../utilities
LIBS+=
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)
common/ui/makefile
+2 -2
View File
@@ -1,7 +1,7 @@
#config
INCLUDES+=. .. ../graphics
INCLUDES+=. ../graphics
LIBS+=
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)
common/utilities/makefile
+2 -2
View File
@@ -1,7 +1,7 @@
#config
INCLUDES+=. ..
INCLUDES+=.
LIBS+=
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)
server/makefile
+2 -2
View File
@@ -1,7 +1,7 @@
#config
INCLUDES+=. ../common ../common/gameplay ../common/map ../common/network ../common/script ../common/utilities
INCLUDES+=. ../common/gameplay ../common/map ../common/network ../common/script ../common/utilities
LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
#source
CXXSRC=$(wildcard *.cpp)