Merge branch 'master' of goat:git/laserbrain_demo

[laserbrain_demo] / Makefile

diff --git a/Makefile b/Makefile
index e43c5ac..431e362 100644 (file)
--- 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,7 +15,7 @@ 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 -loptcfg -lgoatvr `pkg-config --libs sdl2`
 
 sys = $(shell uname -s)
 libgl_Linux = -lGL -lGLU -lGLEW
@@ -43,3 +43,7 @@ clean:
 .PHONY: cleandep
 cleandep:
        rm -f $(dep)
+
+.PHONY: data
+data:
+       tools/prepare_data