FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Alok Priyadashi, "The attached patch fixes

Browse Source 
- compile errors on windows when compiled with UNICODE flag
- warnings for duplicate WIN32_LEAN_AND_MEAN. I think this should
better fixed by adding WIN32_LEAN_AND_MEAN to vcproj preprocessor
list."
This commit is contained in:
Robert Osfield
2010-04-22 16:01:38 +00:00
parent 25bc487763
commit f67942cf03
10 changed files with 114 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osg/GLExtensions.cpp
View File

@@ -345,7 +345,9 @@ std::string& osg::getGLExtensionDisableString()
#if defined(WIN32)
#define WIN32_LEAN_AND_MEAN
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif // WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
#define NOMINMAX
#endif // NOMINMAX
@@ -375,10 +377,10 @@ void* osg::getGLExtensionFuncPtr(const char *funcName)
#if defined(WIN32)
#if defined(OSG_GLES2_AVAILABLE)
static HMODULE hmodule = GetModuleHandle("libGLESv2.dll");
static HMODULE hmodule = GetModuleHandle(TEXT("libGLESv2.dll"));
return convertPointerType<void*, PROC>(GetProcAddress(hmodule, funcName));
#elif defined(OSG_GLES1_AVAILABLE)
static HMODULE hmodule = GetModuleHandle("libgles_cm.dll");
static HMODULE hmodule = GetModuleHandleA(TEXT("libgles_cm.dll"));
return convertPointerType<void*, PROC>(GetProcAddress(hmodule, funcName));
#else
return convertPointerType<void*, PROC>(wglGetProcAddress(funcName));