ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #929 from Squall-Leonhart/master 

fix x86 builds crashing when /Gs set by Optimizations, turns on full optimizations for x86
This commit is contained in:
Zach Bacon 2022-03-08 06:49:22 -05:00 committed by GitHub
parent 252b65b13c 7726d26f9c
commit 8ea020d373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -787,7 +787,7 @@ elseif(MSVC)
if(CMAKE_BUILD_TYPE STREQUAL Release)
if(X86_32)
add_compiler_flags(${runtime} /Ot /Oy /GF /Gy /Ob3)
add_compiler_flags(${runtime} /O2 /Ob3)
else()
add_compiler_flags(${runtime} /O2 /Ob3)
endif()

4
src/wx/panel.cpp
View File

@ -2308,7 +2308,7 @@ void GLDrawingPanel::DrawingPanelInit()
systemScreenMessage(_("Failed to set glXSwapIntervalMESA"));
}
#elif defined(__WXMSW__)
typedef char* (*wglext)();
typedef const char* (*wglext)();
wglext wglGetExtensionsStringEXT = (wglext)wglGetProcAddress("wglGetExtensionsStringEXT");
if (wglGetExtensionsStringEXT == NULL) {
systemScreenMessage(_("No support for wglGetExtensionsStringEXT"));
@ -2317,7 +2317,7 @@ void GLDrawingPanel::DrawingPanelInit()
systemScreenMessage(_("No support for WGL_EXT_swap_control"));
}
typedef bool (*PFNWGLSWAPINTERVALEXTPROC)(int);
typedef BOOL (__stdcall *PFNWGLSWAPINTERVALEXTPROC)(BOOL);
static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = NULL;
wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress("wglSwapIntervalEXT");
if (wglSwapIntervalEXT)