diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index f42df6d0b..542f28c83 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -1,8 +1,3 @@ -# build project bzip2 -if(projectBZip2) - add_subdirectory(bzip2) -endif(projectBZip2) - # build project zlib if(projectZLIB) add_subdirectory(zlib) diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index 26076d969..37922b117 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -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. diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 39e7543b3..0cf9a85b6 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -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)