From 30568a057dbe071021276c756ee434fa00b5a68a Mon Sep 17 00:00:00 2001 From: Jean-Philip Desjardins Date: Tue, 11 Mar 2025 12:48:26 -0400 Subject: [PATCH] Use app_config module. --- Source/CMakeLists.txt | 12 ++++++--- Source/app_shared/AppConfig.h | 2 +- Source/app_shared/CMakeLists.txt | 1 + Source/app_shared/DefaultAppConfig.h | 18 +++++++++++++ Source/ee/COP_VU.cpp | 2 +- Source/ee/DMAC.cpp | 2 +- Source/ee/Dmac_Channel.cpp | 2 +- Source/ee/Ee_SubSystem.cpp | 2 +- Source/ee/GIF.cpp | 2 +- Source/ee/INTC.cpp | 2 +- Source/ee/IPU.cpp | 2 +- Source/ee/PS2OS.cpp | 2 +- Source/ee/SIF.cpp | 2 +- Source/ee/Timer.cpp | 2 +- Source/ee/Vif.cpp | 2 +- Source/ee/Vpu.cpp | 2 +- Source/gs/GSH_Direct3D9/GSH_Direct3D9.cpp | 1 - Source/gs/GSH_OpenGL/CMakeLists.txt | 8 ++++++ Source/gs/GSH_OpenGL/GSH_OpenGL.cpp | 3 +-- Source/gs/GSH_Vulkan/CMakeLists.txt | 8 ++++++ Source/gs/GSH_Vulkan/GSH_Vulkan.cpp | 4 +-- Source/gs/GSH_Vulkan/GSH_VulkanDeviceInfo.cpp | 2 +- Source/gs/GSHandler.cpp | 4 +-- Source/iop/IopBios.cpp | 2 +- Source/iop/Iop_Cdvdfsv.cpp | 2 +- Source/iop/Iop_Cdvdman.cpp | 2 +- Source/iop/Iop_Dmac.cpp | 2 +- Source/iop/Iop_Dmacman.cpp | 2 +- Source/iop/Iop_FileIoHandler1000.cpp | 2 +- Source/iop/Iop_FileIoHandler2100.cpp | 2 +- Source/iop/Iop_FileIoHandler2200.cpp | 2 +- Source/iop/Iop_Heaplib.cpp | 2 +- Source/iop/Iop_Intrman.cpp | 2 +- Source/iop/Iop_Ioman.cpp | 4 +-- Source/iop/Iop_LibSd.cpp | 2 +- Source/iop/Iop_Loadcore.cpp | 2 +- Source/iop/Iop_McServ.cpp | 4 +-- Source/iop/Iop_Modload.cpp | 2 +- Source/iop/Iop_MtapMan.cpp | 2 +- Source/iop/Iop_Naplink.cpp | 2 +- Source/iop/Iop_PadMan.cpp | 2 +- Source/iop/Iop_RootCounters.cpp | 2 +- Source/iop/Iop_Secrman.cpp | 2 +- Source/iop/Iop_SifCmd.cpp | 2 +- Source/iop/Iop_SifMan.cpp | 2 +- Source/iop/Iop_Sio2.cpp | 2 +- Source/iop/Iop_Spu.cpp | 2 +- Source/iop/Iop_Spu2.cpp | 2 +- Source/iop/Iop_Spu2_Core.cpp | 2 +- Source/iop/Iop_SpuBase.cpp | 2 +- Source/iop/Iop_Stdio.cpp | 2 +- Source/iop/Iop_SubSystem.cpp | 2 +- Source/iop/Iop_Sysclib.cpp | 2 +- Source/iop/Iop_Sysmem.cpp | 2 +- Source/iop/Iop_Thbase.cpp | 2 +- Source/iop/Iop_Thevent.cpp | 2 +- Source/iop/Iop_Thfpool.cpp | 2 +- Source/iop/Iop_Thmsgbx.cpp | 2 +- Source/iop/Iop_Thsema.cpp | 2 +- Source/iop/Iop_Thvpool.cpp | 2 +- Source/iop/Iop_Timrman.cpp | 2 +- Source/iop/Iop_Usbd.cpp | 2 +- Source/iop/Iop_Vblank.cpp | 2 +- Source/iop/ioman/PreferenceDirectoryDevice.h | 2 +- Source/iop/namco_sys147/Iop_NamcoSys147.cpp | 2 +- Source/iop/namco_sys246/Iop_NamcoAcCdvd.cpp | 2 +- Source/iop/namco_sys246/Iop_NamcoAcRam.cpp | 2 +- Source/ui_android/GSH_OpenGLAndroid.cpp | 1 - Source/ui_android/NativeInterop.cpp | 3 ++- Source/ui_android/SettingsManager.cpp | 2 +- Source/ui_ios/AltServerJitService.mm | 2 +- Source/ui_ios/EmulatorViewController.mm | 2 +- Source/ui_ios/GSH_OpenGLiOS.cpp | 1 - Source/ui_ios/RenderView.mm | 2 +- Source/ui_ios/SettingsViewController.mm | 2 +- Source/ui_ios/VirtualPadButton.mm | 2 +- Source/ui_ios/VirtualPadView.mm | 2 +- Source/ui_ios/main.mm | 1 + Source/ui_js/Main.cpp | 1 + Source/ui_libretro/main_libretro.cpp | 2 ++ .../FrameDebugger/GsContextView.cpp | 1 - Source/ui_qt/main.cpp | 25 ++++++++++++++++-- Source/ui_shared/BootablesDbClient.cpp | 2 +- tools/AutoTest/Main.cpp | 1 + tools/ElfView/main.cpp | 14 ++++++++++ tools/McServTest/AppConfig.cpp | 26 ------------------- tools/McServTest/AppConfig.h | 24 ----------------- tools/McServTest/CMakeLists.txt | 2 -- tools/McServTest/Main.cpp | 12 +++++++++ tools/PsfPlayer/Source/AppConfig.cpp | 26 ------------------- tools/PsfPlayer/Source/AppConfig.h | 24 ----------------- tools/PsfPlayer/Source/AppDef.cpp | 14 ++++++++++ tools/PsfPlayer/Source/CMakeLists.txt | 4 +-- tools/SpuTest/Main.cpp | 1 + tools/VuTest/Main.cpp | 1 + 95 files changed, 190 insertions(+), 189 deletions(-) create mode 100644 Source/app_shared/DefaultAppConfig.h delete mode 100644 tools/McServTest/AppConfig.cpp delete mode 100644 tools/McServTest/AppConfig.h delete mode 100644 tools/PsfPlayer/Source/AppConfig.cpp delete mode 100644 tools/PsfPlayer/Source/AppConfig.h create mode 100644 tools/PsfPlayer/Source/AppDef.cpp diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 56a16be81..2cee19d3f 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -57,6 +57,14 @@ if(NOT TARGET Framework_Http) endif() list(APPEND PROJECT_LIBS Framework_Http) +if(NOT TARGET app_shared) + add_subdirectory( + ${CMAKE_CURRENT_SOURCE_DIR}/app_shared + ${CMAKE_CURRENT_BINARY_DIR}/app_shared + ) +endif() +list(APPEND PROJECT_LIBS app_shared) + if(ENABLE_AMAZON_S3) if(NOT TARGET Framework_Amazon) add_subdirectory( @@ -138,8 +146,6 @@ if(NOT (TARGET_PLATFORM_ANDROID OR TARGET_PLATFORM_IOS)) endif() set(COMMON_SRC_FILES - AppConfig.cpp - AppConfig.h BasicBlock.cpp BasicBlock.h BiosDebugInfoProvider.h @@ -438,8 +444,6 @@ set(COMMON_SRC_FILES ISO9660/PathTableRecord.h ISO9660/VolumeDescriptor.cpp ISO9660/VolumeDescriptor.h - Log.cpp - Log.h MA_MIPSIV.cpp MA_MIPSIV.h MA_MIPSIV_Reflection.cpp diff --git a/Source/app_shared/AppConfig.h b/Source/app_shared/AppConfig.h index ed2e8d152..a8cfa553d 100644 --- a/Source/app_shared/AppConfig.h +++ b/Source/app_shared/AppConfig.h @@ -11,7 +11,7 @@ public: //This needs to be implemented by every application/executable fs::path GetBasePath() const; - + private: CConfig::PathType BuildConfigPath(); }; diff --git a/Source/app_shared/CMakeLists.txt b/Source/app_shared/CMakeLists.txt index 8e3e113f1..ac36e5fb2 100644 --- a/Source/app_shared/CMakeLists.txt +++ b/Source/app_shared/CMakeLists.txt @@ -22,6 +22,7 @@ endif() set(COMMON_SRC_FILES AppConfig.cpp AppConfig.h + DefaultAppConfig.h Log.cpp Log.h ) diff --git a/Source/app_shared/DefaultAppConfig.h b/Source/app_shared/DefaultAppConfig.h new file mode 100644 index 000000000..01535c12b --- /dev/null +++ b/Source/app_shared/DefaultAppConfig.h @@ -0,0 +1,18 @@ +#pragma once + +//Include this file in your app's main.cpp file to obtain a default AppConfig base path. + +#include "PathUtils.h" +#include "AppConfig.h" + +fs::path CAppConfig::GetBasePath() const +{ + static const char* BASE_DATA_PATH = "Play Data Files"; + static const auto basePath = + []() { + auto result = Framework::PathUtils::GetPersonalDataPath() / BASE_DATA_PATH; + Framework::PathUtils::EnsurePathExists(result); + return result; + }(); + return basePath; +} diff --git a/Source/ee/COP_VU.cpp b/Source/ee/COP_VU.cpp index 058c03938..5abb1819b 100644 --- a/Source/ee/COP_VU.cpp +++ b/Source/ee/COP_VU.cpp @@ -1,7 +1,7 @@ #include #include "COP_VU.h" #include "VUShared.h" -#include "../Log.h" +#include "Log.h" #include "../MIPS.h" #include "../MemoryUtils.h" #include "offsetof_def.h" diff --git a/Source/ee/DMAC.cpp b/Source/ee/DMAC.cpp index bb6ecb05f..dded6896a 100644 --- a/Source/ee/DMAC.cpp +++ b/Source/ee/DMAC.cpp @@ -2,7 +2,7 @@ #include #include "DMAC.h" #include "../Ps2Const.h" -#include "../Log.h" +#include "Log.h" #include "../states/RegisterStateFile.h" #include "../MIPS.h" #include "../COP_SCU.h" diff --git a/Source/ee/Dmac_Channel.cpp b/Source/ee/Dmac_Channel.cpp index ef86791e7..3e78ee1cf 100644 --- a/Source/ee/Dmac_Channel.cpp +++ b/Source/ee/Dmac_Channel.cpp @@ -2,7 +2,7 @@ #include #include "string_format.h" #include "../states/RegisterStateFile.h" -#include "../Log.h" +#include "Log.h" #include "Dmac_Channel.h" #include "DMAC.h" diff --git a/Source/ee/Ee_SubSystem.cpp b/Source/ee/Ee_SubSystem.cpp index 82c5e3369..b54aeed43 100644 --- a/Source/ee/Ee_SubSystem.cpp +++ b/Source/ee/Ee_SubSystem.cpp @@ -4,7 +4,7 @@ #include "AppConfig.h" #include "StdStreamUtils.h" #include "../Ps2Const.h" -#include "../Log.h" +#include "Log.h" #include "../states/MemoryStateFile.h" #include "../iop/IopBios.h" #include "Vif.h" diff --git a/Source/ee/GIF.cpp b/Source/ee/GIF.cpp index 6cf5994b4..f6e90ac92 100644 --- a/Source/ee/GIF.cpp +++ b/Source/ee/GIF.cpp @@ -3,7 +3,7 @@ #include #include "../uint128.h" #include "../Ps2Const.h" -#include "../Log.h" +#include "Log.h" #include "../FrameDump.h" #include "../states/RegisterStateFile.h" #include "../states/MemoryStateFile.h" diff --git a/Source/ee/INTC.cpp b/Source/ee/INTC.cpp index 33a022c4b..c19c77c34 100644 --- a/Source/ee/INTC.cpp +++ b/Source/ee/INTC.cpp @@ -1,5 +1,5 @@ #include "INTC.h" -#include "../Log.h" +#include "Log.h" #include "../states/RegisterStateFile.h" #define LOG_NAME ("ee_intc") diff --git a/Source/ee/IPU.cpp b/Source/ee/IPU.cpp index c4c8245b9..547cf4985 100644 --- a/Source/ee/IPU.cpp +++ b/Source/ee/IPU.cpp @@ -21,7 +21,7 @@ #include "mpeg2/InverseScanTable.h" #include "idct/TrivialC.h" #include "idct/IEEE1180.h" -#include "../Log.h" +#include "Log.h" #include "DMAC.h" #include "INTC.h" #include "Ps2Const.h" diff --git a/Source/ee/PS2OS.cpp b/Source/ee/PS2OS.cpp index b00fbfad2..6062aed6a 100644 --- a/Source/ee/PS2OS.cpp +++ b/Source/ee/PS2OS.cpp @@ -15,7 +15,7 @@ #include "../ElfFile.h" #include "../COP_SCU.h" #include "../uint128.h" -#include "../Log.h" +#include "Log.h" #include "../iop/IopBios.h" #include "DMAC.h" #include "INTC.h" diff --git a/Source/ee/SIF.cpp b/Source/ee/SIF.cpp index 44f1657d4..0a65c8a89 100644 --- a/Source/ee/SIF.cpp +++ b/Source/ee/SIF.cpp @@ -1,6 +1,6 @@ #include #include -#include "../Log.h" +#include "Log.h" #include "../Ps2Const.h" #include "../states/RegisterStateCollectionFile.h" #include "../states/MemoryStateFile.h" diff --git a/Source/ee/Timer.cpp b/Source/ee/Timer.cpp index 33f665c4b..88928b2df 100644 --- a/Source/ee/Timer.cpp +++ b/Source/ee/Timer.cpp @@ -1,6 +1,6 @@ #include #include -#include "../Log.h" +#include "Log.h" #include "../states/RegisterStateFile.h" #include "Timer.h" #include "Ps2Const.h" diff --git a/Source/ee/Vif.cpp b/Source/ee/Vif.cpp index 793018d65..501040185 100644 --- a/Source/ee/Vif.cpp +++ b/Source/ee/Vif.cpp @@ -3,7 +3,7 @@ #include #include "static_loop.h" #include "string_format.h" -#include "../Log.h" +#include "Log.h" #include "../Ps2Const.h" #include "../states/RegisterStateFile.h" #include "../states/MemoryStateFile.h" diff --git a/Source/ee/Vpu.cpp b/Source/ee/Vpu.cpp index 262c679b5..e21dc8bd9 100644 --- a/Source/ee/Vpu.cpp +++ b/Source/ee/Vpu.cpp @@ -1,7 +1,7 @@ #include "Vpu.h" #include "make_unique.h" #include "string_format.h" -#include "../Log.h" +#include "Log.h" #include "../states/RegisterStateFile.h" #include "../Ps2Const.h" #include "../FrameDump.h" diff --git a/Source/gs/GSH_Direct3D9/GSH_Direct3D9.cpp b/Source/gs/GSH_Direct3D9/GSH_Direct3D9.cpp index ddfa0808c..e0951e460 100644 --- a/Source/gs/GSH_Direct3D9/GSH_Direct3D9.cpp +++ b/Source/gs/GSH_Direct3D9/GSH_Direct3D9.cpp @@ -1,5 +1,4 @@ #include "GSH_Direct3D9.h" -#include "../../Log.h" #include "../../gs/GsPixelFormats.h" #include "../../gs/GsTransferRange.h" #include "direct3d9/D3D9TextureUtils.h" diff --git a/Source/gs/GSH_OpenGL/CMakeLists.txt b/Source/gs/GSH_OpenGL/CMakeLists.txt index ab40170db..3f870fb10 100644 --- a/Source/gs/GSH_OpenGL/CMakeLists.txt +++ b/Source/gs/GSH_OpenGL/CMakeLists.txt @@ -17,6 +17,14 @@ if(NOT TARGET Framework_OpenGl) endif() list(APPEND GSH_OPENGL_PROJECT_LIBS Framework_OpenGl) +if(NOT TARGET app_shared) + add_subdirectory( + ${CMAKE_CURRENT_SOURCE_DIR}/../../app_shared + ${CMAKE_CURRENT_BINARY_DIR}/app_shared + ) +endif() +list(APPEND GSH_OPENGL_PROJECT_LIBS app_shared) + if(TARGET_PLATFORM_UNIX_ARM) list(APPEND GSH_OPENGL_COMPILE_OPTIONS "-mfpu=neon") endif() diff --git a/Source/gs/GSH_OpenGL/GSH_OpenGL.cpp b/Source/gs/GSH_OpenGL/GSH_OpenGL.cpp index b58eb7f70..39c3dd70c 100644 --- a/Source/gs/GSH_OpenGL/GSH_OpenGL.cpp +++ b/Source/gs/GSH_OpenGL/GSH_OpenGL.cpp @@ -3,8 +3,7 @@ #include #include -#include "../../Log.h" -#include "../../AppConfig.h" +#include "AppConfig.h" #include "../GsPixelFormats.h" #include "../GsTransferRange.h" #include "GSH_OpenGL.h" diff --git a/Source/gs/GSH_Vulkan/CMakeLists.txt b/Source/gs/GSH_Vulkan/CMakeLists.txt index c1a405e5c..aaba8dca3 100644 --- a/Source/gs/GSH_Vulkan/CMakeLists.txt +++ b/Source/gs/GSH_Vulkan/CMakeLists.txt @@ -25,6 +25,14 @@ if(NOT TARGET Nuanceur) endif() list(APPEND GSH_VULKAN_PROJECT_LIBS Nuanceur) +if(NOT TARGET app_shared) + add_subdirectory( + ${CMAKE_CURRENT_SOURCE_DIR}/../../app_shared + ${CMAKE_CURRENT_BINARY_DIR}/app_shared + ) +endif() +list(APPEND GSH_VULKAN_PROJECT_LIBS app_shared) + add_library(gsh_vulkan STATIC GSH_Vulkan.cpp GSH_Vulkan.h diff --git a/Source/gs/GSH_Vulkan/GSH_Vulkan.cpp b/Source/gs/GSH_Vulkan/GSH_Vulkan.cpp index d8feae136..322b4a077 100644 --- a/Source/gs/GSH_Vulkan/GSH_Vulkan.cpp +++ b/Source/gs/GSH_Vulkan/GSH_Vulkan.cpp @@ -3,8 +3,8 @@ #include "std_experimental_map.h" #include "../GsPixelFormats.h" #include "../GsTransferRange.h" -#include "../../Log.h" -#include "../../AppConfig.h" +#include "Log.h" +#include "AppConfig.h" #include "GSH_VulkanPlatformDefs.h" #include "GSH_VulkanDrawDesktop.h" #include "GSH_VulkanDrawMobile.h" diff --git a/Source/gs/GSH_Vulkan/GSH_VulkanDeviceInfo.cpp b/Source/gs/GSH_Vulkan/GSH_VulkanDeviceInfo.cpp index fb6aad670..68a0e87ea 100644 --- a/Source/gs/GSH_Vulkan/GSH_VulkanDeviceInfo.cpp +++ b/Source/gs/GSH_Vulkan/GSH_VulkanDeviceInfo.cpp @@ -1,5 +1,5 @@ #include -#include "../../AppConfig.h" +#include "AppConfig.h" #include "GSH_VulkanDeviceInfo.h" #include "GSH_VulkanPlatformDefs.h" #include "GSH_Vulkan.h" diff --git a/Source/gs/GSHandler.cpp b/Source/gs/GSHandler.cpp index bef9dbd07..04a6cee86 100644 --- a/Source/gs/GSHandler.cpp +++ b/Source/gs/GSHandler.cpp @@ -1,8 +1,8 @@ #include #include #include -#include "../AppConfig.h" -#include "../Log.h" +#include "AppConfig.h" +#include "Log.h" #include "../states/MemoryStateFile.h" #include "../states/RegisterStateFile.h" #include "../FrameDump.h" diff --git a/Source/iop/IopBios.cpp b/Source/iop/IopBios.cpp index 5c9aa0106..eb4d24514 100644 --- a/Source/iop/IopBios.cpp +++ b/Source/iop/IopBios.cpp @@ -11,7 +11,7 @@ #include "IopBios.h" #include "../COP_SCU.h" -#include "../Log.h" +#include "Log.h" #include "../ElfFile.h" #include "../Ps2Const.h" #include "../MipsExecutor.h" diff --git a/Source/iop/Iop_Cdvdfsv.cpp b/Source/iop/Iop_Cdvdfsv.cpp index 783aac264..3b4a2be97 100644 --- a/Source/iop/Iop_Cdvdfsv.cpp +++ b/Source/iop/Iop_Cdvdfsv.cpp @@ -1,5 +1,5 @@ #include -#include "../Log.h" +#include "Log.h" #include "../Ps2Const.h" #include "Iop_Cdvdfsv.h" #include "Iop_Cdvdman.h" diff --git a/Source/iop/Iop_Cdvdman.cpp b/Source/iop/Iop_Cdvdman.cpp index 89a9b27cb..a8b1e15b0 100644 --- a/Source/iop/Iop_Cdvdman.cpp +++ b/Source/iop/Iop_Cdvdman.cpp @@ -1,5 +1,5 @@ #include -#include "../Log.h" +#include "Log.h" #include "../states/RegisterStateFile.h" #include "../Ps2Const.h" #include "../TimeUtils.h" diff --git a/Source/iop/Iop_Dmac.cpp b/Source/iop/Iop_Dmac.cpp index 0c5eace5c..19245d708 100644 --- a/Source/iop/Iop_Dmac.cpp +++ b/Source/iop/Iop_Dmac.cpp @@ -3,7 +3,7 @@ #include "Iop_Dmac.h" #include "Iop_Intc.h" #include "../states/RegisterStateFile.h" -#include "../Log.h" +#include "Log.h" #define LOG_NAME ("iop_dmac") diff --git a/Source/iop/Iop_Dmacman.cpp b/Source/iop/Iop_Dmacman.cpp index bb6c8e986..8b312665b 100644 --- a/Source/iop/Iop_Dmacman.cpp +++ b/Source/iop/Iop_Dmacman.cpp @@ -1,7 +1,7 @@ #include "Iop_Dmacman.h" #include "Iop_Dmac.h" #include "Iop_DmacChannel.h" -#include "../Log.h" +#include "Log.h" #define LOGNAME "iop_dmacman" diff --git a/Source/iop/Iop_FileIoHandler1000.cpp b/Source/iop/Iop_FileIoHandler1000.cpp index 9e8093cd1..8db6825d8 100644 --- a/Source/iop/Iop_FileIoHandler1000.cpp +++ b/Source/iop/Iop_FileIoHandler1000.cpp @@ -3,7 +3,7 @@ #include "Iop_Ioman.h" #include "Iop_SifManPs2.h" #include "IopBios.h" -#include "../Log.h" +#include "Log.h" #define LOG_NAME ("iop_fileio") diff --git a/Source/iop/Iop_FileIoHandler2100.cpp b/Source/iop/Iop_FileIoHandler2100.cpp index 5194d9d0f..6bf2e529e 100644 --- a/Source/iop/Iop_FileIoHandler2100.cpp +++ b/Source/iop/Iop_FileIoHandler2100.cpp @@ -1,7 +1,7 @@ #include #include "Iop_FileIoHandler2100.h" #include "Iop_Ioman.h" -#include "../Log.h" +#include "Log.h" #define LOG_NAME ("iop_fileio") diff --git a/Source/iop/Iop_FileIoHandler2200.cpp b/Source/iop/Iop_FileIoHandler2200.cpp index 1bb5fc54f..4da4d3e14 100644 --- a/Source/iop/Iop_FileIoHandler2200.cpp +++ b/Source/iop/Iop_FileIoHandler2200.cpp @@ -5,7 +5,7 @@ #include "Iop_SifManPs2.h" #include "../states/RegisterStateFile.h" #include "../states/MemoryStateFile.h" -#include "../Log.h" +#include "Log.h" #include "../Ps2Const.h" #define LOG_NAME ("iop_fileio") diff --git a/Source/iop/Iop_Heaplib.cpp b/Source/iop/Iop_Heaplib.cpp index bd5e6511f..01b40127b 100644 --- a/Source/iop/Iop_Heaplib.cpp +++ b/Source/iop/Iop_Heaplib.cpp @@ -1,5 +1,5 @@ #include "Iop_Heaplib.h" -#include "../Log.h" +#include "Log.h" using namespace Iop; diff --git a/Source/iop/Iop_Intrman.cpp b/Source/iop/Iop_Intrman.cpp index eb5afc101..7f79ca3fe 100644 --- a/Source/iop/Iop_Intrman.cpp +++ b/Source/iop/Iop_Intrman.cpp @@ -1,5 +1,5 @@ #include "Iop_Intrman.h" -#include "../Log.h" +#include "Log.h" #include "../COP_SCU.h" #include "Iop_Intc.h" #include "IopBios.h" diff --git a/Source/iop/Iop_Ioman.cpp b/Source/iop/Iop_Ioman.cpp index ba9966f40..3750bce49 100644 --- a/Source/iop/Iop_Ioman.cpp +++ b/Source/iop/Iop_Ioman.cpp @@ -8,8 +8,8 @@ #include "Iop_Ioman.h" #include "IopBios.h" -#include "../AppConfig.h" -#include "../Log.h" +#include "AppConfig.h" +#include "Log.h" #include "../states/XmlStateFile.h" #include "ioman/PathDirectoryDevice.h" diff --git a/Source/iop/Iop_LibSd.cpp b/Source/iop/Iop_LibSd.cpp index 3e58d45ae..13e03afc3 100644 --- a/Source/iop/Iop_LibSd.cpp +++ b/Source/iop/Iop_LibSd.cpp @@ -1,5 +1,5 @@ #include "Iop_LibSd.h" -#include "../Log.h" +#include "Log.h" #include "string_format.h" //Not an actual implementation of the LIBSD module diff --git a/Source/iop/Iop_Loadcore.cpp b/Source/iop/Iop_Loadcore.cpp index 65e5c730c..04f814a2c 100644 --- a/Source/iop/Iop_Loadcore.cpp +++ b/Source/iop/Iop_Loadcore.cpp @@ -2,7 +2,7 @@ #include "Iop_Loadcore.h" #include "Iop_Dynamic.h" #include "IopBios.h" -#include "../Log.h" +#include "Log.h" #include "../states/RegisterStateFile.h" using namespace Iop; diff --git a/Source/iop/Iop_McServ.cpp b/Source/iop/Iop_McServ.cpp index 1a715c211..4ef785451 100644 --- a/Source/iop/Iop_McServ.cpp +++ b/Source/iop/Iop_McServ.cpp @@ -5,9 +5,9 @@ #include #include #include "string_format.h" -#include "../AppConfig.h" +#include "AppConfig.h" #include "../PS2VM_Preferences.h" -#include "../Log.h" +#include "Log.h" #include "Iop_McServ.h" #include "Iop_PathUtils.h" #include "Iop_Sysmem.h" diff --git a/Source/iop/Iop_Modload.cpp b/Source/iop/Iop_Modload.cpp index 25c3f43b3..0b77c0112 100644 --- a/Source/iop/Iop_Modload.cpp +++ b/Source/iop/Iop_Modload.cpp @@ -1,6 +1,6 @@ #include "Iop_Modload.h" #include "IopBios.h" -#include "../Log.h" +#include "Log.h" using namespace Iop; diff --git a/Source/iop/Iop_MtapMan.cpp b/Source/iop/Iop_MtapMan.cpp index 673769d58..a30810b92 100644 --- a/Source/iop/Iop_MtapMan.cpp +++ b/Source/iop/Iop_MtapMan.cpp @@ -1,6 +1,6 @@ #include #include "Iop_MtapMan.h" -#include "../Log.h" +#include "Log.h" using namespace Iop; diff --git a/Source/iop/Iop_Naplink.cpp b/Source/iop/Iop_Naplink.cpp index 5aa99a6bf..3c4941c77 100644 --- a/Source/iop/Iop_Naplink.cpp +++ b/Source/iop/Iop_Naplink.cpp @@ -1,6 +1,6 @@ #include "Iop_Naplink.h" #include "Iop_Ioman.h" -#include "../Log.h" +#include "Log.h" //Naplink is required by some demos that use nprintf //The demos won't make an explicit attempt at loading the module diff --git a/Source/iop/Iop_PadMan.cpp b/Source/iop/Iop_PadMan.cpp index 756fbca92..1431e9537 100644 --- a/Source/iop/Iop_PadMan.cpp +++ b/Source/iop/Iop_PadMan.cpp @@ -1,7 +1,7 @@ #include "Iop_PadMan.h" #include #include -#include "../Log.h" +#include "Log.h" #include "../states/RegisterStateFile.h" #include "placeholder_def.h" diff --git a/Source/iop/Iop_RootCounters.cpp b/Source/iop/Iop_RootCounters.cpp index fd9b2ef7d..0dd310c6b 100644 --- a/Source/iop/Iop_RootCounters.cpp +++ b/Source/iop/Iop_RootCounters.cpp @@ -4,7 +4,7 @@ #include "Iop_Intc.h" #include "Ps2Const.h" #include "string_format.h" -#include "../Log.h" +#include "Log.h" #include "../states/RegisterStateFile.h" #define LOG_NAME ("iop_counters") diff --git a/Source/iop/Iop_Secrman.cpp b/Source/iop/Iop_Secrman.cpp index 9691f39fe..fd891888c 100644 --- a/Source/iop/Iop_Secrman.cpp +++ b/Source/iop/Iop_Secrman.cpp @@ -1,5 +1,5 @@ #include "Iop_Secrman.h" -#include "../Log.h" +#include "Log.h" #define LOGNAME "iop_secrman" diff --git a/Source/iop/Iop_SifCmd.cpp b/Source/iop/Iop_SifCmd.cpp index 6e19a26e5..83c93938c 100644 --- a/Source/iop/Iop_SifCmd.cpp +++ b/Source/iop/Iop_SifCmd.cpp @@ -4,7 +4,7 @@ #include "../Ps2Const.h" #include "../COP_SCU.h" #include "../ee/SIF.h" -#include "../Log.h" +#include "Log.h" #include "../states/RegisterStateCollectionFile.h" using namespace Iop; diff --git a/Source/iop/Iop_SifMan.cpp b/Source/iop/Iop_SifMan.cpp index df63a29fa..26d49c536 100644 --- a/Source/iop/Iop_SifMan.cpp +++ b/Source/iop/Iop_SifMan.cpp @@ -2,7 +2,7 @@ #include #include "Iop_Sysmem.h" #include "../MIPSAssembler.h" -#include "../Log.h" +#include "Log.h" #define LOG_NAME ("iop_sifman") diff --git a/Source/iop/Iop_Sio2.cpp b/Source/iop/Iop_Sio2.cpp index aefcee562..2d0d89160 100644 --- a/Source/iop/Iop_Sio2.cpp +++ b/Source/iop/Iop_Sio2.cpp @@ -2,7 +2,7 @@ #include #include #include "Iop_Sio2.h" -#include "../Log.h" +#include "Log.h" #include "../states/RegisterStateFile.h" #include "../states/MemoryStateFile.h" diff --git a/Source/iop/Iop_Spu.cpp b/Source/iop/Iop_Spu.cpp index 3c5728e72..a22467cd7 100644 --- a/Source/iop/Iop_Spu.cpp +++ b/Source/iop/Iop_Spu.cpp @@ -1,7 +1,7 @@ #include #include #include "Iop_Spu.h" -#include "../Log.h" +#include "Log.h" using namespace Iop; diff --git a/Source/iop/Iop_Spu2.cpp b/Source/iop/Iop_Spu2.cpp index 2e3d61fa8..76d07f01c 100644 --- a/Source/iop/Iop_Spu2.cpp +++ b/Source/iop/Iop_Spu2.cpp @@ -1,7 +1,7 @@ #include #include "make_unique.h" #include "Iop_Spu2.h" -#include "../Log.h" +#include "Log.h" #include "placeholder_def.h" #define LOG_NAME ("iop_spu2") diff --git a/Source/iop/Iop_Spu2_Core.cpp b/Source/iop/Iop_Spu2_Core.cpp index 240e4b6ff..0798c4ac1 100644 --- a/Source/iop/Iop_Spu2_Core.cpp +++ b/Source/iop/Iop_Spu2_Core.cpp @@ -1,6 +1,6 @@ #include #include "Iop_Spu2_Core.h" -#include "../Log.h" +#include "Log.h" #include "string_format.h" #define LOG_NAME_FORMAT ("iop_spu2_core_%d") diff --git a/Source/iop/Iop_SpuBase.cpp b/Source/iop/Iop_SpuBase.cpp index f3e93466b..315406f3c 100644 --- a/Source/iop/Iop_SpuBase.cpp +++ b/Source/iop/Iop_SpuBase.cpp @@ -4,7 +4,7 @@ #include #include #include "string_format.h" -#include "../Log.h" +#include "Log.h" #include "../states/RegisterStateCollectionFile.h" #include "../states/RegisterStateUtils.h" #include "../states/RegisterStateFile.h" diff --git a/Source/iop/Iop_Stdio.cpp b/Source/iop/Iop_Stdio.cpp index e3bd6bb01..519553575 100644 --- a/Source/iop/Iop_Stdio.cpp +++ b/Source/iop/Iop_Stdio.cpp @@ -3,7 +3,7 @@ #include "Iop_Ioman.h" #include "lexical_cast_ex.h" #include "string_format.h" -#include "../Log.h" +#include "Log.h" #define LOG_NAME "iop_stdio" diff --git a/Source/iop/Iop_SubSystem.cpp b/Source/iop/Iop_SubSystem.cpp index 7fdbd59eb..dd584b334 100644 --- a/Source/iop/Iop_SubSystem.cpp +++ b/Source/iop/Iop_SubSystem.cpp @@ -5,7 +5,7 @@ #include "../states/MemoryStateFile.h" #include "../states/RegisterStateFile.h" #include "../Ps2Const.h" -#include "../Log.h" +#include "Log.h" #include "placeholder_def.h" using namespace Iop; diff --git a/Source/iop/Iop_Sysclib.cpp b/Source/iop/Iop_Sysclib.cpp index 7f1dfbe16..35bffb278 100644 --- a/Source/iop/Iop_Sysclib.cpp +++ b/Source/iop/Iop_Sysclib.cpp @@ -1,7 +1,7 @@ #include #include "Iop_Sysclib.h" #include "../Ps2Const.h" -#include "../Log.h" +#include "Log.h" #define LOG_NAME "iop_sysclib" diff --git a/Source/iop/Iop_Sysmem.cpp b/Source/iop/Iop_Sysmem.cpp index 5dd73f4a4..0f3706871 100644 --- a/Source/iop/Iop_Sysmem.cpp +++ b/Source/iop/Iop_Sysmem.cpp @@ -1,5 +1,5 @@ #include "Iop_Sysmem.h" -#include "../Log.h" +#include "Log.h" #include "Iop_SifMan.h" using namespace Iop; diff --git a/Source/iop/Iop_Thbase.cpp b/Source/iop/Iop_Thbase.cpp index bfabed492..f4625447a 100644 --- a/Source/iop/Iop_Thbase.cpp +++ b/Source/iop/Iop_Thbase.cpp @@ -1,6 +1,6 @@ #include "Iop_Thbase.h" #include "IopBios.h" -#include "../Log.h" +#include "Log.h" using namespace Iop; diff --git a/Source/iop/Iop_Thevent.cpp b/Source/iop/Iop_Thevent.cpp index 6a48e8a26..c1ecbd98f 100644 --- a/Source/iop/Iop_Thevent.cpp +++ b/Source/iop/Iop_Thevent.cpp @@ -1,6 +1,6 @@ #include "Iop_Thevent.h" #include "IopBios.h" -#include "../Log.h" +#include "Log.h" using namespace Iop; diff --git a/Source/iop/Iop_Thfpool.cpp b/Source/iop/Iop_Thfpool.cpp index cf820f2d5..e74e13ec4 100644 --- a/Source/iop/Iop_Thfpool.cpp +++ b/Source/iop/Iop_Thfpool.cpp @@ -1,5 +1,5 @@ #include "Iop_Thfpool.h" -#include "../Log.h" +#include "Log.h" #define LOG_NAME ("iop_thfpool") diff --git a/Source/iop/Iop_Thmsgbx.cpp b/Source/iop/Iop_Thmsgbx.cpp index c58b6de3c..53fff95a2 100644 --- a/Source/iop/Iop_Thmsgbx.cpp +++ b/Source/iop/Iop_Thmsgbx.cpp @@ -1,6 +1,6 @@ #include "Iop_Thmsgbx.h" #include "IopBios.h" -#include "../Log.h" +#include "Log.h" #define LOG_NAME ("iop_thmsgbx") diff --git a/Source/iop/Iop_Thsema.cpp b/Source/iop/Iop_Thsema.cpp index 1570effad..b0d7e4a55 100644 --- a/Source/iop/Iop_Thsema.cpp +++ b/Source/iop/Iop_Thsema.cpp @@ -1,6 +1,6 @@ #include "Iop_Thsema.h" #include "IopBios.h" -#include "../Log.h" +#include "Log.h" #define LOG_NAME ("iop_thsema") diff --git a/Source/iop/Iop_Thvpool.cpp b/Source/iop/Iop_Thvpool.cpp index f45e60b17..9a227d379 100644 --- a/Source/iop/Iop_Thvpool.cpp +++ b/Source/iop/Iop_Thvpool.cpp @@ -1,5 +1,5 @@ #include "Iop_Thvpool.h" -#include "../Log.h" +#include "Log.h" #define LOG_NAME ("iop_thvpool") diff --git a/Source/iop/Iop_Timrman.cpp b/Source/iop/Iop_Timrman.cpp index 16ed7b568..a4819e269 100644 --- a/Source/iop/Iop_Timrman.cpp +++ b/Source/iop/Iop_Timrman.cpp @@ -1,7 +1,7 @@ #include #include "Iop_Timrman.h" #include "Iop_Intc.h" -#include "../Log.h" +#include "Log.h" #include "IopBios.h" #include "Iop_RootCounters.h" diff --git a/Source/iop/Iop_Usbd.cpp b/Source/iop/Iop_Usbd.cpp index 78274750b..cd14a15b5 100644 --- a/Source/iop/Iop_Usbd.cpp +++ b/Source/iop/Iop_Usbd.cpp @@ -1,7 +1,7 @@ #include "Iop_Usbd.h" #include #include "IopBios.h" -#include "../Log.h" +#include "Log.h" #include "string_format.h" #include "lexical_cast_ex.h" #include "UsbBuzzerDevice.h" diff --git a/Source/iop/Iop_Vblank.cpp b/Source/iop/Iop_Vblank.cpp index a3829fcc5..f4f3945d3 100644 --- a/Source/iop/Iop_Vblank.cpp +++ b/Source/iop/Iop_Vblank.cpp @@ -1,6 +1,6 @@ #include "Iop_Vblank.h" #include "IopBios.h" -#include "../Log.h" +#include "Log.h" using namespace Iop; diff --git a/Source/iop/ioman/PreferenceDirectoryDevice.h b/Source/iop/ioman/PreferenceDirectoryDevice.h index ca2130892..ada7e8e27 100644 --- a/Source/iop/ioman/PreferenceDirectoryDevice.h +++ b/Source/iop/ioman/PreferenceDirectoryDevice.h @@ -1,7 +1,7 @@ #pragma once #include "DirectoryDevice.h" -#include "../../AppConfig.h" +#include "AppConfig.h" namespace Iop { diff --git a/Source/iop/namco_sys147/Iop_NamcoSys147.cpp b/Source/iop/namco_sys147/Iop_NamcoSys147.cpp index 5e69ab36b..49aa32650 100644 --- a/Source/iop/namco_sys147/Iop_NamcoSys147.cpp +++ b/Source/iop/namco_sys147/Iop_NamcoSys147.cpp @@ -1,6 +1,6 @@ #include #include "Iop_NamcoSys147.h" -#include "../../Log.h" +#include "Log.h" #include "StdStreamUtils.h" #include "PathUtils.h" #include "AppConfig.h" diff --git a/Source/iop/namco_sys246/Iop_NamcoAcCdvd.cpp b/Source/iop/namco_sys246/Iop_NamcoAcCdvd.cpp index 4f6c9e76f..aefa7625f 100644 --- a/Source/iop/namco_sys246/Iop_NamcoAcCdvd.cpp +++ b/Source/iop/namco_sys246/Iop_NamcoAcCdvd.cpp @@ -1,7 +1,7 @@ #include "Iop_NamcoAcCdvd.h" #include "../Iop_Cdvdman.h" #include "../../Ps2Const.h" -#include "../../Log.h" +#include "Log.h" using namespace Iop; using namespace Iop::Namco; diff --git a/Source/iop/namco_sys246/Iop_NamcoAcRam.cpp b/Source/iop/namco_sys246/Iop_NamcoAcRam.cpp index 4a0910798..0b230789d 100644 --- a/Source/iop/namco_sys246/Iop_NamcoAcRam.cpp +++ b/Source/iop/namco_sys246/Iop_NamcoAcRam.cpp @@ -3,7 +3,7 @@ #include "zip/ZipArchiveReader.h" #include "zip/ZipArchiveWriter.h" #include "../../states/MemoryStateFile.h" -#include "../../Log.h" +#include "Log.h" using namespace Iop; using namespace Iop::Namco; diff --git a/Source/ui_android/GSH_OpenGLAndroid.cpp b/Source/ui_android/GSH_OpenGLAndroid.cpp index 2fe3b023c..4ef7852ce 100644 --- a/Source/ui_android/GSH_OpenGLAndroid.cpp +++ b/Source/ui_android/GSH_OpenGLAndroid.cpp @@ -1,7 +1,6 @@ #include #include "opengl/OpenGlDef.h" #include "GSH_OpenGLAndroid.h" -#include "../Log.h" #include "AppConfig.h" CGSH_OpenGLAndroid::CGSH_OpenGLAndroid(NativeWindowType window) diff --git a/Source/ui_android/NativeInterop.cpp b/Source/ui_android/NativeInterop.cpp index 27886798a..6535cfc5d 100644 --- a/Source/ui_android/NativeInterop.cpp +++ b/Source/ui_android/NativeInterop.cpp @@ -12,7 +12,8 @@ #include "android/javax_crypto_Mac.h" #include "android/javax_crypto_spec_SecretKeySpec.h" #include "PathUtils.h" -#include "../AppConfig.h" +#include "AppConfig.h" +#include "DefaultAppConfig.h" #include "../DiskUtils.h" #include "../PH_Generic.h" #include "../PS2VM.h" diff --git a/Source/ui_android/SettingsManager.cpp b/Source/ui_android/SettingsManager.cpp index 7cc3b4300..c69e386dd 100644 --- a/Source/ui_android/SettingsManager.cpp +++ b/Source/ui_android/SettingsManager.cpp @@ -1,7 +1,7 @@ #include #include "SettingsManager.h" #include "NativeShared.h" -#include "../AppConfig.h" +#include "AppConfig.h" void CSettingsManager::Save() { diff --git a/Source/ui_ios/AltServerJitService.mm b/Source/ui_ios/AltServerJitService.mm index f5dae2a5b..685fef3d0 100644 --- a/Source/ui_ios/AltServerJitService.mm +++ b/Source/ui_ios/AltServerJitService.mm @@ -1,6 +1,6 @@ #import "AltServerJitService.h" #import "AltKit-Swift.h" -#include "../AppConfig.h" +#include "AppConfig.h" #import "PreferenceDefs.h" @implementation AltServerJitService diff --git a/Source/ui_ios/EmulatorViewController.mm b/Source/ui_ios/EmulatorViewController.mm index 5cd1498d4..90e622bf9 100644 --- a/Source/ui_ios/EmulatorViewController.mm +++ b/Source/ui_ios/EmulatorViewController.mm @@ -5,7 +5,7 @@ #import "RenderView.h" #include "../PS2VM.h" #include "../PS2VM_Preferences.h" -#include "../AppConfig.h" +#include "AppConfig.h" #include "PreferenceDefs.h" #include "GSH_OpenGLiOS.h" #ifdef HAS_GSH_VULKAN diff --git a/Source/ui_ios/GSH_OpenGLiOS.cpp b/Source/ui_ios/GSH_OpenGLiOS.cpp index 6a474d495..73a718579 100644 --- a/Source/ui_ios/GSH_OpenGLiOS.cpp +++ b/Source/ui_ios/GSH_OpenGLiOS.cpp @@ -1,7 +1,6 @@ #include #include "opengl/OpenGlDef.h" #include "GSH_OpenGLiOS.h" -#include "../Log.h" CGSH_OpenGLiOS::CGSH_OpenGLiOS(CAEAGLLayer* layer) : m_layer(layer) diff --git a/Source/ui_ios/RenderView.mm b/Source/ui_ios/RenderView.mm index 9841a8d3b..921cd0dbb 100644 --- a/Source/ui_ios/RenderView.mm +++ b/Source/ui_ios/RenderView.mm @@ -1,6 +1,6 @@ #import "RenderView.h" #import -#include "../AppConfig.h" +#include "AppConfig.h" #include "PreferenceDefs.h" @implementation RenderView diff --git a/Source/ui_ios/SettingsViewController.mm b/Source/ui_ios/SettingsViewController.mm index 0e8a3e902..f7809a0b9 100644 --- a/Source/ui_ios/SettingsViewController.mm +++ b/Source/ui_ios/SettingsViewController.mm @@ -1,6 +1,6 @@ #import "SettingsViewController.h" #import "SettingsListSelectorViewController.h" -#include "../AppConfig.h" +#include "AppConfig.h" #include "PreferenceDefs.h" #include "../gs/GSH_OpenGL/GSH_OpenGL.h" diff --git a/Source/ui_ios/VirtualPadButton.mm b/Source/ui_ios/VirtualPadButton.mm index f2e93104c..030b0696d 100644 --- a/Source/ui_ios/VirtualPadButton.mm +++ b/Source/ui_ios/VirtualPadButton.mm @@ -1,4 +1,4 @@ -#import "../AppConfig.h" +#import "AppConfig.h" #import "PreferenceDefs.h" #import "VirtualPadButton.h" diff --git a/Source/ui_ios/VirtualPadView.mm b/Source/ui_ios/VirtualPadView.mm index 2963d804d..845977234 100644 --- a/Source/ui_ios/VirtualPadView.mm +++ b/Source/ui_ios/VirtualPadView.mm @@ -1,4 +1,4 @@ -#import "../AppConfig.h" +#import "AppConfig.h" #import "PreferenceDefs.h" #import "VirtualPadView.h" #import "VirtualPadButton.h" diff --git a/Source/ui_ios/main.mm b/Source/ui_ios/main.mm index 59247029a..101a28142 100644 --- a/Source/ui_ios/main.mm +++ b/Source/ui_ios/main.mm @@ -1,6 +1,7 @@ #import #import "AppDelegate.h" #include "DebuggerSimulator.h" +#include "DefaultAppConfig.h" int main(int argc, char* argv[]) { diff --git a/Source/ui_js/Main.cpp b/Source/ui_js/Main.cpp index fd1bc43ce..95f05963a 100644 --- a/Source/ui_js/Main.cpp +++ b/Source/ui_js/Main.cpp @@ -7,6 +7,7 @@ #include "input/PH_GenericInput.h" #include "InputProviderEmscripten.h" #include "ui_shared/StatsManager.h" +#include "DefaultAppConfig.h" CPs2VmJs* g_virtualMachine = nullptr; CGSHandler::NewFrameEvent::Connection g_gsNewFrameConnection; diff --git a/Source/ui_libretro/main_libretro.cpp b/Source/ui_libretro/main_libretro.cpp index fc01f3799..8a07c26f2 100644 --- a/Source/ui_libretro/main_libretro.cpp +++ b/Source/ui_libretro/main_libretro.cpp @@ -15,6 +15,8 @@ #include "MemStream.h" #include "filesystem_def.h" +#include "DefaultAppConfig.h" + #include #include diff --git a/Source/ui_qt/DebugSupport/FrameDebugger/GsContextView.cpp b/Source/ui_qt/DebugSupport/FrameDebugger/GsContextView.cpp index 391de5c8f..57dd42138 100644 --- a/Source/ui_qt/DebugSupport/FrameDebugger/GsContextView.cpp +++ b/Source/ui_qt/DebugSupport/FrameDebugger/GsContextView.cpp @@ -2,7 +2,6 @@ #include "GsStateUtils.h" #include "gs/GsDebuggerInterface.h" #include "gs/GsPixelFormats.h" -#include "../../../AppConfig.h" #include diff --git a/Source/ui_qt/main.cpp b/Source/ui_qt/main.cpp index 2d76796fc..eb6638159 100644 --- a/Source/ui_qt/main.cpp +++ b/Source/ui_qt/main.cpp @@ -1,8 +1,9 @@ #include #include -#include "mainwindow.h" -#include "QStringUtils.h" #include +#include "mainwindow.h" +#include "PathUtils.h" +#include "QStringUtils.h" Q_DECLARE_METATYPE(std::string) @@ -104,3 +105,23 @@ int main(int argc, char* argv[]) #endif return a.exec(); } + +fs::path CAppConfig::GetBasePath() const +{ + static const char* BASE_DATA_PATH = "Play Data Files"; + static const auto basePath = + []() { + fs::path result; + if(fs::exists("portable.txt")) + { + result = BASE_DATA_PATH; + } + else + { + result = Framework::PathUtils::GetPersonalDataPath() / BASE_DATA_PATH; + } + Framework::PathUtils::EnsurePathExists(result); + return result; + }(); + return basePath; +} diff --git a/Source/ui_shared/BootablesDbClient.cpp b/Source/ui_shared/BootablesDbClient.cpp index bc2dd8c12..79b24bfab 100644 --- a/Source/ui_shared/BootablesDbClient.cpp +++ b/Source/ui_shared/BootablesDbClient.cpp @@ -1,5 +1,5 @@ #include -#include "../AppConfig.h" +#include "AppConfig.h" #include "string_format.h" #include "PathUtils.h" #include "BootablesDbClient.h" diff --git a/tools/AutoTest/Main.cpp b/tools/AutoTest/Main.cpp index 2f59cb55c..a65d62007 100644 --- a/tools/AutoTest/Main.cpp +++ b/tools/AutoTest/Main.cpp @@ -1,4 +1,5 @@ #include "PS2VM.h" +#include "DefaultAppConfig.h" #include "filesystem_def.h" #include "StdStream.h" #include "StdStreamUtils.h" diff --git a/tools/ElfView/main.cpp b/tools/ElfView/main.cpp index a2d299464..a101baa79 100644 --- a/tools/ElfView/main.cpp +++ b/tools/ElfView/main.cpp @@ -1,4 +1,6 @@ #include +#include "AppConfig.h" +#include "PathUtils.h" #include "mainwindow.h" int main(int argc, char* argv[]) @@ -13,3 +15,15 @@ int main(int argc, char* argv[]) return a.exec(); } + +fs::path CAppConfig::GetBasePath() const +{ + static const char* BASE_DATA_PATH = "ElfView Data Files"; + static const auto basePath = + []() { + auto result = Framework::PathUtils::GetPersonalDataPath() / BASE_DATA_PATH; + Framework::PathUtils::EnsurePathExists(result); + return result; + }(); + return basePath; +} diff --git a/tools/McServTest/AppConfig.cpp b/tools/McServTest/AppConfig.cpp deleted file mode 100644 index f3941144e..000000000 --- a/tools/McServTest/AppConfig.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "AppConfig.h" -#include "PathUtils.h" - -#define BASE_DATA_PATH ("McServTest Data Files") -#define CONFIG_FILENAME ("config.xml") - -CAppConfig::CAppConfig() - : CConfig(BuildConfigPath()) -{ -} - -Framework::CConfig::PathType CAppConfig::BuildConfigPath() -{ - return GetBasePath() / CONFIG_FILENAME; -} - -CAppConfigBasePath::CAppConfigBasePath() -{ - m_basePath = Framework::PathUtils::GetPersonalDataPath() / BASE_DATA_PATH; - Framework::PathUtils::EnsurePathExists(m_basePath); -} - -fs::path CAppConfigBasePath::GetBasePath() const -{ - return m_basePath; -} diff --git a/tools/McServTest/AppConfig.h b/tools/McServTest/AppConfig.h deleted file mode 100644 index 7ab0bb60d..000000000 --- a/tools/McServTest/AppConfig.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "Config.h" -#include "Singleton.h" - -class CAppConfigBasePath -{ -public: - CAppConfigBasePath(); - fs::path GetBasePath() const; - -private: - fs::path m_basePath; -}; - -class CAppConfig : public CAppConfigBasePath, public Framework::CConfig, public CSingleton -{ -public: - CAppConfig(); - virtual ~CAppConfig() = default; - -private: - CConfig::PathType BuildConfigPath(); -}; diff --git a/tools/McServTest/CMakeLists.txt b/tools/McServTest/CMakeLists.txt index b3f5d106a..82d61c78d 100644 --- a/tools/McServTest/CMakeLists.txt +++ b/tools/McServTest/CMakeLists.txt @@ -16,8 +16,6 @@ if (NOT TARGET PlayCore) endif() add_executable(McServTest - AppConfig.cpp - AppConfig.h GameTestSheet.cpp GameTestSheet.h Main.cpp diff --git a/tools/McServTest/Main.cpp b/tools/McServTest/Main.cpp index 9bdbbd11e..97afe6809 100644 --- a/tools/McServTest/Main.cpp +++ b/tools/McServTest/Main.cpp @@ -122,3 +122,15 @@ int main(int argc, const char** argv) return 0; } + +fs::path CAppConfig::GetBasePath() const +{ + static const char* BASE_DATA_PATH = "McServTest Data Files"; + static const auto basePath = + []() { + auto result = Framework::PathUtils::GetPersonalDataPath() / BASE_DATA_PATH; + Framework::PathUtils::EnsurePathExists(result); + return result; + }(); + return basePath; +} diff --git a/tools/PsfPlayer/Source/AppConfig.cpp b/tools/PsfPlayer/Source/AppConfig.cpp deleted file mode 100644 index df4189dd4..000000000 --- a/tools/PsfPlayer/Source/AppConfig.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "AppConfig.h" -#include "PathUtils.h" - -#define BASE_DATA_PATH ("PsfPlayer Data Files") -#define CONFIG_FILENAME ("config.xml") - -CAppConfig::CAppConfig() - : CConfig(BuildConfigPath()) -{ -} - -Framework::CConfig::PathType CAppConfig::BuildConfigPath() -{ - return GetBasePath() / CONFIG_FILENAME; -} - -CAppConfigBasePath::CAppConfigBasePath() -{ - m_basePath = Framework::PathUtils::GetPersonalDataPath() / BASE_DATA_PATH; - Framework::PathUtils::EnsurePathExists(m_basePath); -} - -fs::path CAppConfigBasePath::GetBasePath() const -{ - return m_basePath; -} diff --git a/tools/PsfPlayer/Source/AppConfig.h b/tools/PsfPlayer/Source/AppConfig.h deleted file mode 100644 index 7ab0bb60d..000000000 --- a/tools/PsfPlayer/Source/AppConfig.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "Config.h" -#include "Singleton.h" - -class CAppConfigBasePath -{ -public: - CAppConfigBasePath(); - fs::path GetBasePath() const; - -private: - fs::path m_basePath; -}; - -class CAppConfig : public CAppConfigBasePath, public Framework::CConfig, public CSingleton -{ -public: - CAppConfig(); - virtual ~CAppConfig() = default; - -private: - CConfig::PathType BuildConfigPath(); -}; diff --git a/tools/PsfPlayer/Source/AppDef.cpp b/tools/PsfPlayer/Source/AppDef.cpp new file mode 100644 index 000000000..b7d6df66f --- /dev/null +++ b/tools/PsfPlayer/Source/AppDef.cpp @@ -0,0 +1,14 @@ +#include "AppConfig.h" +#include "PathUtils.h" + +fs::path CAppConfig::GetBasePath() const +{ + static const char* BASE_DATA_PATH = "PsfPlayer Data Files"; + static const auto basePath = + []() { + auto result = Framework::PathUtils::GetPersonalDataPath() / BASE_DATA_PATH; + Framework::PathUtils::EnsurePathExists(result); + return result; + }(); + return basePath; +} diff --git a/tools/PsfPlayer/Source/CMakeLists.txt b/tools/PsfPlayer/Source/CMakeLists.txt index 7144c1a31..fef322bcb 100644 --- a/tools/PsfPlayer/Source/CMakeLists.txt +++ b/tools/PsfPlayer/Source/CMakeLists.txt @@ -32,8 +32,8 @@ endif() ##PsfPlayerCore set(PSFCORE_SRC_FILES - AppConfig.cpp - AppConfig.h + AppDef.cpp + AppDef.h Iop_PsfSubSystem.cpp Iop_PsfSubSystem.h PlaybackController.cpp diff --git a/tools/SpuTest/Main.cpp b/tools/SpuTest/Main.cpp index 9dfa4b5bb..fb79542f3 100644 --- a/tools/SpuTest/Main.cpp +++ b/tools/SpuTest/Main.cpp @@ -1,4 +1,5 @@ #include +#include "DefaultAppConfig.h" #include "KeyOnOffTest.h" #include "MultiCoreIrqTest.h" #include "SetRepeatTest.h" diff --git a/tools/VuTest/Main.cpp b/tools/VuTest/Main.cpp index ea573932f..ad8082f25 100644 --- a/tools/VuTest/Main.cpp +++ b/tools/VuTest/Main.cpp @@ -1,6 +1,7 @@ #include #include #include +#include "DefaultAppConfig.h" #include "FpUtils.h" #include "AddTest.h" #include "BranchTest.h"