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

More linkage fixing. Fixes issue 3596. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6499 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-11-30 05:20:36 +00:00
parent b5863da915
commit 2ac9accc85
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,8 @@ set(LIBS core
sfml-network sfml-network
wiiuse wiiuse
SDL SDL
GL) GL
${XRANDR_LIBS})
if(wxWidgets_FOUND) if(wxWidgets_FOUND)
set(MEMCARDSRCS Src/MemcardManager.cpp set(MEMCARDSRCS Src/MemcardManager.cpp
@ -49,7 +50,9 @@ if(wxWidgets_FOUND)
debugger_ui_util debugger_ui_util
inputuicommon inputuicommon
memcard memcard
${wxWidgets_LIBRARIES}) ${wxWidgets_LIBRARIES}
${GTK2_LIBRARIES}
${X11_LIBRARIES})
else(wxWidgets_FOUND) else(wxWidgets_FOUND)
set(SRCS ${SRCS} set(SRCS ${SRCS}
@ -57,10 +60,6 @@ else(wxWidgets_FOUND)
Src/cmdline.c) Src/cmdline.c)
endif() endif()
if(XRANDR_FOUND)
set(LIBS ${LIBS} ${XRANDR_LIBRARIES})
endif(XRANDR_FOUND)
if(WIN32) if(WIN32)
set(SRCS ${SRCS} Src/stdafx.cpp) set(SRCS ${SRCS} Src/stdafx.cpp)
elseif((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND) elseif((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND)