From d2422735e69f5d9a7054ef176155852d954f1124 Mon Sep 17 00:00:00 2001 From: veclavtalica Date: Sun, 13 Oct 2024 19:17:26 +0300 Subject: [PATCH] /third-party/physfs/: remove unused archivers, actually make cmake options pass, duh --- CMakeLists.txt | 23 ++++++++++++----------- third-party/physfs/CMakeLists.txt | 9 --------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7acdb6c..fd679bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,17 +44,18 @@ endif() # add -fPIC globally so that it's linked well add_compile_options($<$:-fPIC>) -set(PHYSFS_BUILD_SHARED FALSE) -set(PHYSFS_DISABLE_INSTALL TRUE) -set(PHYSFS_TARGETNAME_UNINSTALL "physfs_uninstall") -set(PHYSFS_ARCHIVE_GRP OFF) -set(PHYSFS_ARCHIVE_WAD OFF) -set(PHYSFS_ARCHIVE_HOG OFF) -set(PHYSFS_ARCHIVE_MVL OFF) -set(PHYSFS_ARCHIVE_QPAK OFF) -set(PHYSFS_ARCHIVE_SLB OFF) -set(PHYSFS_ARCHIVE_ISO9660 OFF) -set(PHYSFS_ARCHIVE_VDF OFF) +set(PHYSFS_BUILD_SHARED FALSE CACHE INTERNAL "") +set(PHYSFS_DISABLE_INSTALL TRUE CACHE INTERNAL "") +set(PHYSFS_TARGETNAME_UNINSTALL "physfs_uninstall" CACHE INTERNAL "") +set(PHYSFS_ARCHIVE_GRP OFF CACHE BOOL "") +set(PHYSFS_ARCHIVE_WAD OFF CACHE INTERNAL "") +set(PHYSFS_ARCHIVE_HOG OFF CACHE INTERNAL "") +set(PHYSFS_ARCHIVE_MVL OFF CACHE INTERNAL "") +set(PHYSFS_ARCHIVE_QPAK OFF CACHE INTERNAL "") +set(PHYSFS_ARCHIVE_SLB OFF CACHE INTERNAL "") +set(PHYSFS_ARCHIVE_ISO9660 OFF CACHE INTERNAL "") +set(PHYSFS_ARCHIVE_VDF OFF CACHE INTERNAL "") +set(PHYSFS_ARCHIVE_7Z OFF CACHE INTERNAL "") add_subdirectory(third-party/physfs ${CMAKE_CURRENT_BINARY_DIR}/third-party/physfs SYSTEM) add_subdirectory(third-party/libxm ${CMAKE_CURRENT_BINARY_DIR}/third-party/libxm SYSTEM) diff --git a/third-party/physfs/CMakeLists.txt b/third-party/physfs/CMakeLists.txt index 9ac0eea..085e9fd 100644 --- a/third-party/physfs/CMakeLists.txt +++ b/third-party/physfs/CMakeLists.txt @@ -85,16 +85,7 @@ set(PHYSFS_SRCS src/physfs_platform_android.c src/physfs_archiver_dir.c src/physfs_archiver_unpacked.c - src/physfs_archiver_grp.c - src/physfs_archiver_hog.c - src/physfs_archiver_7z.c - src/physfs_archiver_mvl.c - src/physfs_archiver_qpak.c - src/physfs_archiver_wad.c src/physfs_archiver_zip.c - src/physfs_archiver_slb.c - src/physfs_archiver_iso9660.c - src/physfs_archiver_vdf.c ${PHYSFS_CPP_SRCS} ${PHYSFS_M_SRCS} )