Archive/Play-
0
0
Fork 0
mirror of https://github.com/jpd002/Play-.git synced 2025-04-28 13:47:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use app_config module.
Some checks failed
Build macOS / build_macos (push) Has been cancelled
Details
Build Android / build_android (apk) (push) Has been cancelled
Details
Build Android / build_android (libretro) (push) Has been cancelled
Details
Build Linux ARM32 / build_linux_arm32 (push) Has been cancelled
Details
Build Linux ARM64 / build_linux_arm64 (push) Has been cancelled
Details
Build Windows Psf / build_windows_psf (off, x86_64, Visual Studio 16 2019, installer64.nsi, x64) (push) Has been cancelled
Details
Build Windows Psf / build_windows_psf (on, x86_64, Visual Studio 16 2019, installer64.nsi, x64) (push) Has been cancelled
Details
Build Windows / build_windows (x86_32, Visual Studio 16 2019, installer32.nsi, win32_msvc2019, Win32) (push) Has been cancelled
Details
Build Windows / build_windows (x86_64, Visual Studio 16 2019, installer64.nsi, win64_msvc2019_64, x64) (push) Has been cancelled
Details
Check Format / run_clangformat (push) Has been cancelled
Details
Build iOS / build_ios (push) Has been cancelled
Details
Build JavaScript / build_js (push) Has been cancelled
Details
Build Linux / build_linux (push) Has been cancelled
Details

Browse source
This commit is contained in:
Jean-Philip Desjardins 2025-03-11 12:48:26 -04:00
parent 60b7951678
commit 30568a057d
95 changed files with 190 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/CMakeLists.txt
View file

