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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/CMakeLists.txt
View File

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

1
Source/Core/DebuggerUICommon/CMakeLists.txt
View File

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

4
Source/Plugins/Plugin_DSP_HLE/CMakeLists.txt
View File

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

3
Source/Plugins/Plugin_VideoOGL/CMakeLists.txt
View File

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