From 2ac9accc85e2cb988f424c5b603a34586ec5ee17 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 30 Nov 2010 05:20:36 +0000 Subject: [PATCH] More linkage fixing. Fixes issue 3596. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6499 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index b6da129709..ff296ff542 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -11,7 +11,8 @@ set(LIBS core sfml-network wiiuse SDL - GL) + GL + ${XRANDR_LIBS}) if(wxWidgets_FOUND) set(MEMCARDSRCS Src/MemcardManager.cpp @@ -49,7 +50,9 @@ if(wxWidgets_FOUND) debugger_ui_util inputuicommon memcard - ${wxWidgets_LIBRARIES}) + ${wxWidgets_LIBRARIES} + ${GTK2_LIBRARIES} + ${X11_LIBRARIES}) else(wxWidgets_FOUND) set(SRCS ${SRCS} @@ -57,10 +60,6 @@ else(wxWidgets_FOUND) Src/cmdline.c) endif() -if(XRANDR_FOUND) - set(LIBS ${LIBS} ${XRANDR_LIBRARIES}) -endif(XRANDR_FOUND) - if(WIN32) set(SRCS ${SRCS} Src/stdafx.cpp) elseif((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND)