summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-23 21:28:42 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-23 22:50:35 +0300
commit8a4f26c670cdcf5bf0d4e58d2571e18b33085c5a (patch)
tree135e604b5ff9dffd4ebf4227e9a11c0a3347fa7a
parent5adc6140d3da7d1e0e7cffe6922a2ac506d731f0 (diff)
downloadmv-8a4f26c670cdcf5bf0d4e58d2571e18b33085c5a.tar.gz
mv-8a4f26c670cdcf5bf0d4e58d2571e18b33085c5a.tar.bz2
mv-8a4f26c670cdcf5bf0d4e58d2571e18b33085c5a.tar.xz
mv-8a4f26c670cdcf5bf0d4e58d2571e18b33085c5a.zip
Fix for windows compilation.
-rw-r--r--src/graphicsmanager.cpp2
-rw-r--r--src/mgl.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index b230d77cf..f03d784a1 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -784,7 +784,7 @@ void GraphicsManager::detectVideoSettings()
}
}
-static void debugCallback(GLenum source, GLenum type, GLuint id,
+static CALLBACK void debugCallback(GLenum source, GLenum type, GLuint id,
GLenum severity, GLsizei length,
const GLchar *text, GLvoid *userParam)
{
diff --git a/src/mgl.h b/src/mgl.h
index 6f10078a0..f1686a2ba 100644
--- a/src/mgl.h
+++ b/src/mgl.h
@@ -126,6 +126,8 @@ defNameE(glDebugMessageCallback);
typedef const char* (APIENTRY * wglGetExtensionsString_t) (HDC hdc);
defNameE(wglGetExtensionsString);
+#else
+#define CALLBACK
#endif
#endif