Use app_config module.

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

Source/app_shared/CMakeLists.txt

@@ -22,6 +22,7 @@ endif()
 set(COMMON_SRC_FILES
 	AppConfig.cpp
 	AppConfig.h
+	DefaultAppConfig.h
 	Log.cpp
 	Log.h
 )

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;
+}

Source/ee/COP_VU.cpp

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include "COP_VU.h"
 #include "VUShared.h"
-#include "../Log.h"
+#include "Log.h"
 #include "../MIPS.h"
 #include "../MemoryUtils.h"
 #include "offsetof_def.h"

Source/ee/DMAC.cpp

@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include "DMAC.h"
 #include "../Ps2Const.h"
-#include "../Log.h"
+#include "Log.h"
 #include "../states/RegisterStateFile.h"
 #include "../MIPS.h"
 #include "../COP_SCU.h"

Source/ee/Dmac_Channel.cpp

@@ -2,7 +2,7 @@
 #include <assert.h>
 #include "string_format.h"
 #include "../states/RegisterStateFile.h"
-#include "../Log.h"
+#include "Log.h"
 #include "Dmac_Channel.h"
 #include "DMAC.h"
 

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"

Source/ee/GIF.cpp

@@ -3,7 +3,7 @@
 #include <cstring>
 #include "../uint128.h"
 #include "../Ps2Const.h"
-#include "../Log.h"
+#include "Log.h"
 #include "../FrameDump.h"
 #include "../states/RegisterStateFile.h"
 #include "../states/MemoryStateFile.h"

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")

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"

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"

Source/ee/SIF.cpp

@@ -1,6 +1,6 @@
 #include <cstring>
 #include <stdio.h>
-#include "../Log.h"
+#include "Log.h"
 #include "../Ps2Const.h"
 #include "../states/RegisterStateCollectionFile.h"
 #include "../states/MemoryStateFile.h"

Source/ee/Timer.cpp

@@ -1,6 +1,6 @@
 #include <cstring>
 #include <stdio.h>
-#include "../Log.h"
+#include "Log.h"
 #include "../states/RegisterStateFile.h"
 #include "Timer.h"
 #include "Ps2Const.h"

Source/ee/Vif.cpp

@@ -3,7 +3,7 @@
 #include <stdexcept>
 #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"

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"

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"

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()

Source/gs/GSH_OpenGL/GSH_OpenGL.cpp

@@ -3,8 +3,7 @@
 #include <cstring>
 #include <math.h>
 
-#include "../../Log.h"
+#include "AppConfig.h"
-#include "../../AppConfig.h"
 #include "../GsPixelFormats.h"
 #include "../GsTransferRange.h"
 #include "GSH_OpenGL.h"

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

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 "Log.h"
-#include "../../AppConfig.h"
+#include "AppConfig.h"
 #include "GSH_VulkanPlatformDefs.h"
 #include "GSH_VulkanDrawDesktop.h"
 #include "GSH_VulkanDrawMobile.h"

Source/gs/GSH_Vulkan/GSH_VulkanDeviceInfo.cpp

@@ -1,5 +1,5 @@
 #include <cstring>
-#include "../../AppConfig.h"
+#include "AppConfig.h"
 #include "GSH_VulkanDeviceInfo.h"
 #include "GSH_VulkanPlatformDefs.h"
 #include "GSH_Vulkan.h"

Source/gs/GSHandler.cpp

@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <functional>
-#include "../AppConfig.h"
+#include "AppConfig.h"
-#include "../Log.h"
+#include "Log.h"
 #include "../states/MemoryStateFile.h"
 #include "../states/RegisterStateFile.h"
 #include "../FrameDump.h"

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"

Source/iop/Iop_Cdvdfsv.cpp

@@ -1,5 +1,5 @@
 #include <assert.h>
-#include "../Log.h"
+#include "Log.h"
 #include "../Ps2Const.h"
 #include "Iop_Cdvdfsv.h"
 #include "Iop_Cdvdman.h"

Source/iop/Iop_Cdvdman.cpp

@@ -1,5 +1,5 @@
 #include <cstring>
-#include "../Log.h"
+#include "Log.h"
 #include "../states/RegisterStateFile.h"
 #include "../Ps2Const.h"
 #include "../TimeUtils.h"

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")
 

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"
 

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")
 

Source/iop/Iop_FileIoHandler2100.cpp

@@ -1,7 +1,7 @@
 #include <cstring>
 #include "Iop_FileIoHandler2100.h"
 #include "Iop_Ioman.h"
-#include "../Log.h"
+#include "Log.h"
 
 #define LOG_NAME ("iop_fileio")
 

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")

Source/iop/Iop_Heaplib.cpp

@@ -1,5 +1,5 @@
 #include "Iop_Heaplib.h"
-#include "../Log.h"
+#include "Log.h"
 
 using namespace Iop;
 

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"

Source/iop/Iop_Ioman.cpp

@@ -8,8 +8,8 @@
 
 #include "Iop_Ioman.h"
 #include "IopBios.h"
