From bced528a07a2ff1591455e4c4228ec18f8e0532d Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alexandermpickering@gmail.com>
Date: Mon, 10 Apr 2017 19:55:02 -0400
Subject: Added getpos and setpos functions for scene nodes

---
 Makefile | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 06160a6..216a7dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+#Run with mingw32-make
 CLIENT_EXE=borkengin.exe
 CLIENT_PATH=bin/client/bin/$(CLIENT_EXE)
 CLIENT_SRC=src/client/
@@ -6,6 +7,10 @@ SERVER_EXE=borkserver.exe
 MASTER_EXE=borkmaster.exe
 
 CC=g++
+
+#Change this on linux
+RM=rm
+
 #Include directories
 ILUADIR=./lib/luajit/LuaJIT-2.0.4/src
 IIRRDIR=./lib/irrlicht/irrlicht-1.8.4/irrlicht-1.8.4/include
@@ -35,9 +40,12 @@ menuhandeler.o :
 load_game.o :
 	$(CC) $(CFLAGS) -c -o $(CLIENT_SRC)load_game.o $(CLIENT_SRC)lua_api/load_game.cpp
 
-load_gui.o : iguibutton.o iguilabel.o iguielement.o
+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
 
+load_core.o : icamera.o imesh.o
+	$(CC) $(CFLAGS) -c -o $(CLIENT_SRC)load_core.o $(CLIENT_SRC)lua_api/load_core.cpp
+
 iguibutton.o :
 	$(CC) $(CFLAGS) -c -o $(CLIENT_SRC)iguibutton.o $(CLIENT_SRC)lua_api/gui/iguibutton.cpp
 
@@ -47,17 +55,29 @@ iguilabel.o:
 iguielement.o : hashmap.o
 	$(CC) $(CFLAGS) -c -o $(CLIENT_SRC)iguielement.o $(CLIENT_SRC)lua_api/gui/iguielement.cpp
 
+iguigeneric.o :
+	$(CC) $(CFLAGS) -c -o $(CLIENT_SRC)iguigeneric.o $(CLIENT_SRC)lua_api/gui/iguigeneric.cpp
+
+icamera.o: igeneric.o
+	$(CC) $(CFLAGS) -c -o $(CLIENT_SRC)icamera.o $(CLIENT_SRC)lua_api/scene/icamera.cpp
+
+imesh.o:
+	$(CC) $(CFLAGS) -c -o $(CLIENT_SRC)imesh.o $(CLIENT_SRC)lua_api/scene/imesh.cpp
+
+igeneric.o:
+	$(CC) $(CFLAGS) -c -o $(CLIENT_SRC)igeneric.o $(CLIENT_SRC)lua_api/scene/igeneric.cpp
+
 callbackhandeler.o :
 	$(CC) $(CFLAGS) -c -o $(CLIENT_SRC)callbackhandeler.o $(CLIENT_SRC)callbackhandeler.cpp
 
 hashmap.o :
 	$(CC) $(CFLAGS) -c -o $(CLIENT_SRC)hashmap.o $(CLIENT_SRC)util/hashmap.c
 
-$(CLIENT_EXE) : main.o initdevice.o menuhandeler.o load_gui.o callbackhandeler.o load_game.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)iguibutton.o $(CLIENT_SRC)iguilabel.o $(CLIENT_SRC)iguielement.o $(CLIENT_SRC)callbackhandeler.o $(CLIENT_SRC)lua_api/guiparts.hpp $(CLIENT_SRC)hashmap.o $(CLIENT_SRC)load_game.o
+$(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
-- 
cgit v1.2.3-70-g09d2