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

cmake: sdl and gsdx (experimental) 

Note: pad plugins crash when linked with sdl 1.3.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4381 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-03-01 19:26:27 +00:00
parent a96a345077
commit 2e6951d102
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
3rdparty/SDL-1.3.0-5387/CMakeLists.txt vendored
View File

@ -8,8 +8,6 @@ set(CommonFlags
-DHAVE_LINUX_VERSION_H -DHAVE_LINUX_VERSION_H
-D_REENTRANT -D_REENTRANT
-D__LINUX__ -D__LINUX__
-MMD
-MT
-pthread -pthread
-mmmx -mmmx
-msse -msse
@ -116,7 +114,7 @@ set(SDL_sources
"${SDL_ROOT}/src/SDL_log.c" "${SDL_ROOT}/src/SDL_log.c"
#c/atomic: #c/atomic:
"${SDL_ROOT}/src/atomic/SDL_atomic.c" # "${SDL_ROOT}/src/atomic/SDL_atomic.c"
"${SDL_ROOT}/src/atomic/SDL_spinlock.c" "${SDL_ROOT}/src/atomic/SDL_spinlock.c"
#c/audio: #c/audio:
@ -289,12 +287,12 @@ set(SDL_sources
"${SDL_ROOT}/src/render/software/SDL_drawpoint.h" "${SDL_ROOT}/src/render/software/SDL_drawpoint.h"
"${SDL_ROOT}/src/render/software/SDL_render_sw.c" "${SDL_ROOT}/src/render/software/SDL_render_sw.c"
"${SDL_ROOT}/src/render/software/SDL_render_sw_c.h" "${SDL_ROOT}/src/render/software/SDL_render_sw_c.h"
"${SDL_ROOT}/src/thread/generic/SDL_syscond.c" # "${SDL_ROOT}/src/thread/generic/SDL_syscond.c"
"${SDL_ROOT}/src/thread/generic/SDL_sysmutex.c" # "${SDL_ROOT}/src/thread/generic/SDL_sysmutex.c"
"${SDL_ROOT}/src/thread/generic/SDL_sysmutex_c.h" # "${SDL_ROOT}/src/thread/generic/SDL_sysmutex_c.h"
"${SDL_ROOT}/src/thread/generic/SDL_syssem.c" # "${SDL_ROOT}/src/thread/generic/SDL_syssem.c"
"${SDL_ROOT}/src/thread/generic/SDL_systhread.c" # "${SDL_ROOT}/src/thread/generic/SDL_systhread.c"
"${SDL_ROOT}/src/thread/generic/SDL_systhread_c.h" # "${SDL_ROOT}/src/thread/generic/SDL_systhread_c.h"
"${SDL_ROOT}/src/thread/pthread/SDL_syscond.c" "${SDL_ROOT}/src/thread/pthread/SDL_syscond.c"
"${SDL_ROOT}/src/thread/pthread/SDL_sysmutex.c" "${SDL_ROOT}/src/thread/pthread/SDL_sysmutex.c"
"${SDL_ROOT}/src/thread/pthread/SDL_sysmutex_c.h" "${SDL_ROOT}/src/thread/pthread/SDL_sysmutex_c.h"
@ -303,7 +301,7 @@ set(SDL_sources
"${SDL_ROOT}/src/thread/pthread/SDL_systhread_c.h" "${SDL_ROOT}/src/thread/pthread/SDL_systhread_c.h"
"${SDL_ROOT}/src/timer/dummy/SDL_systimer.c" "${SDL_ROOT}/src/timer/dummy/SDL_systimer.c"
"${SDL_ROOT}/src/timer/unix/SDL_systimer.c" "${SDL_ROOT}/src/timer/unix/SDL_systimer.c"
"${SDL_ROOT}/src/timer/wince/SDL_systimer.c" # "${SDL_ROOT}/src/timer/wince/SDL_systimer.c"
# "${SDL_ROOT}/src/video/directfb/SDL_DirectFB_dyn.c" # "${SDL_ROOT}/src/video/directfb/SDL_DirectFB_dyn.c"
# "${SDL_ROOT}/src/video/directfb/SDL_DirectFB_dyn.h" # "${SDL_ROOT}/src/video/directfb/SDL_DirectFB_dyn.h"
# "${SDL_ROOT}/src/video/directfb/SDL_DirectFB_events.c" # "${SDL_ROOT}/src/video/directfb/SDL_DirectFB_events.c"
@ -394,9 +392,6 @@ set(SDL_sources
add_library(${Output} STATIC ${SDL_sources} ) add_library(${Output} STATIC ${SDL_sources} )
# Link against opengl
# target_link_libraries(${Output} ${OPENGL_LIBRARIES})
# User flags options # User flags options
if(NOT USER_CMAKE_LD_FLAGS STREQUAL "") if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}") target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")

6
cmake/BuildParameters.cmake
View File

@ -144,11 +144,9 @@ if(NOT DEFINED FORCE_INTERNAL_ZLIB)
set(FORCE_INTERNAL_ZLIB FALSE) set(FORCE_INTERNAL_ZLIB FALSE)
endif(NOT DEFINED FORCE_INTERNAL_ZLIB) endif(NOT DEFINED FORCE_INTERNAL_ZLIB)
# Keep external sdl for the moment if(NOT DEFINED FORCE_INTERNAL_SDL)
set(FORCE_INTERNAL_SDL FALSE) set(FORCE_INTERNAL_SDL FALSE)
# if(NOT DEFINED FORCE_INTERNAL_SDL) endif(NOT DEFINED FORCE_INTERNAL_SDL)
# set(FORCE_INTERNAL_SDL FALSE)
# endif(NOT DEFINED FORCE_INTERNAL_SDL)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Select library system vs 3rdparty # Select library system vs 3rdparty

10
cmake/SelectPcsx2Plugins.cmake
View File

@ -168,6 +168,8 @@ set(PadNull TRUE)
#--------------------------------------- #---------------------------------------
# requires: -SDL # requires: -SDL
#--------------------------------------- #---------------------------------------
# FIXME: internal sdl does not like X11 input with dynamic feature (SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT)
if(NOT FORCE_INTERNAL_SDL)
if(SDL_FOUND) if(SDL_FOUND)
set(onepad TRUE) set(onepad TRUE)
else(SDL_FOUND) else(SDL_FOUND)
@ -175,6 +177,9 @@ else(SDL_FOUND)
message(STATUS "Skip build of onepad: miss some dependencies") message(STATUS "Skip build of onepad: miss some dependencies")
message(STATUS "${msg_dep_onepad}") message(STATUS "${msg_dep_onepad}")
endif(SDL_FOUND) endif(SDL_FOUND)
else(NOT FORCE_INTERNAL_SDL)
message(STATUS "Skip build of onepad not compatible with internal SDL")
endif(NOT FORCE_INTERNAL_SDL)
#--------------------------------------- #---------------------------------------
#--------------------------------------- #---------------------------------------
@ -182,6 +187,8 @@ endif(SDL_FOUND)
#--------------------------------------- #---------------------------------------
# requires: -SDL # requires: -SDL
#--------------------------------------- #---------------------------------------
# FIXME: internal sdl does not like X11 input with dynamic feature (SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT)
if(NOT FORCE_INTERNAL_SDL)
if(SDL_FOUND) if(SDL_FOUND)
set(zeropad TRUE) set(zeropad TRUE)
else(SDL_FOUND) else(SDL_FOUND)
@ -189,6 +196,9 @@ else(SDL_FOUND)
message(STATUS "Skip build of zeropad: miss some dependencies") message(STATUS "Skip build of zeropad: miss some dependencies")
message(STATUS "${msg_dep_zeropad}") message(STATUS "${msg_dep_zeropad}")
endif(SDL_FOUND) endif(SDL_FOUND)
else(NOT FORCE_INTERNAL_SDL)
message(STATUS "Skip build of zeropad not compatible with internal SDL")
endif(NOT FORCE_INTERNAL_SDL)
#--------------------------------------- #---------------------------------------
#--------------------------------------- #---------------------------------------