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

diff --git a/Makefile b/Makefile
index 85c4046..4b65ac3 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,16 +14,33 @@ 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
+#libgl_mingw = -lglu32 -Wl,-Bstatic -lglew32 -Wl,-Bdynamic -lopengl32
+
+ifeq ($(sys), mingw)
+	bin = demo.exe
+	#CFLAGS += -DGLEW_STATIC
+	#CXXFLAGS += -DGLEW_STATIC
+endif
 
 $(bin): .clang_complete $(obj)
 	$(CXX) -o $@ $(obj) $(LDFLAGS)
 
+.PHONY: cross
+cross:
+	$(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++
+
+.PHONY: instalien
+instalien: demo.exe
+	cp $< /alien/demo/$<
+
 .clang_complete: Makefile
 	rm -f $@
 	for i in $(CXXFLAGS); do echo $$i >>$@; done
@@ -43,3 +60,7 @@ clean:
 .PHONY: cleandep
 cleandep:
 	rm -f $(dep)
+
+.PHONY: data
+data:
+	tools/prepare_data