load exhibits fails because loading is async

[laserbrain_demo] / Makefile

diff --git a/Makefile b/Makefile
index 82b42ca..ae16e3e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,31 @@
-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
+incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2`
 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
+LDFLAGS = $(libpath) $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman \
+                 -lpthread -lassimp -ltreestore -ldrawtext -loptcfg -lgoatvr `pkg-config --libs sdl2`
 
-sys = $(shell uname -s)
-libgl_Linux = -lGL -lGLU -lglut -lGLEW
-libgl_Darwin = -framework OpenGL -framework GLUT -lGLEW
+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)
@@ -42,3 +49,7 @@ clean:
 .PHONY: cleandep
 cleandep:
        rm -f $(dep)
+
+.PHONY: data
+data:
+       tools/prepare_data