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

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
This commit is contained in:
Glenn Rice 2011-01-08 19:14:45 +00:00
parent 34732999a1
commit 05198a8e4e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -335,7 +335,10 @@ if(NOT DISABLE_WX)
include(${wxWidgets_USE_FILE}) include(${wxWidgets_USE_FILE})
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
check_lib(GTK2 gtk+-2.0 REQUIRED) include(FindGTK2)
if(GTK2_FOUND)
include_directories(${GTK2_INCLUDE_DIRS})
endif()
endif() endif()
message("wxWidgets found, enabling GUI build") message("wxWidgets found, enabling GUI build")

1
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -424,6 +424,7 @@ void DolphinApp::InitLanguageSupport()
wxLANGUAGE_POLISH, wxLANGUAGE_POLISH,
wxLANGUAGE_RUSSIAN wxLANGUAGE_RUSSIAN
}; };
IniFile ini; IniFile ini;
ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
ini.Get("Interface", "Language", &language, 0); ini.Get("Interface", "Language", &language, 0);