From 1acecbdaaccffe30ae7d564e1e01fd834c8618c9 Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Mon, 22 Jan 2018 02:45:37 -0800 Subject: [PATCH 1/1] win32 mingw fixes --- Makefile | 2 +- fetchlibs | 4 ++-- src/timer.cc | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7f0d74c..00e0559 100644 --- 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 --- a/fetchlibs +++ b/fetchlibs @@ -5,10 +5,10 @@ mkdir -p libs && cd libs msys2_libs='mingw-w64-i686-libpng mingw-w64-i686-libjpeg-turbo mingw-w64-i686-freetype mingw-w64-i686-zlib mingw-w64-i686-libogg mingw-w64-i686-libvorbis mingw-w64-i686-SDL2 mingw-w64-i686-glew - mingw-w64-i686-assimp' + mingw-w64-i686-assimp mingw-w64-i686-openal' debian_libs='libpng-dev libjpeg-dev libfreetype6-dev libogg-dev libvorbis-dev - libsdl2-dev libglew-dev libassimp-dev' + libsdl2-dev libglew-dev libassimp-dev libopenal-dev' github_libs='gph-math libvmath libimago libresman libdrawtext libtreestore libgoatvr' diff --git a/src/timer.cc b/src/timer.cc index 95f6c0c..44a06ac 100644 --- 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 +#ifdef _MSC_VER #pragma comment(lib, "winmm.lib") +#endif unsigned long get_time_msec(void) { -- 1.7.10.4