piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for issue 3507. Compile with old GLEW versions, support user-specified CFLAGS and link plugins to all the used libs.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6441 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Christian Morales Vega
2010-11-18 23:27:27 +00:00
parent 63aae7e5e0
commit 7632a5abd4
7 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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})

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

@ -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}

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

@ -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}

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

@ -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)