Merge branch 'master' of goat:git/laserbrain_demo

[laserbrain_demo] / Makefile

diff --git a/Makefile b/Makefile
index ae16e3e..4b65ac3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,22 +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 | sed 's/MSYS.*/msys/')
+sys = $(shell uname -s | sed 's/MINGW.*/mingw/')
 libgl_Linux = -lGL -lGLU -lGLEW
 libgl_Darwin = -framework OpenGL -lGLEW
-libgl_msys = -lopengl32 -lglu32 -lglew32
+libgl_mingw = -lopengl32 -lglu32 -lglew32
+#libgl_mingw = -lglu32 -Wl,-Bstatic -lglew32 -Wl,-Bdynamic -lopengl32
 
-ifeq ($(sys), msys)
-       CFLAGS += -mwin32
-       CXXFLAGS += -mwin32
+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