Merge branch 'master' of goat:git/laserbrain_demo

diff --cc Makefile
index 959c10f,da92442..4b65ac3
--- 1/Makefile
--- 2/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)