@ -57,6 +57,14 @@ if(NOT TARGET Framework_Http)
endif() endif()
list(APPEND PROJECT_LIBS Framework_Http) 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(ENABLE_AMAZON_S3)
if(NOT TARGET Framework_Amazon) if(NOT TARGET Framework_Amazon)
add_subdirectory( add_subdirectory(
@ -138,8 +146,6 @@ if(NOT (TARGET_PLATFORM_ANDROID OR TARGET_PLATFORM_IOS))
endif() endif()
set(COMMON_SRC_FILES set(COMMON_SRC_FILES
AppConfig.cpp
AppConfig.h
BasicBlock.cpp BasicBlock.cpp
BasicBlock.h BasicBlock.h
BiosDebugInfoProvider.h BiosDebugInfoProvider.h
@ -438,8 +444,6 @@ set(COMMON_SRC_FILES
ISO9660/PathTableRecord.h ISO9660/PathTableRecord.h
ISO9660/VolumeDescriptor.cpp ISO9660/VolumeDescriptor.cpp
ISO9660/VolumeDescriptor.h ISO9660/VolumeDescriptor.h
Log.cpp
Log.h
MA_MIPSIV.cpp MA_MIPSIV.cpp
MA_MIPSIV.h MA_MIPSIV.h
MA_MIPSIV_Reflection.cpp MA_MIPSIV_Reflection.cpp

2
Source/app_shared/AppConfig.h
View file

@ -11,7 +11,7 @@ public:
//This needs to be implemented by every application/executable //This needs to be implemented by every application/executable
fs::path GetBasePath() const; fs::path GetBasePath() const;
private: private:
CConfig::PathType BuildConfigPath(); CConfig::PathType BuildConfigPath();
}; };

1
Source/app_shared/CMakeLists.txt
View file

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

18
Source/app_shared/DefaultAppConfig.h Normal file
View file

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

2
Source/ee/COP_VU.cpp
View file

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

2
Source/ee/DMAC.cpp
View file

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

2
Source/ee/Dmac_Channel.cpp
View file

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

2
Source/ee/Ee_SubSystem.cpp
View file

@ -4,7 +4,7 @@
#include "AppConfig.h" #include "AppConfig.h"
#include "StdStreamUtils.h" #include "StdStreamUtils.h"
#include "../Ps2Const.h" #include "../Ps2Const.h"
#include "../Log.h" #include "Log.h"
#include "../states/MemoryStateFile.h" #include "../states/MemoryStateFile.h"
#include "../iop/IopBios.h" #include "../iop/IopBios.h"
#include "Vif.h" #include "Vif.h"

2
Source/ee/GIF.cpp
View file

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

2
Source/ee/INTC.cpp
View file

@ -1,5 +1,5 @@
#include "INTC.h" #include "INTC.h"
#include "../Log.h" #include "Log.h"
#include "../states/RegisterStateFile.h" #include "../states/RegisterStateFile.h"
#define LOG_NAME ("ee_intc") #define LOG_NAME ("ee_intc")

2
Source/ee/IPU.cpp
View file

@ -21,7 +21,7 @@
#include "mpeg2/InverseScanTable.h" #include "mpeg2/InverseScanTable.h"
#include "idct/TrivialC.h" #include "idct/TrivialC.h"
#include "idct/IEEE1180.h" #include "idct/IEEE1180.h"
#include "../Log.h" #include "Log.h"
#include "DMAC.h" #include "DMAC.h"
#include "INTC.h" #include "INTC.h"
#include "Ps2Const.h" #include "Ps2Const.h"

2
Source/ee/PS2OS.cpp
View file

@ -15,7 +15,7 @@
#include "../ElfFile.h" #include "../ElfFile.h"
#include "../COP_SCU.h" #include "../COP_SCU.h"
#include "../uint128.h" #include "../uint128.h"
#include "../Log.h" #include "Log.h"
#include "../iop/IopBios.h" #include "../iop/IopBios.h"
#include "DMAC.h" #include "DMAC.h"
#include "INTC.h" #include "INTC.h"

2
Source/ee/SIF.cpp
View file

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

2
Source/ee/Timer.cpp
View file

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

2
Source/ee/Vif.cpp
View file

@ -3,7 +3,7 @@
#include <stdexcept> #include <stdexcept>
#include "static_loop.h" #include "static_loop.h"
#include "string_format.h" #include "string_format.h"
#include "../Log.h" #include "Log.h"
#include "../Ps2Const.h" #include "../Ps2Const.h"
#include "../states/RegisterStateFile.h" #include "../states/RegisterStateFile.h"
#include "../states/MemoryStateFile.h" #include "../states/MemoryStateFile.h"

2
Source/ee/Vpu.cpp
View file

@ -1,7 +1,7 @@
#include "Vpu.h" #include "Vpu.h"
#include "make_unique.h" #include "make_unique.h"
#include "string_format.h" #include "string_format.h"
#include "../Log.h" #include "Log.h"
#include "../states/RegisterStateFile.h" #include "../states/RegisterStateFile.h"
#include "../Ps2Const.h" #include "../Ps2Const.h"
#include "../FrameDump.h" #include "../FrameDump.h"

1
Source/gs/GSH_Direct3D9/GSH_Direct3D9.cpp
View file

@ -1,5 +1,4 @@
#include "GSH_Direct3D9.h" #include "GSH_Direct3D9.h"
#include "../../Log.h"
#include "../../gs/GsPixelFormats.h" #include "../../gs/GsPixelFormats.h"
#include "../../gs/GsTransferRange.h" #include "../../gs/GsTransferRange.h"
#include "direct3d9/D3D9TextureUtils.h" #include "direct3d9/D3D9TextureUtils.h"

8
Source/gs/GSH_OpenGL/CMakeLists.txt
View file

@ -17,6 +17,14 @@ if(NOT TARGET Framework_OpenGl)
endif() endif()
list(APPEND GSH_OPENGL_PROJECT_LIBS Framework_OpenGl) 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) if(TARGET_PLATFORM_UNIX_ARM)
list(APPEND GSH_OPENGL_COMPILE_OPTIONS "-mfpu=neon") list(APPEND GSH_OPENGL_COMPILE_OPTIONS "-mfpu=neon")
endif() endif()

3
Source/gs/GSH_OpenGL/GSH_OpenGL.cpp
View file

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

8
Source/gs/GSH_Vulkan/CMakeLists.txt
View file

@ -25,6 +25,14 @@ if(NOT TARGET Nuanceur)
endif() endif()
list(APPEND GSH_VULKAN_PROJECT_LIBS Nuanceur) 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 add_library(gsh_vulkan STATIC
GSH_Vulkan.cpp GSH_Vulkan.cpp
GSH_Vulkan.h GSH_Vulkan.h

4
Source/gs/GSH_Vulkan/GSH_Vulkan.cpp
View file

@ -3,8 +3,8 @@
#include "std_experimental_map.h" #include "std_experimental_map.h"
#include "../GsPixelFormats.h" #include "../GsPixelFormats.h"
#include "../GsTransferRange.h" #include "../GsTransferRange.h"
#include "../../Log.h" #include "Log.h"
#include "../../AppConfig.h" #include "AppConfig.h"
#include "GSH_VulkanPlatformDefs.h" #include "GSH_VulkanPlatformDefs.h"
#include "GSH_VulkanDrawDesktop.h" #include "GSH_VulkanDrawDesktop.h"
#include "GSH_VulkanDrawMobile.h" #include "GSH_VulkanDrawMobile.h"

2
Source/gs/GSH_Vulkan/GSH_VulkanDeviceInfo.cpp
View file

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

4
Source/gs/GSHandler.cpp
View file

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

2
Source/iop/IopBios.cpp
View file

@ -11,7 +11,7 @@
#include "IopBios.h" #include "IopBios.h"
#include "../COP_SCU.h" #include "../COP_SCU.h"
#include "../Log.h" #include "Log.h"
#include "../ElfFile.h" #include "../ElfFile.h"
#include "../Ps2Const.h" #include "../Ps2Const.h"
#include "../MipsExecutor.h" #include "../MipsExecutor.h"

2
Source/iop/Iop_Cdvdfsv.cpp
View file

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

2
Source/iop/Iop_Cdvdman.cpp
View file

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

2
Source/iop/Iop_Dmac.cpp
View file

@ -3,7 +3,7 @@
#include "Iop_Dmac.h" #include "Iop_Dmac.h"
#include "Iop_Intc.h" #include "Iop_Intc.h"
#include "../states/RegisterStateFile.h" #include "../states/RegisterStateFile.h"
#include "../Log.h" #include "Log.h"
#define LOG_NAME ("iop_dmac") #define LOG_NAME ("iop_dmac")

2
Source/iop/Iop_Dmacman.cpp
View file

@ -1,7 +1,7 @@
#include "Iop_Dmacman.h" #include "Iop_Dmacman.h"
#include "Iop_Dmac.h" #include "Iop_Dmac.h"
#include "Iop_DmacChannel.h" #include "Iop_DmacChannel.h"
#include "../Log.h" #include "Log.h"
#define LOGNAME "iop_dmacman" #define LOGNAME "iop_dmacman"

2
Source/iop/Iop_FileIoHandler1000.cpp
View file

@ -3,7 +3,7 @@
#include "Iop_Ioman.h" #include "Iop_Ioman.h"
#include "Iop_SifManPs2.h" #include "Iop_SifManPs2.h"
#include "IopBios.h" #include "IopBios.h"
#include "../Log.h" #include "Log.h"
#define LOG_NAME ("iop_fileio") #define LOG_NAME ("iop_fileio")

2
Source/iop/Iop_FileIoHandler2100.cpp
View file

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

2
Source/iop/Iop_FileIoHandler2200.cpp
View file

@ -5,7 +5,7 @@
#include "Iop_SifManPs2.h" #include "Iop_SifManPs2.h"
#include "../states/RegisterStateFile.h" #include "../states/RegisterStateFile.h"
#include "../states/MemoryStateFile.h" #include "../states/MemoryStateFile.h"
#include "../Log.h" #include "Log.h"
#include "../Ps2Const.h" #include "../Ps2Const.h"
#define LOG_NAME ("iop_fileio") #define LOG_NAME ("iop_fileio")

2
Source/iop/Iop_Heaplib.cpp
View file

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

2
Source/iop/Iop_Intrman.cpp
View file

@ -1,5 +1,5 @@
#include "Iop_Intrman.h" #include "Iop_Intrman.h"
#include "../Log.h" #include "Log.h"
#include "../COP_SCU.h" #include "../COP_SCU.h"
#include "Iop_Intc.h" #include "Iop_Intc.h"
#include "IopBios.h" #include "IopBios.h"

4
Source/iop/Iop_Ioman.cpp
View file

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

2
Source/iop/Iop_LibSd.cpp
View file

@ -1,5 +1,5 @@
#include "Iop_LibSd.h" #include "Iop_LibSd.h"
#include "../Log.h" #include "Log.h"
#include "string_format.h" #include "string_format.h"
//Not an actual implementation of the LIBSD module //Not an actual implementation of the LIBSD module

2
Source/iop/Iop_Loadcore.cpp
View file

@ -2,7 +2,7 @@
#include "Iop_Loadcore.h" #include "Iop_Loadcore.h"
#include "Iop_Dynamic.h" #include "Iop_Dynamic.h"
#include "IopBios.h" #include "IopBios.h"
#include "../Log.h" #include "Log.h"
#include "../states/RegisterStateFile.h" #include "../states/RegisterStateFile.h"
using namespace Iop; using namespace Iop;

4
Source/iop/Iop_McServ.cpp
View file

@ -5,9 +5,9 @@
#include <states/XmlStateFile.h> #include <states/XmlStateFile.h>
#include <xml/Utils.h> #include <xml/Utils.h>
#include "string_format.h" #include "string_format.h"
#include "../AppConfig.h" #include "AppConfig.h"
#include "../PS2VM_Preferences.h" #include "../PS2VM_Preferences.h"
#include "../Log.h" #include "Log.h"
#include "Iop_McServ.h" #include "Iop_McServ.h"
#include "Iop_PathUtils.h" #include "Iop_PathUtils.h"
#include "Iop_Sysmem.h" #include "Iop_Sysmem.h"

2
Source/iop/Iop_Modload.cpp
View file

@ -1,6 +1,6 @@
#include "Iop_Modload.h" #include "Iop_Modload.h"
#include "IopBios.h" #include "IopBios.h"
#include "../Log.h" #include "Log.h"
using namespace Iop; using namespace Iop;

2
Source/iop/Iop_MtapMan.cpp
View file

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

2
Source/iop/Iop_Naplink.cpp
View file

@ -1,6 +1,6 @@
#include "Iop_Naplink.h" #include "Iop_Naplink.h"
#include "Iop_Ioman.h" #include "Iop_Ioman.h"
#include "../Log.h" #include "Log.h"
//Naplink is required by some demos that use nprintf //Naplink is required by some demos that use nprintf
//The demos won't make an explicit attempt at loading the module //The demos won't make an explicit attempt at loading the module

2
Source/iop/Iop_PadMan.cpp
View file

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

2
Source/iop/Iop_RootCounters.cpp
View file

@ -4,7 +4,7 @@
#include "Iop_Intc.h" #include "Iop_Intc.h"
#include "Ps2Const.h" #include "Ps2Const.h"
#include "string_format.h" #include "string_format.h"
#include "../Log.h" #include "Log.h"
#include "../states/RegisterStateFile.h" #include "../states/RegisterStateFile.h"
#define LOG_NAME ("iop_counters") #define LOG_NAME ("iop_counters")

2
Source/iop/Iop_Secrman.cpp
View file

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

2
Source/iop/Iop_SifCmd.cpp
View file

@ -4,7 +4,7 @@
#include "../Ps2Const.h" #include "../Ps2Const.h"
#include "../COP_SCU.h" #include "../COP_SCU.h"
#include "../ee/SIF.h" #include "../ee/SIF.h"
#include "../Log.h" #include "Log.h"
#include "../states/RegisterStateCollectionFile.h" #include "../states/RegisterStateCollectionFile.h"
using namespace Iop; using namespace Iop;

2
Source/iop/Iop_SifMan.cpp
View file

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

2
Source/iop/Iop_Sio2.cpp
View file

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

2
Source/iop/Iop_Spu.cpp
View file

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

2
Source/iop/Iop_Spu2.cpp
View file

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

2
Source/iop/Iop_Spu2_Core.cpp
View file

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

2
Source/iop/Iop_SpuBase.cpp
View file

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

2
Source/iop/Iop_Stdio.cpp
View file

@ -3,7 +3,7 @@
#include "Iop_Ioman.h" #include "Iop_Ioman.h"
#include "lexical_cast_ex.h" #include "lexical_cast_ex.h"
#include "string_format.h" #include "string_format.h"
#include "../Log.h" #include "Log.h"
#define LOG_NAME "iop_stdio" #define LOG_NAME "iop_stdio"

2
Source/iop/Iop_SubSystem.cpp
View file

@ -5,7 +5,7 @@
#include "../states/MemoryStateFile.h" #include "../states/MemoryStateFile.h"
#include "../states/RegisterStateFile.h" #include "../states/RegisterStateFile.h"
#include "../Ps2Const.h" #include "../Ps2Const.h"
#include "../Log.h" #include "Log.h"
#include "placeholder_def.h" #include "placeholder_def.h"
using namespace Iop; using namespace Iop;

2
Source/iop/Iop_Sysclib.cpp
View file

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

2
Source/iop/Iop_Sysmem.cpp
View file

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

2
Source/iop/Iop_Thbase.cpp
View file

@ -1,6 +1,6 @@
#include "Iop_Thbase.h" #include "Iop_Thbase.h"
#include "IopBios.h" #include "IopBios.h"
#include "../Log.h" #include "Log.h"
using namespace Iop; using namespace Iop;

2
Source/iop/Iop_Thevent.cpp
View file

@ -1,6 +1,6 @@
#include "Iop_Thevent.h" #include "Iop_Thevent.h"
#include "IopBios.h" #include "IopBios.h"
#include "../Log.h" #include "Log.h"
using namespace Iop; using namespace Iop;

2
Source/iop/Iop_Thfpool.cpp
View file

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

2
Source/iop/Iop_Thmsgbx.cpp
View file

@ -1,6 +1,6 @@
#include "Iop_Thmsgbx.h" #include "Iop_Thmsgbx.h"
#include "IopBios.h" #include "IopBios.h"
#include "../Log.h" #include "Log.h"
#define LOG_NAME ("iop_thmsgbx") #define LOG_NAME ("iop_thmsgbx")

2
Source/iop/Iop_Thsema.cpp
View file

@ -1,6 +1,6 @@
#include "Iop_Thsema.h" #include "Iop_Thsema.h"
#include "IopBios.h" #include "IopBios.h"
#include "../Log.h" #include "Log.h"
#define LOG_NAME ("iop_thsema") #define LOG_NAME ("iop_thsema")

2
Source/iop/Iop_Thvpool.cpp
View file

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

2
Source/iop/Iop_Timrman.cpp
View file

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

2
Source/iop/Iop_Usbd.cpp
View file

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

2
Source/iop/Iop_Vblank.cpp
View file

@ -1,6 +1,6 @@
#include "Iop_Vblank.h" #include "Iop_Vblank.h"
#include "IopBios.h" #include "IopBios.h"
#include "../Log.h" #include "Log.h"
using namespace Iop; using namespace Iop;

2
Source/iop/ioman/PreferenceDirectoryDevice.h
View file

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

2
Source/iop/namco_sys147/Iop_NamcoSys147.cpp
View file

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

2
Source/iop/namco_sys246/Iop_NamcoAcCdvd.cpp
View file

@ -1,7 +1,7 @@
#include "Iop_NamcoAcCdvd.h" #include "Iop_NamcoAcCdvd.h"
#include "../Iop_Cdvdman.h" #include "../Iop_Cdvdman.h"
#include "../../Ps2Const.h" #include "../../Ps2Const.h"
#include "../../Log.h" #include "Log.h"
using namespace Iop; using namespace Iop;
using namespace Iop::Namco; using namespace Iop::Namco;

2
Source/iop/namco_sys246/Iop_NamcoAcRam.cpp
View file

@ -3,7 +3,7 @@
#include "zip/ZipArchiveReader.h" #include "zip/ZipArchiveReader.h"
#include "zip/ZipArchiveWriter.h" #include "zip/ZipArchiveWriter.h"
#include "../../states/MemoryStateFile.h" #include "../../states/MemoryStateFile.h"
#include "../../Log.h" #include "Log.h"
using namespace Iop; using namespace Iop;
using namespace Iop::Namco; using namespace Iop::Namco;

1
Source/ui_android/GSH_OpenGLAndroid.cpp
View file

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

3
Source/ui_android/NativeInterop.cpp
View file

@ -12,7 +12,8 @@
#include "android/javax_crypto_Mac.h" #include "android/javax_crypto_Mac.h"
#include "android/javax_crypto_spec_SecretKeySpec.h" #include "android/javax_crypto_spec_SecretKeySpec.h"
#include "PathUtils.h" #include "PathUtils.h"
#include "../AppConfig.h" #include "AppConfig.h"
#include "DefaultAppConfig.h"
#include "../DiskUtils.h" #include "../DiskUtils.h"
#include "../PH_Generic.h" #include "../PH_Generic.h"
#include "../PS2VM.h" #include "../PS2VM.h"

2
Source/ui_android/SettingsManager.cpp
View file

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

2
Source/ui_ios/AltServerJitService.mm
View file

@ -1,6 +1,6 @@
#import "AltServerJitService.h" #import "AltServerJitService.h"
#import "AltKit-Swift.h" #import "AltKit-Swift.h"
#include "../AppConfig.h" #include "AppConfig.h"
#import "PreferenceDefs.h" #import "PreferenceDefs.h"
@implementation AltServerJitService @implementation AltServerJitService

2
Source/ui_ios/EmulatorViewController.mm
View file

@ -5,7 +5,7 @@
#import "RenderView.h" #import "RenderView.h"
#include "../PS2VM.h" #include "../PS2VM.h"
#include "../PS2VM_Preferences.h" #include "../PS2VM_Preferences.h"
#include "../AppConfig.h" #include "AppConfig.h"
#include "PreferenceDefs.h" #include "PreferenceDefs.h"
#include "GSH_OpenGLiOS.h" #include "GSH_OpenGLiOS.h"
#ifdef HAS_GSH_VULKAN #ifdef HAS_GSH_VULKAN

1
Source/ui_ios/GSH_OpenGLiOS.cpp
View file

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

2
Source/ui_ios/RenderView.mm
View file

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

2
Source/ui_ios/SettingsViewController.mm
View file

@ -1,6 +1,6 @@
#import "SettingsViewController.h" #import "SettingsViewController.h"
#import "SettingsListSelectorViewController.h" #import "SettingsListSelectorViewController.h"
#include "../AppConfig.h" #include "AppConfig.h"
#include "PreferenceDefs.h" #include "PreferenceDefs.h"
#include "../gs/GSH_OpenGL/GSH_OpenGL.h" #include "../gs/GSH_OpenGL/GSH_OpenGL.h"

2
Source/ui_ios/VirtualPadButton.mm
View file

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

2
Source/ui_ios/VirtualPadView.mm
View file

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

1
Source/ui_ios/main.mm
View file

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

1
Source/ui_js/Main.cpp
View file

@ -7,6 +7,7 @@
#include "input/PH_GenericInput.h" #include "input/PH_GenericInput.h"
#include "InputProviderEmscripten.h" #include "InputProviderEmscripten.h"
#include "ui_shared/StatsManager.h" #include "ui_shared/StatsManager.h"
#include "DefaultAppConfig.h"
CPs2VmJs* g_virtualMachine = nullptr; CPs2VmJs* g_virtualMachine = nullptr;
CGSHandler::NewFrameEvent::Connection g_gsNewFrameConnection; CGSHandler::NewFrameEvent::Connection g_gsNewFrameConnection;

2
Source/ui_libretro/main_libretro.cpp
View file

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

1
Source/ui_qt/DebugSupport/FrameDebugger/GsContextView.cpp
View file

@ -2,7 +2,6 @@
#include "GsStateUtils.h" #include "GsStateUtils.h"
#include "gs/GsDebuggerInterface.h" #include "gs/GsDebuggerInterface.h"
#include "gs/GsPixelFormats.h" #include "gs/GsPixelFormats.h"
#include "../../../AppConfig.h"
#include <QVBoxLayout> #include <QVBoxLayout>

25
Source/ui_qt/main.cpp
View file

@ -1,8 +1,9 @@
#include <QApplication> #include <QApplication>
#include <QCommandLineParser> #include <QCommandLineParser>
#include "mainwindow.h"
#include "QStringUtils.h"
#include <QtGlobal> #include <QtGlobal>
#include "mainwindow.h"
#include "PathUtils.h"
#include "QStringUtils.h"
Q_DECLARE_METATYPE(std::string) Q_DECLARE_METATYPE(std::string)
@ -104,3 +105,23 @@ int main(int argc, char* argv[])
#endif #endif
return a.exec(); 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;
}

2
Source/ui_shared/BootablesDbClient.cpp
View file

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

1
tools/AutoTest/Main.cpp
View file

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

14
tools/ElfView/main.cpp
View file

@ -1,4 +1,6 @@
#include <QApplication> #include <QApplication>
#include "AppConfig.h"
#include "PathUtils.h"
#include "mainwindow.h" #include "mainwindow.h"
int main(int argc, char* argv[]) int main(int argc, char* argv[])
@ -13,3 +15,15 @@ int main(int argc, char* argv[])
return a.exec(); 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;
}

26
tools/McServTest/AppConfig.cpp
View file

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

24
tools/McServTest/AppConfig.h
View file

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

2
tools/McServTest/CMakeLists.txt
View file

@ -16,8 +16,6 @@ if (NOT TARGET PlayCore)
endif() endif()
add_executable(McServTest add_executable(McServTest
AppConfig.cpp
AppConfig.h
GameTestSheet.cpp GameTestSheet.cpp
GameTestSheet.h GameTestSheet.h
Main.cpp Main.cpp

12
tools/McServTest/Main.cpp
View file

@ -122,3 +122,15 @@ int main(int argc, const char** argv)
return 0; 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;
}

26
tools/PsfPlayer/Source/AppConfig.cpp
View file

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

24
tools/PsfPlayer/Source/AppConfig.h
View file

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

14
tools/PsfPlayer/Source/AppDef.cpp Normal file
View file

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

4
tools/PsfPlayer/Source/CMakeLists.txt
View file

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

1
tools/SpuTest/Main.cpp
View file

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

1
tools/VuTest/Main.cpp
View file

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