From b98dbac4ed2f755ce71bd9be17f26a3f86c1e3cc Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Tue, 4 Jul 2017 15:15:48 -0400 Subject: Lots of changes * client no longer crashes when closed * started work on adding physics types * some bugfixes to core lua api --- Makefile | 83 +++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 38 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 216a7dd..e086dd3 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ CLIENT_EXE=borkengin.exe CLIENT_PATH=bin/client/bin/$(CLIENT_EXE) CLIENT_SRC=src/client/ +CLIENT_BUILD=build/client/ SERVER_EXE=borkserver.exe MASTER_EXE=borkmaster.exe @@ -9,7 +10,7 @@ MASTER_EXE=borkmaster.exe CC=g++ #Change this on linux -RM=rm +RM=del #Include directories ILUADIR=./lib/luajit/LuaJIT-2.0.4/src @@ -24,60 +25,66 @@ LIBRARIES=-L$(LLUADIR) -L$(LIRRDIR) -L$(LBULDIR) LIBS=-llua51 -lopengl32 -lm -lIrrlicht -lBulletDynamics -lBulletCollision -lLinearMath #can't compile with -std=c++11 because irrlicht will complain -CFLAGS=-Wall -O3 $(INCLUDES) $(LIBRARIES) +CFLAGS=-Wall -g $(INCLUDES) $(LIBRARIES) LDFLAGS=-mwindows +all : $(CLIENT_PATH) + +$(CLIENT_PATH) : $(CLIENT_BUILD)main.o $(CLIENT_BUILD)initdevice.o $(CLIENT_BUILD)menuhandeler.o $(CLIENT_BUILD)load_gui.o $(CLIENT_BUILD)callbackhandeler.o $(CLIENT_BUILD)load_game.o $(CLIENT_BUILD)load_core.o $(CLIENT_BUILD)load_phys.o + $(CC) -o $(CLIENT_PATH) $(CFLAGS) $(LIBS) $(CLIENT_BUILD)main.o $(CLIENT_BUILD)initdevice.o $(CLIENT_BUILD)menuhandeler.o $(CLIENT_BUILD)load_gui.o $(CLIENT_BUILD)load_core.o $(CLIENT_BUILD)iguibutton.o $(CLIENT_BUILD)iguilabel.o $(CLIENT_BUILD)iguigeneric.o $(CLIENT_BUILD)iguielement.o $(CLIENT_BUILD)icamera.o $(CLIENT_BUILD)imesh.o $(CLIENT_BUILD)bphysbox.o $(CLIENT_BUILD)igeneric.o $(CLIENT_BUILD)callbackhandeler.o $(CLIENT_BUILD)hashmap.o $(CLIENT_BUILD)load_game.o $(CLIENT_BUILD)load_phys.o + #Compile the client -main.o : - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)main.o $(CLIENT_SRC)main.cpp +$(CLIENT_BUILD)main.o : $(CLIENT_SRC)main.cpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)main.o $(CLIENT_SRC)main.cpp + +$(CLIENT_BUILD)initdevice.o : $(CLIENT_SRC)initdevice.cpp $(CLIENT_SRC)initdevice.hpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)initdevice.o $(CLIENT_SRC)initdevice.cpp + +$(CLIENT_BUILD)menuhandeler.o : $(CLIENT_SRC)menuhandeler.cpp $(CLIENT_SRC)menuhandeler.hpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)menuhandeler.o $(CLIENT_SRC)menuhandeler.cpp -initdevice.o : - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)initdevice.o $(CLIENT_SRC)initdevice.cpp +$(CLIENT_BUILD)load_game.o : $(CLIENT_SRC)lua_api/load_game.cpp $(CLIENT_SRC)lua_api/load_game.hpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_game.o $(CLIENT_SRC)lua_api/load_game.cpp -menuhandeler.o : - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)menuhandeler.o $(CLIENT_SRC)menuhandeler.cpp +$(CLIENT_BUILD)load_gui.o : $(CLIENT_BUILD)iguibutton.o $(CLIENT_BUILD)iguilabel.o $(CLIENT_BUILD)iguielement.o $(CLIENT_BUILD)iguigeneric.o + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_gui.o $(CLIENT_SRC)lua_api/load_gui.cpp -load_game.o : - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)load_game.o $(CLIENT_SRC)lua_api/load_game.cpp +$(CLIENT_BUILD)load_phys.o : $(CLIENT_BUILD)bphysbox.o + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_phys.o $(CLIENT_SRC)lua_api/load_phys.cpp -load_gui.o : iguibutton.o iguilabel.o iguielement.o iguigeneric.o - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)load_gui.o $(CLIENT_SRC)lua_api/load_gui.cpp +$(CLIENT_BUILD)load_core.o : $(CLIENT_BUILD)icamera.o $(CLIENT_BUILD)imesh.o $(CLIENT_BUILD)bphysbox.o + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)load_core.o $(CLIENT_SRC)lua_api/load_core.cpp -load_core.o : icamera.o imesh.o - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)load_core.o $(CLIENT_SRC)lua_api/load_core.cpp +$(CLIENT_BUILD)iguibutton.o : $(CLIENT_SRC)lua_api/gui/iguibutton.cpp $(CLIENT_SRC)lua_api/gui/iguibutton.hpp $(CLIENT_SRC)lua_api/guiparts.hpp $(CLIENT_SRC)callbackhandeler.hpp $(CLIENT_SRC)util/hashmap.h + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguibutton.o $(CLIENT_SRC)lua_api/gui/iguibutton.cpp -iguibutton.o : - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)iguibutton.o $(CLIENT_SRC)lua_api/gui/iguibutton.cpp +$(CLIENT_BUILD)iguilabel.o : $(CLIENT_SRC)lua_api/gui/iguilabel.cpp $(CLIENT_SRC)lua_api/gui/iguilabel.hpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguilabel.o $(CLIENT_SRC)lua_api/gui/iguilabel.cpp -iguilabel.o: - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)iguilabel.o $(CLIENT_SRC)lua_api/gui/iguilabel.cpp +$(CLIENT_BUILD)iguielement.o : $(CLIENT_BUILD)hashmap.o $(CLIENT_SRC)lua_api/gui/iguielement.cpp $(CLIENT_SRC)lua_api/gui/iguielement.hpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguielement.o $(CLIENT_SRC)lua_api/gui/iguielement.cpp -iguielement.o : hashmap.o - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)iguielement.o $(CLIENT_SRC)lua_api/gui/iguielement.cpp +$(CLIENT_BUILD)iguigeneric.o : $(CLIENT_SRC)lua_api/gui/iguigeneric.cpp $(CLIENT_SRC)lua_api/gui/iguigeneric.hpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)iguigeneric.o $(CLIENT_SRC)lua_api/gui/iguigeneric.cpp -iguigeneric.o : - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)iguigeneric.o $(CLIENT_SRC)lua_api/gui/iguigeneric.cpp +$(CLIENT_BUILD)icamera.o : $(CLIENT_BUILD)igeneric.o $(CLIENT_SRC)lua_api/scene/icamera.cpp $(CLIENT_SRC)lua_api/scene/icamera.hpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)icamera.o $(CLIENT_SRC)lua_api/scene/icamera.cpp -icamera.o: igeneric.o - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)icamera.o $(CLIENT_SRC)lua_api/scene/icamera.cpp +$(CLIENT_BUILD)imesh.o : $(CLIENT_SRC)lua_api/scene/imesh.cpp $(CLIENT_SRC)lua_api/scene/imesh.hpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)imesh.o $(CLIENT_SRC)lua_api/scene/imesh.cpp -imesh.o: - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)imesh.o $(CLIENT_SRC)lua_api/scene/imesh.cpp +$(CLIENT_BUILD)igeneric.o: $(CLIENT_SRC)lua_api/scene/igeneric.cpp $(CLIENT_SRC)lua_api/scene/igeneric.hpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)igeneric.o $(CLIENT_SRC)lua_api/scene/igeneric.cpp -igeneric.o: - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)igeneric.o $(CLIENT_SRC)lua_api/scene/igeneric.cpp +$(CLIENT_BUILD)bphysbox.o: $(CLIENT_SRC)lua_api/phys/bphysbox.cpp $(CLIENT_SRC)lua_api/phys/bphysbox.hpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)bphysbox.o $(CLIENT_SRC)lua_api/phys/bphysbox.cpp -callbackhandeler.o : - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)callbackhandeler.o $(CLIENT_SRC)callbackhandeler.cpp +$(CLIENT_BUILD)callbackhandeler.o : $(CLIENT_SRC)callbackhandeler.cpp $(CLIENT_SRC)callbackhandeler.hpp + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)callbackhandeler.o $(CLIENT_SRC)callbackhandeler.cpp -hashmap.o : - $(CC) $(CFLAGS) -c -o $(CLIENT_SRC)hashmap.o $(CLIENT_SRC)util/hashmap.c +$(CLIENT_BUILD)hashmap.o : $(CLIENT_SRC)util/hashmap.c $(CLIENT_SRC)util/hashmap.h + $(CC) $(CFLAGS) -c -o $(CLIENT_BUILD)hashmap.o $(CLIENT_SRC)util/hashmap.c -$(CLIENT_EXE) : main.o initdevice.o menuhandeler.o load_gui.o callbackhandeler.o load_game.o load_core.o - $(CC) -o $(CLIENT_PATH) $(CFLAGS) $(LIBS) $(CLIENT_SRC)main.o $(CLIENT_SRC)initdevice.o $(CLIENT_SRC)menuhandeler.o $(CLIENT_SRC)load_gui.o $(CLIENT_SRC)load_core.o $(CLIENT_SRC)iguibutton.o $(CLIENT_SRC)iguilabel.o $(CLIENT_SRC)iguigeneric.o $(CLIENT_SRC)iguielement.o $(CLIENT_SRC)icamera.o $(CLIENT_SRC)imesh.o $(CLIENT_SRC)igeneric.o $(CLIENT_SRC)callbackhandeler.o $(CLIENT_SRC)lua_api/guiparts.hpp $(CLIENT_SRC)hashmap.o $(CLIENT_SRC)load_game.o -all : $(CLIENT_EXE) - $(RM) $(CLIENT_SRC)*.o $(CLIENT_SRC)*.gch clean : - rm $(CLIENT_SRC)*.o - rm $(CLIENT_SRC)*.gch + $(RM) $(CLIENT_BUILD)*.o -- cgit v1.2.3-70-g09d2