Merge branch 'master' of goat:git/laserbrain_demo

diff --git a/Makefile b/Makefile
index b2011c5..b7e244b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ libgl_mingw = -lopengl32 -lglu32 -lglew32
 
 libal_Linux = -lopenal
 libal_Darwin = -framework OpenAL
-libal_mingw = -lOpenAL32
+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/opengl.c b/src/opengl.c
index 9fe7ea3..796144c 100644 (file)
--- a/src/opengl.c
+++ b/src/opengl.c
@@ -1,8 +1,10 @@
 #include "opengl.h"
 #include "logger.h"
 
-static void gldebug_logger(unsigned int src, unsigned int type, unsigned int id,
-               unsigned int severity, int len, const char *msg, const void *cls);
+
+static void GLAPIENTRY gldebug_logger(GLenum src, GLenum type, GLuint id, GLenum severity,
+               GLsizei len, const char *msg, const void *cls);
+
 static const char *gldebug_srcstr(unsigned int src);
 static const char *gldebug_typestr(unsigned int type);
 static const char *gldebug_sevstr(unsigned int sev);
@@ -26,8 +28,8 @@ int init_opengl(void)
 }
 
 
-static void gldebug_logger(unsigned int src, unsigned int type, unsigned int id,
-               unsigned int severity, int len, const char *msg, const void *cls)
+static void GLAPIENTRY gldebug_logger(GLenum src, GLenum type, GLuint id, GLenum severity,
+               GLsizei len, const char *msg, const void *cls)
 {
        static const char *fmt = "[GLDEBUG] (%s) %s: %s\n";
        switch(type) {

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