X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=Makefile;h=7ee900bb1d9c2c3fd30b8d240ad0c4ea3f21d1ea;hp=71a41d1eeeb85660517423b63b0a4e8d1c3cfae2;hb=c7a17eba0f59bfca733f619d732bba3fb276b1da;hpb=a550cf151e8fc6626e788fb2bdc72cf03565ff8b

diff --git a/Makefile b/Makefile
index 71a41d1..7ee900b 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`
@@ -14,12 +14,19 @@ 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 -loptcfg -lgoatvr `pkg-config --libs sdl2`
+LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman \
+		  -lpthread -lassimp -ltreestore -lgoatvr \
+		  -lz -lpng -ljpeg `pkg-config --libs sdl2 freetype2`
 
-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.dll
+
+ifeq ($(sys), msys)
+	CFLAGS += -mwin32
+	CXXFLAGS += -mwin32
+endif
 
 $(bin): .clang_complete $(obj)
 	$(CXX) -o $@ $(obj) $(LDFLAGS)