diff --git a/CMakeLists.txt b/CMakeLists.txt index 81b362e4b5..986fc4884b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -508,6 +508,10 @@ if(NOT DISABLE_WX) add_definitions(-D__WXOSX_COCOA__) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") add_definitions(-D__WXGTK__) + + # Check for required libs + check_lib(GTHREAD2 gthread-2.0 glib/gthread.h REQUIRED) + check_lib(PANGOCAIRO pangocairo pango/pangocairo.h REQUIRED) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") add_definitions(-D__WXMSW__) else() diff --git a/Externals/wxWidgets3/CMakeLists.txt b/Externals/wxWidgets3/CMakeLists.txt index 8e8d88afbb..5b9891bb11 100644 --- a/Externals/wxWidgets3/CMakeLists.txt +++ b/Externals/wxWidgets3/CMakeLists.txt @@ -875,6 +875,11 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") ${SRCS_GTK} ${SRCS_UNIX} ${SRCS_UNIXGTK}) + set(LIBS + png + ${GTHREAD2_LIBRARIES} + ${PANGOCAIRO_LIBRARIES} + ${GTK2_LIBRARIES}) else() add_definitions(-D__WXMSW__) set(SRCS diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 2d7ed7e0ce..03f947b341 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -63,8 +63,7 @@ if(wxWidgets_FOUND) Src/WiimoteConfigDiag.cpp Src/WxUtils.cpp) - set(WXLIBS ${wxWidgets_LIBRARIES} - ${GTK2_LIBRARIES}) + set(WXLIBS ${wxWidgets_LIBRARIES}) else() set(SRCS Src/MainNoGUI.cpp) endif()