From bee873a30c4612bd6e698bc0a8347ff349fa5cf4 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 9 Nov 2010 03:08:20 +0000 Subject: [PATCH] Fix the annoying gap in the OpenGL configuration dialog in the "General" tab between "Use Real XFB" and "Wide screen hack". Also link the dolphin-emu executable against GL in the cmake build. Why? This seems to fix the segmentation fault on stop issue. Although curiously enough, linking the dolhpin executable against the system shared library SOIL fixes the problem too. It doesn't work with the static version of SOIL build in the externals. The reason the problem disappeared with the scons build is that the executable is implicitly linked against GL since the linker flags are set up to be thrown in everywhere. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6364 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/CMakeLists.txt | 5 +++-- Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 9a99df2e66..56a3bbc501 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -9,7 +9,9 @@ set(LIBS core lua z sfml-network - wiiuse) + wiiuse + SDL + GL) if(wxWidgets_FOUND) set(MEMCARDSRCS Src/MemcardManager.cpp @@ -68,7 +70,6 @@ else() set(SRCS ${SRCS} Src/X11Utils.cpp) endif() -set(LIBS ${LIBS} SDL) set(EXEGUI dolphin-emu) set(EXENOGUI dolphin-emu-nogui) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp index 8d050fc393..01ede330dd 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp @@ -411,9 +411,9 @@ void GFXConfigDialogOGL::CreateGUIControls() sBasicAdvanced->Add(m_VSync, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5); sBasicAdvanced->Add(m_UseXFB, wxGBPosition(2, 0), wxGBSpan(1, 2), wxALL, 5); sBasicAdvanced->Add(m_UseRealXFB, wxGBPosition(3, 0), wxGBSpan(1, 2), wxALL, 5); - sBasicAdvanced->Add(m_WidescreenHack, wxGBPosition(5, 0), wxGBSpan(1, 2), wxALL, 5); - sBasicAdvanced->Add(m_UseNativeMips, wxGBPosition(6, 0), wxGBSpan(1, 2), wxALL, 5); - sBasicAdvanced->Add(m_EFBScaledCopy, wxGBPosition(7, 0), wxGBSpan(1, 2), wxALL, 5); + sBasicAdvanced->Add(m_WidescreenHack, wxGBPosition(4, 0), wxGBSpan(1, 2), wxALL, 5); + sBasicAdvanced->Add(m_UseNativeMips, wxGBPosition(5, 0), wxGBSpan(1, 2), wxALL, 5); + sBasicAdvanced->Add(m_EFBScaledCopy, wxGBPosition(6, 0), wxGBSpan(1, 2), wxALL, 5); sbBasicAdvanced->Add(sBasicAdvanced); sGeneral->Add(sbBasicAdvanced, 0, wxEXPAND|wxALL, 5);