From: John Tsiombikas <nuclear@mutantstargoat.com>
Date: Fri, 1 Sep 2017 00:10:17 +0000 (+0300)
Subject: Merge branch 'master' of goat:git/laserbrain_demo
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=commitdiff_plain;h=c77ee2a7256ffdb3aac158955178c372de349a1e;hp=aed19512e3602d68e6316429695a244ad3a4cfaf

Merge branch 'master' of goat:git/laserbrain_demo
---

diff --git a/Makefile b/Makefile
index da92442..4b65ac3 100644
--- a/Makefile
+++ b/Makefile
@@ -21,16 +21,26 @@ LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) -lm -lgmath -lvmath -limago \
 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
+	#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