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:
parent
34732999a1
commit
05198a8e4e
|
@ -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")
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue