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

Linux build fix. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6999 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-01-31 02:13:10 +00:00
parent cb48f5969a
commit f1e8da63ec
8 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Externals/CLRun/CMakeLists.txt vendored
View File

@ -5,6 +5,5 @@ set(SRCS clrun/clrun.c
add_library(clrun STATIC ${SRCS}) add_library(clrun STATIC ${SRCS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-fPIC)
target_link_libraries(clrun ${CMAKE_DL_LIBS}) target_link_libraries(clrun ${CMAKE_DL_LIBS})
endif() endif()

3
Externals/SOIL/CMakeLists.txt vendored
View File

@ -4,6 +4,3 @@ set(SRCS image_DXT.c
stb_image_aug.c) stb_image_aug.c)
add_library(SOIL STATIC ${SRCS}) add_library(SOIL STATIC ${SRCS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-fPIC)
endif()

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

@ -41,7 +41,4 @@ endif(WIN32)
enable_precompiled_headers(Src/stdafx.h Src/stdafx.cpp SRCS) enable_precompiled_headers(Src/stdafx.h Src/stdafx.cpp SRCS)
add_library(common STATIC ${SRCS}) add_library(common STATIC ${SRCS})
target_link_libraries(common ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(common clrun ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-fPIC)
endif()

5
Source/Core/Core/CMakeLists.txt
View File

@ -182,7 +182,7 @@ set(SRCS Src/ActionReplay.cpp
Src/PowerPC/JitCommon/JitCache.cpp Src/PowerPC/JitCommon/JitCache.cpp
Src/PowerPC/JitCommon/Jit_Util.cpp) Src/PowerPC/JitCommon/Jit_Util.cpp)
set(LIBS bdisasm inputcommon core lua sfml-network) set(LIBS bdisasm inputcommon videoogl lua sfml-network)
if(WIN32) if(WIN32)
set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp
@ -209,6 +209,3 @@ endif(OPROFILE_FOUND)
add_library(core STATIC ${SRCS}) add_library(core STATIC ${SRCS})
target_link_libraries(core ${LIBS}) target_link_libraries(core ${LIBS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-fPIC)
endif()

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

@ -52,5 +52,4 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(videocommon ${LIBAV_LIBRARIES}) target_link_libraries(videocommon ${LIBAV_LIBRARIES})
add_definitions(-D__STDC_CONSTANT_MACROS) add_definitions(-D__STDC_CONSTANT_MACROS)
endif() endif()
add_definitions(-fPIC)
endif() endif()

3
Source/Core/VideoUICommon/CMakeLists.txt
View File

@ -2,6 +2,3 @@ set(SRCS Src/VideoConfigDiag.cpp
Src/DebuggerPanel.cpp) Src/DebuggerPanel.cpp)
add_library(videouicommon STATIC ${SRCS}) add_library(videouicommon STATIC ${SRCS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-fPIC)
endif()

2
Source/Plugins/CMakeLists.txt
View File

@ -1,3 +1,3 @@
add_subdirectory(Plugin_VideoOGL) add_subdirectory(Plugin_VideoOGL)
add_subdirectory(Plugin_VideoSoftware) #add_subdirectory(Plugin_VideoSoftware)
# TODO: Add other plugins here! # TODO: Add other plugins here!

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

@ -39,8 +39,5 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
set(LIBS ${LIBS} usbhid) set(LIBS ${LIBS} usbhid)
endif() endif()
add_library(Plugin_VideoOGL MODULE ${SRCS}) add_library(videoogl STATIC ${SRCS})
target_link_libraries(Plugin_VideoOGL ${LIBS}) target_link_libraries(videoogl ${LIBS})
install(TARGETS Plugin_VideoOGL
LIBRARY DESTINATION ${plugindir}
RUNTIME DESTINATION ${plugindir})