Merge branch 'master' of goat:git/laserbrain_demo

diff --combined Makefile
index 959c10f,da92442..4b65ac3
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -4,7 -4,7 +4,7 @@@ obj = $(src:.cc=.o) $(csrc:.c=.o
  dep = $(obj:.o=.d)
  bin = demo
  
- opt = -O3 -ffast-math
+ #opt = -O3 -ffast-math
  dbg = -g
  
  incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2`
@@@ -14,29 -14,23 +14,33 @@@ warn = -pedantic -Wal
  
  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/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