From 05198a8e4ed882f19bcb13ba15e632df563ae5ae Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 8 Jan 2011 19:14:45 +0000 Subject: [PATCH] Go back to using FindGtk for the cmake build. The module is fixed with later versions of cmake. We may need to check the cmake version and fall back to pkg-config for those using older versions. Please test. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6787 8ced0084-cf51-0410-be5f-012b33b47a6e --- CMakeLists.txt | 5 ++++- Source/Core/DolphinWX/Src/Main.cpp | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0cabae0b5..a686e36ce7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -335,7 +335,10 @@ if(NOT DISABLE_WX) include(${wxWidgets_USE_FILE}) if(UNIX AND NOT APPLE) - check_lib(GTK2 gtk+-2.0 REQUIRED) + include(FindGTK2) + if(GTK2_FOUND) + include_directories(${GTK2_INCLUDE_DIRS}) + endif() endif() message("wxWidgets found, enabling GUI build") diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index c5369b28b3..a24ba11669 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -424,6 +424,7 @@ void DolphinApp::InitLanguageSupport() wxLANGUAGE_POLISH, wxLANGUAGE_RUSSIAN }; + IniFile ini; ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); ini.Get("Interface", "Language", &language, 0);