From d15f2a0cbe38226db2057f74adfec785afff5d1c Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 16 Sep 2023 15:03:32 +1000 Subject: [PATCH] CMake: Purge USE_LEGACY_USER_DIRECTORY Had plenty of time to move over. --- cmake/BuildParameters.cmake | 1 - pcsx2/CMakeLists.txt | 4 ---- pcsx2/Pcsx2Config.cpp | 4 ---- 3 files changed, 9 deletions(-) diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index d45ec2a02c..fbc42e10c0 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -22,7 +22,6 @@ option(USE_VULKAN "Enable Vulkan GS renderer" ON) #------------------------------------------------------------------------------- if(UNIX AND NOT APPLE) option(ENABLE_SETCAP "Enable networking capability for DEV9" OFF) - option(USE_LEGACY_USER_DIRECTORY "Use legacy home/PCSX2 user directory instead of XDG standard" OFF) option(X11_API "Enable X11 support" ON) option(WAYLAND_API "Enable Wayland support" ON) endif() diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 1b25a6cbca..11db95d61f 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -47,10 +47,6 @@ elseif("${PGO}" STREQUAL "use") target_compile_options(PCSX2_FLAGS INTERFACE -fprofile-use) endif() -if(USE_LEGACY_USER_DIRECTORY) - target_compile_definitions(PCSX2_FLAGS INTERFACE USE_LEGACY_USER_DIRECTORY) -endif() - if(USE_LINKED_FFMPEG) target_compile_definitions(PCSX2_FLAGS INTERFACE USE_LINKED_FFMPEG) target_link_libraries(PCSX2_FLAGS INTERFACE FFMPEG::avcodec FFMPEG::avformat FFMPEG::avutil FFMPEG::swscale FFMPEG::swresample) diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp index c0b331fdda..1b1904114e 100644 --- a/pcsx2/Pcsx2Config.cpp +++ b/pcsx2/Pcsx2Config.cpp @@ -1737,16 +1737,12 @@ void EmuFolders::SetDataDirectory() const char* home_dir = getenv("HOME"); if (home_dir) { -#ifdef USE_LEGACY_USER_DIRECTORY - DataRoot = Path::Combine(home_dir, "PCSX2"); -#else // ~/.config should exist, but just in case it doesn't and this is a fresh profile.. const std::string config_dir(Path::Combine(home_dir, ".config")); if (!FileSystem::DirectoryExists(config_dir.c_str())) FileSystem::CreateDirectoryPath(config_dir.c_str(), false); DataRoot = Path::Combine(config_dir, "PCSX2"); -#endif } } #elif defined(__APPLE__)