diff options
| author | Christian Morales Vega <Christian.Morales.Vega@gmail.com> | 2010-11-18 23:27:27 +0000 |
|---|---|---|
| committer | Christian Morales Vega <Christian.Morales.Vega@gmail.com> | 2010-11-18 23:27:27 +0000 |
| commit | 7632a5abd47e4a228291d18a5f9ebef8a1ca38f6 (patch) | |
| tree | 4a7f7244193f1df23d170a9b5d0cbe68232493bc /Source | |
| parent | 63aae7e5e04a29be48c1ad6f75d32df558d24dac (diff) | |
Fix for issue 3507. Compile with old GLEW versions, support user-specified CFLAGS and link plugins to all the used libs.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6441 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Plugins/Plugin_DSP_HLE/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_DSP_LLE/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt | 4 |
4 files changed, 16 insertions, 7 deletions
diff --git a/Source/Plugins/Plugin_DSP_HLE/CMakeLists.txt b/Source/Plugins/Plugin_DSP_HLE/CMakeLists.txt index 5c6e36a0fb..3ff95fb249 100644 --- a/Source/Plugins/Plugin_DSP_HLE/CMakeLists.txt +++ b/Source/Plugins/Plugin_DSP_HLE/CMakeLists.txt @@ -20,8 +20,12 @@ if(wxWidgets_FOUND) set(SRCS ${SRCS} Src/ConfigDlg.cpp) endif(wxWidgets_FOUND) -add_library(Plugin_DSP_HLE SHARED ${SRCS}) -target_link_libraries(Plugin_DSP_HLE common audiocommon) +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) install(TARGETS Plugin_DSP_HLE LIBRARY DESTINATION ${plugindir} RUNTIME DESTINATION ${plugindir}) diff --git a/Source/Plugins/Plugin_DSP_LLE/CMakeLists.txt b/Source/Plugins/Plugin_DSP_LLE/CMakeLists.txt index aa2843020a..f646cdd543 100644 --- a/Source/Plugins/Plugin_DSP_LLE/CMakeLists.txt +++ b/Source/Plugins/Plugin_DSP_LLE/CMakeLists.txt @@ -15,10 +15,10 @@ if(wxWidgets_FOUND) Src/DSPConfigDlgLLE.cpp Src/Debugger/DSPDebugWindow.cpp Src/Debugger/DSPRegisterView.cpp) - set(LIBS ${LIBS} debugger_ui_util) + set(LIBS ${LIBS} debugger_ui_util ${wxWidgets_LIBRARIES}) endif(wxWidgets_FOUND) -add_library(Plugin_DSP_LLE SHARED ${SRCS}) +add_library(Plugin_DSP_LLE MODULE ${SRCS}) target_link_libraries(Plugin_DSP_LLE ${LIBS}) install(TARGETS Plugin_DSP_LLE LIBRARY DESTINATION ${plugindir} diff --git a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt index f82d0eb1fc..60a585534c 100644 --- a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt +++ b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt @@ -16,12 +16,15 @@ set(LIBS videocommon SOIL common Cg - CgGL) + CgGL + ${OPENGL_LIBRARIES} + ${X11_LIBRARIES}) if(wxWidgets_FOUND) set(SRCS ${SRCS} Src/Debugger/Debugger.cpp) set(LIBS videouicommon ${LIBS}) + set(LIBS ${LIBS} ${wxWidgets_LIBRARIES}) endif(wxWidgets_FOUND) if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND) @@ -32,7 +35,7 @@ elseif(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) set(LIBS ${LIBS} clrun) endif() -add_library(Plugin_VideoOGL SHARED ${SRCS}) +add_library(Plugin_VideoOGL MODULE ${SRCS}) target_link_libraries(Plugin_VideoOGL ${LIBS}) install(TARGETS Plugin_VideoOGL LIBRARY DESTINATION ${plugindir} diff --git a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt index 9f213f0c8b..17de58c67b 100644 --- a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt +++ b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt @@ -27,7 +27,9 @@ set(SRCS Src/BPMemLoader.cpp set(LIBS videocommon GLEW SOIL - common) + common + ${OPENGL_LIBRARIES} + ${X11_LIBRARIES}) if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND) set(SRCS ${SRCS} Src/cocoaGL.m) |