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);