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:
parent
b5863da915
commit
2ac9accc85
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue