cmake: drop CDVDlinuz and CDVDiso

You can use cdvdGigaherz on linux now close #464 close #465
PCSX2 · Nov 8, 2016 · d3a748c · d3a748c
1 parent ed3052d
commit d3a748c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 32 deletions.
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
@@ -68,7 +68,6 @@ include(FindLibc)
 
 ## Only needed by the extra plugins
 if(EXTRA_PLUGINS)
-    find_package(BZip2)
     include(FindCg)
     include(FindGlew)
     find_package(JPEG)
@@ -137,10 +136,6 @@ if(ALSA_FOUND)
 	include_directories(${ALSA_INCLUDE_DIRS})
 endif()
 
-if(BZIP2_FOUND)
-	include_directories(${BZIP2_INCLUDE_DIR})
-endif()
-
 if(CG_FOUND)
 	include_directories(${CG_INCLUDE_DIRS})
 endif()

diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake
@@ -4,7 +4,6 @@
 set(msg_dep_common_libs "check these libraries -> wxWidgets (>=2.8.10), aio")
 set(msg_dep_pcsx2       "check these libraries -> wxWidgets (>=2.8.10), gtk2 (>=2.16), zlib (>=1.2.4), pcsx2 common libs")
 set(msg_dep_cdvdgiga    "check these libraries -> gtk2, libudev")
-set(msg_dep_cdvdiso     "check these libraries -> bzip2 (>=1.0.5), gtk2 (>=2.16)")
 set(msg_dep_zerogs      "check these libraries -> glew (>=1.6), opengl, X11, nvidia-cg-toolkit (>=2.1)")
 set(msg_dep_gsdx        "check these libraries -> opengl, png (>=1.2), zlib (>=1.2.4), X11")
 set(msg_dep_onepad      "check these libraries -> sdl (>=1.2), X11, gtk2 (>=2.16)")
@@ -110,30 +109,6 @@ else()
 endif()
 #---------------------------------------
 
-#---------------------------------------
-#			CDVDiso
-#---------------------------------------
-# requires: -BZip2
-#           -gtk2 (linux)
-#---------------------------------------
-if(EXTRA_PLUGINS)
-    if(BZIP2_FOUND AND GTKn_FOUND)
-        set(CDVDiso TRUE)
-    elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/CDVDiso")
-        set(CDVDiso FALSE)
-    else()
-        set(CDVDiso FALSE)
-        print_dep("Skip build of CDVDiso: miss some dependencies" "${msg_dep_cdvdiso}")
-    endif()
-endif()
-
-#---------------------------------------
-#			CDVDlinuz
-#---------------------------------------
-if(EXTRA_PLUGINS)
-    set(CDVDlinuz TRUE)
-endif()
-
 #---------------------------------------
 #			dev9null
 #---------------------------------------
@@ -313,10 +288,14 @@ endif()
 #---------------------------------------
 
 #-------------------------------------------------------------------------------
-#			[TODO] Write CMakeLists.txt for these plugins.
+# Super-seeded by cdvdGigaherz
 set(CDVDisoEFP FALSE)
 set(CDVDolio FALSE)
 set(CDVDpeops FALSE)
+set(CDVDlinuz FALSE) # used to be compiled on linux
+set(CDVDiso FALSE) # used to be compiled on linux
+
+# [TODO] Write CMakeLists.txt for these plugins. (or not ;) )
 set(PeopsSPU2 FALSE)
 set(SSSPSXPAD FALSE)
 set(xpad FALSE)

diff --git a/debian-packager/control b/debian-packager/control
@@ -7,7 +7,6 @@ Build-Depends: cmake (>= 2.8.5),
     dpkg-dev (>= 1.15.7),
     libaio-dev,
     libasound2-dev,
-    libbz2-dev,
     libgl1-mesa-dev,
     libglu1-mesa-dev,
     libgtk2.0-dev,