semi-ported to msys2

diff --git a/Makefile b/Makefile
index ae16e3e..c03fb83 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,12 @@ 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 -loptcfg -lgoatvr `pkg-config --libs sdl2`
+                 -lpthread -lassimp -ltreestore -ldrawtext -lgoatvr `pkg-config --libs sdl2`
 
-sys = $(shell uname -s | sed 's/MSYS.*/msys/')
+sys = $(shell uname -s | sed 's/MINGW.*/mingw/')
 libgl_Linux = -lGL -lGLU -lGLEW
 libgl_Darwin = -framework OpenGL -lGLEW
-libgl_msys = -lopengl32 -lglu32 -lglew32
+libgl_mingw = -lopengl32 -lglu32 -lglew32
 
 ifeq ($(sys), msys)
        CFLAGS += -mwin32

diff --git a/src/datamap.cc b/src/datamap.cc
index d39de6a..dcbae78 100644 (file)
--- a/src/datamap.cc
+++ b/src/datamap.cc
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include "datamap.h"
 
-#ifdef WIN32
+#if defined(WIN32) || defined(__WIN32__)
 #include <malloc.h>
 #else
 #include <alloca.h>

diff --git a/src/image.cc b/src/image.cc
index e79073d..57817ca 100644 (file)
--- a/src/image.cc
+++ b/src/image.cc
@@ -1,9 +1,9 @@
 #include <string.h>
 
-#ifndef _MSC_VER
-#include <alloca.h>
-#else
+#if defined(WIN32) || defined(__WIN32__)
 #include <malloc.h>
+#else
+#include <alloca.h>
 #endif
 
 #include "imago2.h"

diff --git a/src/metascene.cc b/src/metascene.cc
index 985ac1c..2328f33 100644 (file)
--- a/src/metascene.cc
+++ b/src/metascene.cc
@@ -7,7 +7,7 @@
 #include "logger.h"
 #include "app.h"
 
-#ifdef WIN32
+#if defined(WIN32) || defined(__WIN32__)
 #include <malloc.h>
 #else
 #include <alloca.h>

diff --git a/src/optcfg.c b/src/optcfg.c
index ab84474..c67c299 100644 (file)
--- a/src/optcfg.c
+++ b/src/optcfg.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#ifdef _MSC_VER
+#if defined(WIN32) || defined(__WIN32__)
 #include <malloc.h>
 #else
 #include <alloca.h>