Remove old references to libarchive
This commit is contained in:
parent
082716e9c9
commit
191e23ed13
|
@ -64,7 +64,6 @@ pkg_check_modules(PLIST libplist)
|
|||
pkg_check_modules(USBMUXD libusbmuxd)
|
||||
pkg_check_modules(LIBMTP libmtp>=1.0)
|
||||
pkg_check_modules(INDICATEQT indicate-qt)
|
||||
pkg_check_modules(ARCHIVE libarchive)
|
||||
pkg_check_modules(SPOTIFY libspotify>=0.0.8)
|
||||
pkg_check_modules(CDIO libcdio)
|
||||
|
||||
|
@ -75,14 +74,6 @@ if (WIN32)
|
|||
find_library(QTSPARKLE_LIBRARIES qtsparkle)
|
||||
endif (WIN32)
|
||||
|
||||
if (APPLE)
|
||||
find_library(ARCHIVE_LIBRARIES archive)
|
||||
find_path(ARCHIVE_INCLUDE_DIRS archive.h)
|
||||
if (ARCHIVE_LIBRARIES)
|
||||
set(ARCHIVE_FOUND ON)
|
||||
endif (ARCHIVE_LIBRARIES)
|
||||
endif (APPLE)
|
||||
|
||||
find_library(LASTFM_LIBRARIES lastfm)
|
||||
find_path(LASTFM_INCLUDE_DIRS lastfm/ws.h)
|
||||
|
||||
|
@ -190,7 +181,6 @@ option(ENABLE_VISUALISATIONS "Use libprojectm visualisations" ON)
|
|||
option(BUNDLE_PROJECTM_PRESETS "Install Clementine's own copies of libprojectm presets - disable this if you want to use a system package instead" ON)
|
||||
option(ENABLE_SOUNDMENU "Add Clementine to the Gnome sound menu" ON)
|
||||
option(ENABLE_LIBLASTFM "Use liblastfm for fetching song info, scrobbling and radio streams" ON)
|
||||
option(ENABLE_SCRIPTING_ARCHIVES "Enable support for loading scripts from archives (.clem or .tar.gz files)" ON)
|
||||
option(ENABLE_REMOTE "Enable support for using remote controls with Clementine" OFF)
|
||||
option(ENABLE_BREAKPAD "Enable crash reporting" OFF)
|
||||
option(ENABLE_SPOTIFY_BLOB "Build the spotify non-GPL binary" ON)
|
||||
|
@ -228,10 +218,6 @@ if(ENABLE_LIBLASTFM AND LASTFM_LIBRARIES AND LASTFM_INCLUDE_DIRS)
|
|||
set(HAVE_LIBLASTFM ON)
|
||||
endif(ENABLE_LIBLASTFM AND LASTFM_LIBRARIES AND LASTFM_INCLUDE_DIRS)
|
||||
|
||||
if(ENABLE_SCRIPTING_ARCHIVES AND ARCHIVE_FOUND)
|
||||
set(HAVE_LIBARCHIVE ON)
|
||||
endif(ENABLE_SCRIPTING_ARCHIVES AND ARCHIVE_FOUND)
|
||||
|
||||
if(ENABLE_WIIMOTEDEV AND HAVE_DBUS)
|
||||
set(HAVE_WIIMOTEDEV ON)
|
||||
endif(ENABLE_WIIMOTEDEV AND HAVE_DBUS)
|
||||
|
@ -409,7 +395,6 @@ summary_add("Devices: MTP support" HAVE_LIBMTP)
|
|||
summary_add("Devices: GIO backend" HAVE_GIO)
|
||||
summary_add("Gnome sound menu integration" HAVE_LIBINDICATE)
|
||||
summary_add("Last.fm support" HAVE_LIBLASTFM)
|
||||
summary_add("Scripting support: loading archives" HAVE_LIBARCHIVE)
|
||||
summary_add("Spotify support: core code" HAVE_SPOTIFY)
|
||||
summary_add("Spotify support: non-GPL binary helper" HAVE_SPOTIFY_BLOB)
|
||||
summary_add("Visualisations" ENABLE_VISUALISATIONS)
|
||||
|
|
|
@ -106,7 +106,6 @@ Section "Clementine" Clementine
|
|||
File "clementine.ico"
|
||||
File "glew32.dll"
|
||||
File "intl.dll"
|
||||
File "libarchive.dll"
|
||||
File "libcdio-12.dll"
|
||||
File "libexpat-1.dll"
|
||||
File "libfaac.dll"
|
||||
|
@ -940,7 +939,6 @@ Section "Uninstall"
|
|||
Delete "$INSTDIR\clementine-spotifyblob.exe"
|
||||
Delete "$INSTDIR\glew32.dll"
|
||||
Delete "$INSTDIR\intl.dll"
|
||||
Delete "$INSTDIR\libarchive.dll"
|
||||
Delete "$INSTDIR\libcdio-12.dll"
|
||||
Delete "$INSTDIR\libexpat-1.dll"
|
||||
Delete "$INSTDIR\libfaac.dll"
|
||||
|
|
|
@ -1006,10 +1006,6 @@ if(HAVE_AUDIOCD)
|
|||
target_link_libraries(clementine_lib ${GSTREAMER_CDDA_LIBRARIES})
|
||||
endif(HAVE_AUDIOCD)
|
||||
|
||||
if(HAVE_LIBARCHIVE)
|
||||
target_link_libraries(clementine_lib ${ARCHIVE_LIBRARIES})
|
||||
endif(HAVE_LIBARCHIVE)
|
||||
|
||||
if(HAVE_IMOBILEDEVICE)
|
||||
target_link_libraries(clementine_lib
|
||||
${IMOBILEDEVICE_LIBRARIES}
|
||||
|
|
Loading…
Reference in New Issue