Moved the map systems into their own directory
This commit is contained in:
+1
-1
@@ -1,5 +1,5 @@
|
||||
#config
|
||||
COMMONDIR+=../common
|
||||
COMMONDIR+=../common ../common/mapsystem
|
||||
COMMON+=../libcommon.a
|
||||
LIB+=$(COMMON) -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
|
||||
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
|
||||
|
||||
@@ -19,6 +19,7 @@ OUT=$(addprefix $(OUTDIR)/,libcommon.a)
|
||||
#targets
|
||||
all: $(OBJ) $(OUT)
|
||||
ar -crs $(OUT) $(OBJ)
|
||||
$(MAKE) -C mapsystem
|
||||
|
||||
$(OBJ): | $(OBJDIR)
|
||||
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
#config
|
||||
COMMONDIR+=..
|
||||
COMMON+=../../libcommon.a
|
||||
LIB+=
|
||||
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
|
||||
CFLAGS+=-DDEBUG $(addprefix -I,$(COMMONDIR))
|
||||
|
||||
#source
|
||||
CXXSRC=$(wildcard *.cpp)
|
||||
CSRC=$(wildcard *.c)
|
||||
|
||||
#objects
|
||||
OBJDIR=obj
|
||||
OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
|
||||
OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
|
||||
|
||||
#output
|
||||
OUTDIR=../..
|
||||
OUT=$(addprefix $(OUTDIR)/,libcommon.a)
|
||||
|
||||
#targets
|
||||
all: $(OBJ) $(OUT)
|
||||
ar -crs $(OUT) $(OBJ)
|
||||
|
||||
$(OBJ): | $(OBJDIR)
|
||||
|
||||
$(OUT): | $(OUTDIR)
|
||||
|
||||
$(OBJDIR):
|
||||
mkdir $(OBJDIR)
|
||||
|
||||
$(OUTDIR):
|
||||
mkdir $(OUTDIR)
|
||||
|
||||
$(OBJDIR)/%.o: %.cpp
|
||||
$(CXX) $(CXXFLAGS) -c -o $@ $<
|
||||
|
||||
$(OBJDIR)/%.o: %.c
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
clean:
|
||||
$(RM) *.o *.a *.exe
|
||||
|
||||
rebuild: clean all
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
#config
|
||||
COMMONDIR+=../common
|
||||
COMMONDIR+=../common ../common/mapsystem
|
||||
COMMON+=../libcommon.a
|
||||
LIB+=$(COMMON) -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
|
||||
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
#config
|
||||
COMMONDIR+=../common
|
||||
COMMONDIR+=../common ../common/mapsystem
|
||||
COMMON+=../libcommon.a
|
||||
LIB+=$(COMMON) -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
|
||||
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
|
||||
|
||||
Reference in New Issue
Block a user