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/CMakeLists.txt | 75 ----------------------------------------------- 1 file changed, 75 deletions(-) delete mode 100644 libs/usvfs/CMakeLists.txt (limited to 'libs/usvfs/CMakeLists.txt') diff --git a/libs/usvfs/CMakeLists.txt b/libs/usvfs/CMakeLists.txt deleted file mode 100644 index e0deb42..0000000 --- a/libs/usvfs/CMakeLists.txt +++ /dev/null @@ -1,75 +0,0 @@ -cmake_minimum_required(VERSION 3.16) - -include(CMakePackageConfigHelpers) - -project(usvfs) - -set_property(GLOBAL PROPERTY USE_FOLDERS ON) -set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) -set(CMAKE_CXX_STANDARD 20) - -set(USVFS_BINDIR ${CMAKE_CURRENT_LIST_DIR}/bin) -set(USVFS_LIBDIR ${CMAKE_CURRENT_LIST_DIR}/lib) - -if (MSVC) - # /Zi generate PDBs - # /Gy enable function-level linking - # /Oi enable intrinsic function - add_compile_options("$<$>:/Zi;/Gy;/Oi>") - - # /OPT:ICF enable COMDAT folding - # /DEBUG:FULL generate debug info (PDB) - # /OPT:REF enable references (PDB) - add_link_options("$<$>:/OPT:ICF;/DEBUG:FULL;/OPT:REF>") -endif() - -if(CMAKE_SIZEOF_VOID_P EQUAL 4) - set(ARCH_POSTFIX _x86) -else() - set(ARCH_POSTFIX _x64) -endif() - -add_subdirectory(src/shared) - -add_subdirectory(src/thooklib) -add_subdirectory(src/tinjectlib) -add_subdirectory(src/usvfs_helper) - -add_subdirectory(src/usvfs_dll) -add_subdirectory(src/usvfs_proxy) - -configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.cmake.in - "${CMAKE_CURRENT_BINARY_DIR}/usvfsConfig.cmake" - INSTALL_DESTINATION "lib/cmake/usvfs" - NO_SET_AND_CHECK_MACRO - NO_CHECK_REQUIRED_COMPONENTS_MACRO -) - -file(READ "${CMAKE_CURRENT_SOURCE_DIR}/include/usvfs/usvfs_version.h" usvfs_version) -string(REGEX MATCH "USVFS_VERSION_MAJOR ([0-9]*)" _ ${usvfs_version}) -set(usvfs_version_major ${CMAKE_MATCH_1}) -string(REGEX MATCH "USVFS_VERSION_MINOR ([0-9]*)" _ ${usvfs_version}) -set(usvfs_version_minor ${CMAKE_MATCH_1}) -string(REGEX MATCH "USVFS_VERSION_BUILD ([0-9]*)" _ ${usvfs_version}) -set(usvfs_version_build ${CMAKE_MATCH_1}) -string(REGEX MATCH "USVFS_VERSION_REVISION ([0-9]*)" _ ${usvfs_version}) -set(usvfs_version_revision ${CMAKE_MATCH_1}) - -write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/usvfsConfigVersion.cmake" - VERSION "${usvfs_version_major}.${usvfs_version_minor}.${usvfs_version_build}.${usvfs_version_revision}" - COMPATIBILITY AnyNewerVersion - ARCH_INDEPENDENT -) - -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/usvfsConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/usvfsConfigVersion.cmake - DESTINATION lib/cmake/usvfs -) - -if (BUILD_TESTING) - enable_testing() - set(USVFS_TEST_BINDIR ${CMAKE_CURRENT_LIST_DIR}/test/bin) - add_subdirectory(test) -endif() -- cgit v1.3.1