win32 mingw fixes

diff --git a/Makefile b/Makefile
index 7f0d74c..00e0559 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ libgl_mingw = -lopengl32 -lglu32 -lglew32
 
 libal_Linux = -lopenal
 libal_Darwin = -framework OpenAL
-libal_mingw = #?
+libal_mingw = -lopenal
 
 ifeq ($(sys), mingw)
        bin = demo.exe

diff --git a/fetchlibs b/fetchlibs
index 201289d..fb83335 100755 (executable)
--- a/fetchlibs
+++ b/fetchlibs
@@ -5,10 +5,10 @@ mkdir -p libs && cd libs
 msys2_libs='mingw-w64-i686-libpng mingw-w64-i686-libjpeg-turbo\r
        mingw-w64-i686-freetype mingw-w64-i686-zlib mingw-w64-i686-libogg\r
        mingw-w64-i686-libvorbis mingw-w64-i686-SDL2 mingw-w64-i686-glew\r
-       mingw-w64-i686-assimp'\r
+       mingw-w64-i686-assimp mingw-w64-i686-openal'\r
 \r
 debian_libs='libpng-dev libjpeg-dev libfreetype6-dev libogg-dev libvorbis-dev\r
-       libsdl2-dev libglew-dev libassimp-dev'\r
+       libsdl2-dev libglew-dev libassimp-dev libopenal-dev'\r
 \r
 github_libs='gph-math libvmath libimago libresman libdrawtext libtreestore\r
        libgoatvr'\r

diff --git a/src/timer.cc b/src/timer.cc
index 95f6c0c..44a06ac 100644 (file)
--- a/src/timer.cc
+++ b/src/timer.cc
@@ -43,9 +43,11 @@ void sleep_msec(unsigned long msec)
 }
 #endif
 
-#ifdef WIN32
+#if defined(WIN32) || defined(__WIN32__)
 #include <windows.h>
+#ifdef _MSC_VER
 #pragma comment(lib, "winmm.lib")
+#endif
 
 unsigned long get_time_msec(void)
 {