Fix some linkage issues with the cmake build. This should fix issue 3596.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6497 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-11-30 01:20:05 +00:00
parent 8d123adf64
commit eda716b164
4 changed files with 4 additions and 7 deletions

View File

@ -42,6 +42,7 @@ endif(WIN32)
include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src")
add_library(common STATIC ${SRCS})
target_link_libraries(common ${CMAKE_DL_LIBS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-fPIC)
endif()

View File

@ -3,6 +3,7 @@ set(SRCS Src/CodeView.cpp
Src/MemoryView.cpp)
add_library(debugger_ui_util STATIC ${SRCS})
target_link_libraries(debugger_ui_util ${wxWidgets_LIBRARIES})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-fPIC)
endif()

View File

@ -21,11 +21,7 @@ if(wxWidgets_FOUND)
endif(wxWidgets_FOUND)
add_library(Plugin_DSP_HLE MODULE ${SRCS})
if(wxWidgets_FOUND)
target_link_libraries(Plugin_DSP_HLE common audiocommon ${wxWidgets_LIBRARIES})
else(wxWidgets_FOUND)
target_link_libraries(Plugin_DSP_HLE common audiocommon)
endif(wxWidgets_FOUND)
target_link_libraries(Plugin_DSP_HLE common audiocommon ${wxWidgets_LIBRARIES})
install(TARGETS Plugin_DSP_HLE
LIBRARY DESTINATION ${plugindir}
RUNTIME DESTINATION ${plugindir})

View File

@ -23,8 +23,7 @@ set(LIBS videocommon
if(wxWidgets_FOUND)
set(SRCS ${SRCS}
Src/Debugger/Debugger.cpp)
set(LIBS videouicommon ${LIBS})
set(LIBS ${LIBS} ${wxWidgets_LIBRARIES})
set(LIBS videouicommon ${LIBS} ${wxWidgets_LIBRARIES})
endif(wxWidgets_FOUND)
if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND)