Enable full optimizations and fix x86 builds
a bool isn't a BOOL and wglGetExtensionsStringEXT returns a const char*
This commit is contained in:
parent
56ffb12758
commit
7726d26f9c
|
@ -787,7 +787,7 @@ elseif(MSVC)
|
||||||
|
|
||||||
if(CMAKE_BUILD_TYPE STREQUAL Release)
|
if(CMAKE_BUILD_TYPE STREQUAL Release)
|
||||||
if(X86_32)
|
if(X86_32)
|
||||||
add_compiler_flags(${runtime} /Ot /Oy /GF /Gy /Ob3)
|
add_compiler_flags(${runtime} /O2 /Ob3)
|
||||||
else()
|
else()
|
||||||
add_compiler_flags(${runtime} /O2 /Ob3)
|
add_compiler_flags(${runtime} /O2 /Ob3)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -2308,7 +2308,7 @@ void GLDrawingPanel::DrawingPanelInit()
|
||||||
systemScreenMessage(_("Failed to set glXSwapIntervalMESA"));
|
systemScreenMessage(_("Failed to set glXSwapIntervalMESA"));
|
||||||
}
|
}
|
||||||
#elif defined(__WXMSW__)
|
#elif defined(__WXMSW__)
|
||||||
typedef char* (*wglext)();
|
typedef const char* (*wglext)();
|
||||||
wglext wglGetExtensionsStringEXT = (wglext)wglGetProcAddress("wglGetExtensionsStringEXT");
|
wglext wglGetExtensionsStringEXT = (wglext)wglGetProcAddress("wglGetExtensionsStringEXT");
|
||||||
if (wglGetExtensionsStringEXT == NULL) {
|
if (wglGetExtensionsStringEXT == NULL) {
|
||||||
systemScreenMessage(_("No support for wglGetExtensionsStringEXT"));
|
systemScreenMessage(_("No support for wglGetExtensionsStringEXT"));
|
||||||
|
@ -2317,7 +2317,7 @@ void GLDrawingPanel::DrawingPanelInit()
|
||||||
systemScreenMessage(_("No support for WGL_EXT_swap_control"));
|
systemScreenMessage(_("No support for WGL_EXT_swap_control"));
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef bool (*PFNWGLSWAPINTERVALEXTPROC)(int);
|
typedef BOOL (__stdcall *PFNWGLSWAPINTERVALEXTPROC)(BOOL);
|
||||||
static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = NULL;
|
static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = NULL;
|
||||||
wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress("wglSwapIntervalEXT");
|
wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress("wglSwapIntervalEXT");
|
||||||
if (wglSwapIntervalEXT)
|
if (wglSwapIntervalEXT)
|
||||||
|
|
Loading…
Reference in New Issue