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

[cmake] Drop internal bzip version. No reason to use it, moreover compilation is broken for some distribution. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3239 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2010-06-19 13:45:30 +00:00
parent a7b2855412
commit a11941d318
3 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/CMakeLists.txt vendored
View File

@ -1,8 +1,3 @@
# build project bzip2
if(projectBZip2)
add_subdirectory(bzip2)
endif(projectBZip2)
# build project zlib
if(projectZLIB)
add_subdirectory(zlib)

6
cmake/BuildParameters.cmake
View File

@ -3,7 +3,6 @@
# Enable/disable the stipping : -DCMAKE_BUILD_STRIP=TRUE|FALSE
### Force the choice of 3rd party library in pcsx2 over system libraries
# Use all internal lib: -DFORCE_INTERNAL_ALL=TRUE
# Use bzip internal lib: -DFORCE_INTERNAL_BZIP2=TRUE
# Use soundtouch internal lib: -DFORCE_INTERNAL_SOUNDTOUCH=TRUE
# Use zlib internal lib: -DFORCE_INTERNAL_ZLIB=TRUE
#-------------------------------------------------------------------------------
@ -37,15 +36,10 @@ endif(NOT DEFINED CMAKE_BUILD_STRIP)
# Select library system vs 3rdparty
#-------------------------------------------------------------------------------
if(FORCE_INTERNAL_ALL)
set(FORCE_INTERNAL_BZIP2 TRUE)
set(FORCE_INTERNAL_SOUNDTOUCH TRUE)
set(FORCE_INTERNAL_ZLIB TRUE)
endif(FORCE_INTERNAL_ALL)
if(NOT DEFINED FORCE_INTERNAL_BZIP2)
set(FORCE_INTERNAL_BZIP2 FALSE)
endif(NOT DEFINED FORCE_INTERNAL_BZIP2)
if(NOT DEFINED FORCE_INTERNAL_SOUNDTOUCH)
set(FORCE_INTERNAL_SOUNDTOUCH TRUE)
message(STATUS "Use internal version of Soundtouch by default.

9
cmake/SearchForStuff.cmake
View File

@ -48,15 +48,6 @@ if(NOT ZLIB_FOUND OR FORCE_INTERNAL_ZLIB)
include_directories(${PROJECT_SOURCE_DIR}/3rdparty/zlib)
endif(NOT ZLIB_FOUND OR FORCE_INTERNAL_ZLIB)
if(NOT BZIP2_FOUND OR FORCE_INTERNAL_BZIP2)
# use project one
set(projectBZip2 TRUE)
set(BZIP2_FOUND TRUE)
# Set path
set(BZIP2_LIBRARIES pcsx2_bzip2)
include_directories(${PROJECT_SOURCE_DIR}/3rdparty/bzip2)
endif(NOT BZIP2_FOUND OR FORCE_INTERNAL_BZIP2)
if(NOT SOUNDTOUCH_FOUND OR FORCE_INTERNAL_SOUNDTOUCH)
# use project one
set(projectSoundTouch TRUE)