X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=Makefile;h=da92442cb6148d60d766171508c0ad06410705b5;hp=c03fb83ca7ea243fe3723745237045471d859c02;hb=aed19512e3602d68e6316429695a244ad3a4cfaf;hpb=80c04e7a9aa6d42f769dd4fa70c2c3113440cbce

diff --git a/Makefile b/Makefile
index c03fb83..da92442 100644
--- a/Makefile
+++ b/Makefile
@@ -14,17 +14,18 @@ warn = -pedantic -Wall
 
 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 -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 = -lopengl32 -lglu32 -lglew32
+libgl_mingw = -lglu32 -Wl,-Bstatic -lglew32 -Wl,-Bdynamic -lopengl32
 
-ifeq ($(sys), msys)
-	CFLAGS += -mwin32
-	CXXFLAGS += -mwin32
+ifeq ($(sys), mingw)
+	CFLAGS += -DGLEW_STATIC
+	CXXFLAGS += -DGLEW_STATIC
 endif
 
 $(bin): .clang_complete $(obj)