ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Purge USE_LEGACY_USER_DIRECTORY 

Had plenty of time to move over.
This commit is contained in:
Stenzek 2023-09-16 15:03:32 +10:00 committed by Connor McLaughlin
parent bd54729257
commit d15f2a0cbe
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/BuildParameters.cmake
View File

@ -22,7 +22,6 @@ option(USE_VULKAN "Enable Vulkan GS renderer" ON)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
option(ENABLE_SETCAP "Enable networking capability for DEV9" OFF) 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(X11_API "Enable X11 support" ON)
option(WAYLAND_API "Enable Wayland support" ON) option(WAYLAND_API "Enable Wayland support" ON)
endif() endif()

4
pcsx2/CMakeLists.txt
View File

@ -47,10 +47,6 @@ elseif("${PGO}" STREQUAL "use")
target_compile_options(PCSX2_FLAGS INTERFACE -fprofile-use) target_compile_options(PCSX2_FLAGS INTERFACE -fprofile-use)
endif() endif()
if(USE_LEGACY_USER_DIRECTORY)
target_compile_definitions(PCSX2_FLAGS INTERFACE USE_LEGACY_USER_DIRECTORY)
endif()
if(USE_LINKED_FFMPEG) if(USE_LINKED_FFMPEG)
target_compile_definitions(PCSX2_FLAGS INTERFACE 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) target_link_libraries(PCSX2_FLAGS INTERFACE FFMPEG::avcodec FFMPEG::avformat FFMPEG::avutil FFMPEG::swscale FFMPEG::swresample)

4
pcsx2/Pcsx2Config.cpp
View File

@ -1737,16 +1737,12 @@ void EmuFolders::SetDataDirectory()
const char* home_dir = getenv("HOME"); const char* home_dir = getenv("HOME");
if (home_dir) 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.. // ~/.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")); const std::string config_dir(Path::Combine(home_dir, ".config"));
if (!FileSystem::DirectoryExists(config_dir.c_str())) if (!FileSystem::DirectoryExists(config_dir.c_str()))
FileSystem::CreateDirectoryPath(config_dir.c_str(), false); FileSystem::CreateDirectoryPath(config_dir.c_str(), false);
DataRoot = Path::Combine(config_dir, "PCSX2"); DataRoot = Path::Combine(config_dir, "PCSX2");
#endif
} }
} }
#elif defined(__APPLE__) #elif defined(__APPLE__)