From bf7a57fc55493247a624ecfd65e4d73964e7d8d2 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Sun, 12 Apr 2026 02:40:16 -0500 Subject: Remove vendored usvfs and Windows-only usvfs code paths The Linux port uses its own in-process FUSE VFS (FuseConnector), so usvfs was dead weight: libs/usvfs/ was never built, usvfsconnector.cpp was explicitly REMOVE_ITEM'd from the source list, and every call site was already guarded by #ifdef _WIN32 with a working Linux branch (the Windows build is also broken on this branch, since FUSE3 is a hard find_package dependency). - Drop libs/usvfs/ and src/src/usvfsconnector.{cpp,h} - Collapse #ifdef _WIN32 / usvfs include branches in organizercore, mainwindow, settings, util, spawn - Remove getUsvfsVersionString() and the "usvfs: ..." log field - Remove vfs32/64DLLName APPPARAMs (nothing reads them) - Relabel About dialog "usvfs:" row to "VFS: FUSE 3" --- libs/usvfs/src/usvfs_dll/CMakeLists.txt | 57 --------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 libs/usvfs/src/usvfs_dll/CMakeLists.txt (limited to 'libs/usvfs/src/usvfs_dll/CMakeLists.txt') diff --git a/libs/usvfs/src/usvfs_dll/CMakeLists.txt b/libs/usvfs/src/usvfs_dll/CMakeLists.txt deleted file mode 100644 index 2520b50..0000000 --- a/libs/usvfs/src/usvfs_dll/CMakeLists.txt +++ /dev/null @@ -1,57 +0,0 @@ -cmake_minimum_required(VERSION 3.16) - -include(GNUInstallDirs) - -find_package(Boost CONFIG REQUIRED COMPONENTS thread) -find_package(spdlog CONFIG REQUIRED) - -file(GLOB sources "*.cpp" "*.h") -source_group("" FILES ${sources}) - -file(GLOB hooks "hooks/*.cpp" "hooks/*.h") -source_group("dlls" FILES ${hooks}) - -add_library(usvfs_dll SHARED) -target_sources(usvfs_dll - PRIVATE - ${PROJECT_SOURCE_DIR}/include/usvfs/usvfsparametersprivate.h - ${sources} - ${hooks} - version.rc - PUBLIC - FILE_SET HEADERS - BASE_DIRS ${PROJECT_SOURCE_DIR}/include - FILES - ${PROJECT_SOURCE_DIR}/include/usvfs/dllimport.h - ${PROJECT_SOURCE_DIR}/include/usvfs/logging.h - ${PROJECT_SOURCE_DIR}/include/usvfs/sharedparameters.h - ${PROJECT_SOURCE_DIR}/include/usvfs/usvfs_version.h - ${PROJECT_SOURCE_DIR}/include/usvfs/usvfs.h - ${PROJECT_SOURCE_DIR}/include/usvfs/usvfsparameters.h -) -target_link_libraries(usvfs_dll - PRIVATE shared thooklib usvfs_helper - Boost::thread spdlog::spdlog_header_only - Shlwapi) -target_compile_definitions(usvfs_dll PRIVATE BUILDING_USVFS_DLL) -set_target_properties(usvfs_dll - PROPERTIES - ARCHIVE_OUTPUT_NAME usvfs${ARCH_POSTFIX} - ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${USVFS_LIBDIR} - ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${USVFS_LIBDIR} - LIBRARY_OUTPUT_NAME usvfs${ARCH_POSTFIX} - LIBRARY_OUTPUT_DIRECTORY_DEBUG ${USVFS_LIBDIR} - LIBRARY_OUTPUT_DIRECTORY_RELEASE ${USVFS_LIBDIR} - PDB_OUTPUT_DIRECTORY_DEBUG ${USVFS_LIBDIR} - PDB_OUTPUT_DIRECTORY_RELEASE ${USVFS_LIBDIR} - RUNTIME_OUTPUT_NAME usvfs${ARCH_POSTFIX} - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${USVFS_LIBDIR} - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${USVFS_LIBDIR}) - -install(TARGETS usvfs_dll EXPORT usvfs${ARCH_POSTFIX}Targets FILE_SET HEADERS) -install(FILES $ DESTINATION pdb OPTIONAL) -install(EXPORT usvfs${ARCH_POSTFIX}Targets - FILE usvfs${ARCH_POSTFIX}Targets.cmake - NAMESPACE usvfs${ARCH_POSTFIX}:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/usvfs -) -- cgit v1.3.1