X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=Makefile;h=c03fb83ca7ea243fe3723745237045471d859c02;hp=e43c5acc0c4d9ee189e7a8fe79d4d3c18d20710d;hb=80c04e7a9aa6d42f769dd4fa70c2c3113440cbce;hpb=c64bd959ffb4034cb288780f13a351b00fb22ca0

diff --git a/Makefile b/Makefile
index e43c5ac..c03fb83 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-src = $(wildcard src/*.cc) $(wildcard src/machine/*.cc)
-csrc = $(wildcard src/*.c) $(wildcard src/machine/*.c)
+src = $(wildcard src/*.cc) $(wildcard src/machine/*.cc) $(wildcard src/blobs/*.cc)
+csrc = $(wildcard src/*.c) $(wildcard src/machine/*.c) $(wildcard src/blobs/*.c)
 obj = $(src:.cc=.o) $(csrc:.c=.o)
 dep = $(obj:.o=.d)
 bin = demo
 
-opt = -O0
+#opt = -O3 -ffast-math
 dbg = -g
 
 incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2`
@@ -15,11 +15,17 @@ 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 -ldrawtext `pkg-config --libs sdl2`
+		  -lpthread -lassimp -ltreestore -ldrawtext -lgoatvr `pkg-config --libs sdl2`
 
-sys = $(shell uname -s)
+sys = $(shell uname -s | sed 's/MINGW.*/mingw/')
 libgl_Linux = -lGL -lGLU -lGLEW
 libgl_Darwin = -framework OpenGL -lGLEW
+libgl_mingw = -lopengl32 -lglu32 -lglew32
+
+ifeq ($(sys), msys)
+	CFLAGS += -mwin32
+	CXXFLAGS += -mwin32
+endif
 
 $(bin): .clang_complete $(obj)
 	$(CXX) -o $@ $(obj) $(LDFLAGS)
@@ -43,3 +49,7 @@ clean:
 .PHONY: cleandep
 cleandep:
 	rm -f $(dep)
+
+.PHONY: data
+data:
+	tools/prepare_data