X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=71b98f134ce99756706938715a34b52ae4954b8f;hb=72b941af07bbf2673539ad4eea073e68d3bcbbfc;hp=228e095b44286932e9e5233648f07b6def25d0af;hpb=1548fea8c64ebdfde728f33fd2d1537954ebf38b;p=laserbrain_demo

diff --git a/Makefile b/Makefile
index 228e095..71b98f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,32 @@
-src = $(wildcard src/*.cc)
-csrc = $(wildcard src/*.c)
+src = $(wildcard src/*.cc) $(wildcard src/machine/*.cc)
+csrc = $(wildcard src/*.c) $(wildcard src/machine/*.c)
 obj = $(src:.cc=.o) $(csrc:.c=.o)
 dep = $(obj:.o=.d)
-bin = anti
+bin = demo
 
-CFLAGS = -pedantic -Wall -g -I/usr/local/include
-CXXFLAGS = -std=c++11 -pedantic -Wall -g -I/usr/local/include
-LDFLAGS = -L/usr/local/lib $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman -lpthread
+opt = -O0
+dbg = -g
+
+incpath = -Isrc -Isrc/machine -I/usr/local/include
+libpath = -L/usr/local/lib
+
+warn = -pedantic -Wall
+
+CFLAGS = $(warn) $(opt) $(dbg) $(incpath)
+CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath)
+LDFLAGS = $(libpath) $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman -lpthread -lassimp -ltreestore
 
 sys = $(shell uname -s)
 libgl_Linux = -lGL -lGLU -lglut -lGLEW
 libgl_Darwin = -framework OpenGL -framework GLUT -lGLEW
 
-$(bin): $(obj)
+$(bin): .clang_complete $(obj)
 	$(CXX) -o $@ $(obj) $(LDFLAGS)
 
+.clang_complete: Makefile
+	rm -f $@
+	for i in $(CXXFLAGS); do echo $$i >>$@; done
+
 -include $(dep)
 
 %.d: %.c