-#include "../AppConfig.h"
+#include "AppConfig.h"
-#include "../Log.h"
+#include "Log.h"
 #include "../states/XmlStateFile.h"
 #include "ioman/PathDirectoryDevice.h"
 

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

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;

Source/iop/Iop_McServ.cpp

@@ -5,9 +5,9 @@
 #include <states/XmlStateFile.h>
 #include <xml/Utils.h>
 #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"

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;
 

Source/iop/Iop_MtapMan.cpp

@@ -1,6 +1,6 @@
 #include <assert.h>
 #include "Iop_MtapMan.h"
-#include "../Log.h"
+#include "Log.h"
 
 using namespace Iop;
 

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

Source/iop/Iop_PadMan.cpp

@@ -1,7 +1,7 @@
 #include "Iop_PadMan.h"
 #include <cstdio>
 #include <cassert>
-#include "../Log.h"
+#include "Log.h"
 #include "../states/RegisterStateFile.h"
 #include "placeholder_def.h"
 

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")

Source/iop/Iop_Secrman.cpp

@@ -1,5 +1,5 @@
 #include "Iop_Secrman.h"
-#include "../Log.h"
+#include "Log.h"
 
 #define LOGNAME "iop_secrman"
 

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;

Source/iop/Iop_SifMan.cpp

@@ -2,7 +2,7 @@
 #include <cstring>
 #include "Iop_Sysmem.h"
 #include "../MIPSAssembler.h"
-#include "../Log.h"
+#include "Log.h"
 
 #define LOG_NAME ("iop_sifman")
 

Source/iop/Iop_Sio2.cpp

@@ -2,7 +2,7 @@
 #include <cstring>
 #include <vector>
 #include "Iop_Sio2.h"
-#include "../Log.h"
+#include "Log.h"
 #include "../states/RegisterStateFile.h"
 #include "../states/MemoryStateFile.h"
 

Source/iop/Iop_Spu.cpp

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <math.h>
 #include "Iop_Spu.h"
-#include "../Log.h"
+#include "Log.h"
 
 using namespace Iop;
 

Source/iop/Iop_Spu2.cpp

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include "make_unique.h"
 #include "Iop_Spu2.h"
-#include "../Log.h"
+#include "Log.h"
 #include "placeholder_def.h"
 
 #define LOG_NAME ("iop_spu2")

Source/iop/Iop_Spu2_Core.cpp

@@ -1,6 +1,6 @@
 #include <assert.h>
 #include "Iop_Spu2_Core.h"
-#include "../Log.h"
+#include "Log.h"
 #include "string_format.h"
 
 #define LOG_NAME_FORMAT ("iop_spu2_core_%d")

Source/iop/Iop_SpuBase.cpp

@@ -4,7 +4,7 @@
 #include <climits>
 #include <algorithm>
 #include "string_format.h"
-#include "../Log.h"
+#include "Log.h"
 #include "../states/RegisterStateCollectionFile.h"
 #include "../states/RegisterStateUtils.h"
 #include "../states/RegisterStateFile.h"

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"
 

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;

Source/iop/Iop_Sysclib.cpp

@@ -1,7 +1,7 @@
 #include <cstring>
 #include "Iop_Sysclib.h"
 #include "../Ps2Const.h"
-#include "../Log.h"
+#include "Log.h"
 
 #define LOG_NAME "iop_sysclib"
 

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;

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;
 

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;
 

Source/iop/Iop_Thfpool.cpp

@@ -1,5 +1,5 @@
 #include "Iop_Thfpool.h"
-#include "../Log.h"
+#include "Log.h"
 
 #define LOG_NAME ("iop_thfpool")
 

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")
 

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")
 

Source/iop/Iop_Thvpool.cpp

@@ -1,5 +1,5 @@
 #include "Iop_Thvpool.h"
-#include "../Log.h"
+#include "Log.h"
 
 #define LOG_NAME ("iop_thvpool")
 

Source/iop/Iop_Timrman.cpp

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include "Iop_Timrman.h"
 #include "Iop_Intc.h"
-#include "../Log.h"
+#include "Log.h"
 #include "IopBios.h"
 #include "Iop_RootCounters.h"
 

Source/iop/Iop_Usbd.cpp

@@ -1,7 +1,7 @@
 #include "Iop_Usbd.h"
 #include <cstring>
 #include "IopBios.h"
-#include "../Log.h"
+#include "Log.h"
 #include "string_format.h"
 #include "lexical_cast_ex.h"
 #include "UsbBuzzerDevice.h"

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;
 

