X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=3024ee3bc9a358cdc8437dfdb5dc33f612333561;hb=14fd44f4dfec922dae20ccf1225bd1fdb5864ab9;hp=85c4046eb09f6db1e2af646d9fa5f49f9fbad200;hpb=c5c29f4044110dd153ee5ca3b018c812d518a053;p=laserbrain_demo

diff --git a/Makefile b/Makefile
index 85c4046..3024ee3 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`
@@ -17,9 +17,15 @@ CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath)
 LDFLAGS = $(libpath) $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman \
 		  -lpthread -lassimp -ltreestore -ldrawtext -loptcfg -lgoatvr `pkg-config --libs sdl2`
 
-sys = $(shell uname -s)
+sys = $(shell uname -s | sed 's/MSYS.*/msys/')
 libgl_Linux = -lGL -lGLU -lGLEW
 libgl_Darwin = -framework OpenGL -lGLEW
+libgl_msys = -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