The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-03 11:32:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Linux build: search for gthread-2.0 and pangocairo, then add both these libs to wx dependencies

Browse Source
This commit is contained in:
Pierre Bourdon 2012-03-23 01:06:45 +01:00
parent c0992cc73e
commit 5242f09104
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -508,6 +508,10 @@ if(NOT DISABLE_WX)
add_definitions(-D__WXOSX_COCOA__) add_definitions(-D__WXOSX_COCOA__)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-D__WXGTK__) 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") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
add_definitions(-D__WXMSW__) add_definitions(-D__WXMSW__)
else() else()

5
Externals/wxWidgets3/CMakeLists.txt vendored
View File

@ -875,6 +875,11 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
${SRCS_GTK} ${SRCS_GTK}
${SRCS_UNIX} ${SRCS_UNIX}
${SRCS_UNIXGTK}) ${SRCS_UNIXGTK})
set(LIBS
png
${GTHREAD2_LIBRARIES}
${PANGOCAIRO_LIBRARIES}
${GTK2_LIBRARIES})
else() else()
add_definitions(-D__WXMSW__) add_definitions(-D__WXMSW__)
set(SRCS set(SRCS

3
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -63,8 +63,7 @@ if(wxWidgets_FOUND)
Src/WiimoteConfigDiag.cpp Src/WiimoteConfigDiag.cpp
Src/WxUtils.cpp) Src/WxUtils.cpp)
set(WXLIBS ${wxWidgets_LIBRARIES} set(WXLIBS ${wxWidgets_LIBRARIES})
${GTK2_LIBRARIES})
else() else()
set(SRCS Src/MainNoGUI.cpp) set(SRCS Src/MainNoGUI.cpp)
endif() endif()