builds through mingw32 now. doesn't seem to run properly though

diff --git a/.gitignore b/.gitignore
index e377c0e..0d79523 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@ demo
 data/
 .clang_complete
 *.suo
+*.user
 *sdf
+*.dll
+*.exe
 Debug/
 Release/

diff --git a/Makefile b/Makefile
index 7ee900b..da92442 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,18 +14,18 @@ warn = -pedantic -Wall
 
 CFLAGS = $(warn) $(opt) $(dbg) $(incpath)
 CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath)
-LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman \
-                 -lpthread -lassimp -ltreestore -lgoatvr \
+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.dll
+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)

diff --git a/src/app.cc b/src/app.cc
index 60affa0..6eb019a 100644 (file)
--- a/src/app.cc
+++ b/src/app.cc
@@ -123,7 +123,7 @@ bool app_init(int argc, char **argv)
 
        exman = new ExhibitManager;
        if(!exman->load(mscn, "data/exhibits")) {
-               return false;
+               //return false;
        }
 
        blobs = new BlobExhibit;