Source/iop/ioman/PreferenceDirectoryDevice.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DirectoryDevice.h"
-#include "../../AppConfig.h"
+#include "AppConfig.h"
 
 namespace Iop
 {

Source/iop/namco_sys147/Iop_NamcoSys147.cpp

@@ -1,6 +1,6 @@
 #include <cstring>
 #include "Iop_NamcoSys147.h"
-#include "../../Log.h"
+#include "Log.h"
 #include "StdStreamUtils.h"
 #include "PathUtils.h"
 #include "AppConfig.h"

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;

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;

Source/ui_android/GSH_OpenGLAndroid.cpp

@@ -1,7 +1,6 @@
 #include <cassert>
 #include "opengl/OpenGlDef.h"
 #include "GSH_OpenGLAndroid.h"
-#include "../Log.h"
 #include "AppConfig.h"
 
 CGSH_OpenGLAndroid::CGSH_OpenGLAndroid(NativeWindowType window)

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"

Source/ui_android/SettingsManager.cpp

@@ -1,7 +1,7 @@
 #include <jni.h>
 #include "SettingsManager.h"
 #include "NativeShared.h"
-#include "../AppConfig.h"
+#include "AppConfig.h"
 
 void CSettingsManager::Save()
 {

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

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

Source/ui_ios/GSH_OpenGLiOS.cpp

@@ -1,7 +1,6 @@
 #include <cassert>
 #include "opengl/OpenGlDef.h"
 #include "GSH_OpenGLiOS.h"
-#include "../Log.h"
 
 CGSH_OpenGLiOS::CGSH_OpenGLiOS(CAEAGLLayer* layer)
     : m_layer(layer)

Source/ui_ios/RenderView.mm

@@ -1,6 +1,6 @@
 #import "RenderView.h"
 #import <QuartzCore/QuartzCore.h>
-#include "../AppConfig.h"
+#include "AppConfig.h"
 #include "PreferenceDefs.h"
 
 @implementation RenderView

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"
 

Source/ui_ios/VirtualPadButton.mm

@@ -1,4 +1,4 @@
-#import "../AppConfig.h"
+#import "AppConfig.h"
 #import "PreferenceDefs.h"
 #import "VirtualPadButton.h"
 

Source/ui_ios/VirtualPadView.mm

@@ -1,4 +1,4 @@
-#import "../AppConfig.h"
+#import "AppConfig.h"
 #import "PreferenceDefs.h"
 #import "VirtualPadView.h"
 #import "VirtualPadButton.h"

Source/ui_ios/main.mm

@@ -1,6 +1,7 @@
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 #include "DebuggerSimulator.h"
+#include "DefaultAppConfig.h"
 
 int main(int argc, char* argv[])
 {

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;

Source/ui_libretro/main_libretro.cpp

@@ -15,6 +15,8 @@
 #include "MemStream.h"
 
 #include "filesystem_def.h"
+#include "DefaultAppConfig.h"
+
 #include <vector>
 #include <cstdlib>
 

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 <QVBoxLayout>
 

Source/ui_qt/main.cpp

@@ -1,8 +1,9 @@
 #include <QApplication>
 #include <QCommandLineParser>
-#include "mainwindow.h"
-#include "QStringUtils.h"
 #include <QtGlobal>
+#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;
+}

Source/ui_shared/BootablesDbClient.cpp

@@ -1,5 +1,5 @@
 #include <cassert>
-#include "../AppConfig.h"
+#include "AppConfig.h"
 #include "string_format.h"
 #include "PathUtils.h"
 #include "BootablesDbClient.h"

tools/AutoTest/Main.cpp

@@ -1,4 +1,5 @@
 #include "PS2VM.h"
+#include "DefaultAppConfig.h"
 #include "filesystem_def.h"
 #include "StdStream.h"
 #include "StdStreamUtils.h"

tools/ElfView/main.cpp

@@ -1,4 +1,6 @@
 #include <QApplication>
+#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;
+}

tools/McServTest/AppConfig.cpp

@@ -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;
-}

tools/McServTest/AppConfig.h

@@ -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<CAppConfig>
-{
-public:
-	CAppConfig();
-	virtual ~CAppConfig() = default;
-
-private:
-	CConfig::PathType BuildConfigPath();
-};

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

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;
+}

tools/PsfPlayer/Source/AppConfig.cpp

@@ -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;
-}

tools/PsfPlayer/Source/AppConfig.h

@@ -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<CAppConfig>
-{
-public:
-	CAppConfig();
-	virtual ~CAppConfig() = default;
-
-private:
-	CConfig::PathType BuildConfigPath();
-};

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;
+}

tools/PsfPlayer/Source/CMakeLists.txt

@@ -32,8 +32,8 @@ endif()
 
 ##PsfPlayerCore
 set(PSFCORE_SRC_FILES
-	AppConfig.cpp
+	AppDef.cpp
-	AppConfig.h
+	AppDef.h
 	Iop_PsfSubSystem.cpp
 	Iop_PsfSubSystem.h
 	PlaybackController.cpp

tools/SpuTest/Main.cpp

@@ -1,4 +1,5 @@
 #include <functional>
+#include "DefaultAppConfig.h"
 #include "KeyOnOffTest.h"
 #include "MultiCoreIrqTest.h"
 #include "SetRepeatTest.h"

tools/VuTest/Main.cpp

@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <fenv.h>
+#include "DefaultAppConfig.h"
 #include "FpUtils.h"
 #include "AddTest.h"
 #include "BranchTest.h"