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

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

c77ee2a7256ffdb3aac158955178c372de349a1e
diff --cc Makefile
index 959c10f,da92442..4b65ac3
--- a/Makefile
+++ b/Makefile
@@@ -20,10 -21,11 +21,13 @@@ LDFLAGS = $(libpath) -ldrawtext $(libgl
  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)