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

Fix a few more linkage issues in the cmake build. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6537 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-12-06 13:06:54 +00:00
parent e2543689b8
commit 2caa685c7f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoCommon/CMakeLists.txt
View File

@ -46,7 +46,7 @@ endif()
add_library(videocommon STATIC ${SRCS}) add_library(videocommon STATIC ${SRCS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(ENCODE_FRAMEDUMPS) if(ENCODE_FRAMEDUMPS)
target_link_libraries(videocommon avcodec avformat swscale) target_link_libraries(videocommon avcodec avformat swscale avutil)
add_definitions(-D__STDC_CONSTANT_MACROS) add_definitions(-D__STDC_CONSTANT_MACROS)
endif() endif()
add_definitions(-fPIC) add_definitions(-fPIC)

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

@ -33,7 +33,8 @@ set(LIBS videocommon
SOIL SOIL
common common
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${X11_LIBRARIES}) ${X11_LIBRARIES}
${wxWidgets_LIBRARIES})
if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND) if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND)
set(SRCS ${SRCS} Src/cocoaGL.m) set(SRCS ${SRCS} Src/cocoaGL.m)