fixed cross-build

[laserbrain_demo] / Makefile

diff --git a/Makefile b/Makefile
index da92442..d3220fc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ bin = demo
 dbg = -g
 
 incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2`
-libpath = -L/usr/local/lib
+#libpath = -L/usr/local/lib
 
 warn = -pedantic -Wall
 
@@ -16,21 +16,32 @@ CFLAGS = $(warn) $(opt) $(dbg) $(incpath)
 CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath)
 LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) -lm -lgmath -lvmath -limago \
                  -lresman -lpthread -lassimp -ltreestore -lgoatvr \
-                 -lz -lpng -ljpeg `pkg-config --libs sdl2 freetype2`
+                 `pkg-config --libs sdl2 freetype2` -lpng -ljpeg -lz
 
 sys = $(shell uname -s | sed 's/MINGW.*/mingw/')
 libgl_Linux = -lGL -lGLU -lGLEW
 libgl_Darwin = -framework OpenGL -lGLEW
-libgl_mingw = -lglu32 -Wl,-Bstatic -lglew32 -Wl,-Bdynamic -lopengl32
+libgl_mingw = -lopengl32 -lglu32 -lglew32
+#libgl_mingw = -lglu32 -Wl,-Bstatic -lglew32 -Wl,-Bdynamic -lopengl32
 
 ifeq ($(sys), mingw)
-       CFLAGS += -DGLEW_STATIC
-       CXXFLAGS += -DGLEW_STATIC
+       bin = demo.exe
+       LDFLAGS += -lmingw32 -lSDL2main -lSDL2 -lwinmm -mwindows
+       #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++ sys=mingw
+
+.PHONY: instalien
+instalien: demo.exe
+       cp $< /alien/demo/$<
+
 .clang_complete: Makefile
        rm -f $@
        for i in $(CXXFLAGS); do echo $$i >>$@; done