Merge branch 'master' of /home/nuclear/code/laserbrain/demo

diff --git a/Makefile b/Makefile
index d0e1784..b2011c5 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 = -lOpenAL32
 
 ifeq ($(sys), mingw)
        bin = demo.exe

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