From 79ff2f0ba8c077df8360086f03453b30976579dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 29 Dec 2013 23:28:31 +0100 Subject: [PATCH] Start untangling our include mess a little. --- CMakeLists.txt | 1 + Core/Core.vcxproj | 3 +- Core/Core.vcxproj.filters | 5 ++- Core/CwCheat.cpp | 12 ++++---- Core/Dialog/PSPGamedataInstallDialog.cpp | 9 +++--- Core/Dialog/PSPSaveDialog.cpp | 18 ++++++----- Core/Dialog/SavedataParam.cpp | 2 ++ Core/Dialog/SavedataParam.h | 2 ++ Core/FileSystems/FileSystem.cpp | 39 ++++++++++++++++++++++++ Core/FileSystems/FileSystem.h | 24 ++------------- Core/FileSystems/ISOFileSystem.cpp | 8 +++-- Core/FileSystems/MetaFileSystem.cpp | 4 ++- Core/HLE/sceCcc.cpp | 1 + Core/HLE/sceDisplay.cpp | 1 + Core/HLE/sceDmac.cpp | 1 + Core/HLE/sceFont.cpp | 7 +++-- Core/HLE/sceGe.cpp | 1 + Core/HLE/sceJpeg.cpp | 6 ++-- Core/HLE/sceKernelMemory.cpp | 2 ++ Core/HLE/sceKernelModule.cpp | 1 + Core/HLE/scePauth.cpp | 7 +++-- Core/HLE/scePsmf.cpp | 1 + Core/HLE/sceRtc.cpp | 1 + Core/HLE/sceUmd.cpp | 1 + Core/HLE/sceUtility.cpp | 31 ++++++++++--------- Core/HW/AsyncIOManager.cpp | 1 + Core/Loaders.cpp | 19 ++++++------ Core/MIPS/MIPS.cpp | 4 ++- Core/PSPLoaders.cpp | 34 +++++++++++---------- Core/SaveState.cpp | 9 ++++-- Core/System.h | 7 +++-- Core/Util/PPGeDraw.cpp | 12 +++++--- GPU/GLES/GLES_GPU.cpp | 2 ++ UI/CwCheatScreen.h | 5 +++ UI/GameSettingsScreen.cpp | 3 +- android/jni/Android.mk | 1 + android/jni/TestRunner.cpp | 3 +- lang | 2 +- native | 2 +- 39 files changed, 184 insertions(+), 108 deletions(-) create mode 100644 Core/FileSystems/FileSystem.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 90e6c891a..ac7dd0d47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -966,6 +966,7 @@ add_library(${CoreLibName} ${CoreLinkType} Core/FileSystems/DirectoryFileSystem.cpp Core/FileSystems/DirectoryFileSystem.h Core/FileSystems/FileSystem.h + Core/FileSystems/FileSystem.cpp Core/FileSystems/ISOFileSystem.cpp Core/FileSystems/ISOFileSystem.h Core/FileSystems/MetaFileSystem.cpp diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 6ce530e53..9a0941038 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -188,6 +188,7 @@ + @@ -629,4 +630,4 @@ - \ No newline at end of file + diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index 6782cdded..65e9c17a0 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -126,6 +126,9 @@ FileSystems + + FileSystems + FileSystems @@ -958,4 +961,4 @@ - \ No newline at end of file + diff --git a/Core/CwCheat.cpp b/Core/CwCheat.cpp index 2c4ada35f..e1154e4c1 100644 --- a/Core/CwCheat.cpp +++ b/Core/CwCheat.cpp @@ -1,11 +1,11 @@ -#include "CwCheat.h" -#include "../Core/CoreTiming.h" -#include "../Core/CoreParameter.h" -#include "StringUtils.h" +#include "Common/StringUtils.h" +#include "Common/ChunkFile.h" #include "Common/FileUtil.h" -#include "Config.h" -#include "MIPS/MIPS.h" +#include "Core/CoreTiming.h" +#include "Core/CoreParameter.h" +#include "Core/CwCheat.h" #include "Core/Config.h" +#include "Core/MIPS/MIPS.h" static int CheatEvent = -1; std::string gameTitle; diff --git a/Core/Dialog/PSPGamedataInstallDialog.cpp b/Core/Dialog/PSPGamedataInstallDialog.cpp index 0b8e4c9e0..e4cf68ab4 100644 --- a/Core/Dialog/PSPGamedataInstallDialog.cpp +++ b/Core/Dialog/PSPGamedataInstallDialog.cpp @@ -15,9 +15,10 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "PSPGamedataInstallDialog.h" -#include "ChunkFile.h" -#include "../Core/MemMap.h" +#include "Common/ChunkFile.h" +#include "Core/MemMap.h" +#include "Core/FileSystems/MetaFileSystem.h" +#include "Core/Dialog/PSPGamedataInstallDialog.h" std::string saveBasePath = "ms0:/PSP/SAVEDATA/"; @@ -176,4 +177,4 @@ void PSPGamedataInstallDialog::DoState(PointerWrap &p) { } else { paramAddr = 0; } -} \ No newline at end of file +} diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index 13bca1d54..96bec217c 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -15,15 +15,19 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "PSPSaveDialog.h" -#include "../Util/PPGeDraw.h" -#include "../HLE/sceCtrl.h" -#include "../HLE/sceUtility.h" -#include "../Core/MemMap.h" -#include "../Config.h" +#include "i18n/i18n.h" + +#include "Common/ChunkFile.h" + +#include "Core/FileSystems/MetaFileSystem.h" +#include "Core/Util/PPGeDraw.h" +#include "Core/HLE/sceCtrl.h" +#include "Core/HLE/sceUtility.h" +#include "Core/MemMap.h" +#include "Core/Config.h" #include "Core/Reporting.h" #include "Core/HW/MemoryStick.h" -#include "i18n/i18n.h" +#include "Core/Dialog/PSPSaveDialog.h" const float FONT_SCALE = 0.55f; diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index fb43101c8..597bc0da3 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -17,9 +17,11 @@ #include "base/logging.h" +#include "Common/ChunkFile.h" #include "Core/Reporting.h" #include "Core/Dialog/SavedataParam.h" #include "Core/Dialog/PSPSaveDialog.h" +#include "Core/FileSystems/MetaFileSystem.h" #include "Core/HLE/sceIo.h" #include "Core/HLE/sceKernelMemory.h" #include "Core/HLE/sceChnnlsv.h" diff --git a/Core/Dialog/SavedataParam.h b/Core/Dialog/SavedataParam.h index 234fec649..abd87bc9e 100644 --- a/Core/Dialog/SavedataParam.h +++ b/Core/Dialog/SavedataParam.h @@ -28,6 +28,8 @@ #undef st_atime #undef st_mtime +struct PSPFileInfo; + enum SceUtilitySavedataType { SCE_UTILITY_SAVEDATA_TYPE_AUTOLOAD = 0, diff --git a/Core/FileSystems/FileSystem.cpp b/Core/FileSystems/FileSystem.cpp new file mode 100644 index 000000000..b2130e2ed --- /dev/null +++ b/Core/FileSystems/FileSystem.cpp @@ -0,0 +1,39 @@ +// Copyright (c) 2012- PPSSPP Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0 or later versions. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official git repository and contact information can be found at +// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. + +#include "Common/ChunkFile.h" +#include "Core/FileSystems/FileSystem.h" + +void PSPFileInfo::DoState(PointerWrap &p) { + auto s = p.Section("PSPFileInfo", 1); + if (!s) + return; + + p.Do(name); + p.Do(size); + p.Do(access); + p.Do(exists); + p.Do(type); + p.Do(atime); + p.Do(ctime); + p.Do(mtime); + p.Do(isOnSectorSystem); + p.Do(startSector); + p.Do(numSectors); + p.Do(sectorSize); +} + diff --git a/Core/FileSystems/FileSystem.h b/Core/FileSystems/FileSystem.h index 0494af6e7..768995525 100644 --- a/Core/FileSystems/FileSystem.h +++ b/Core/FileSystems/FileSystem.h @@ -17,8 +17,6 @@ #pragma once -#include "../../Globals.h" -#include "Common/ChunkFile.h" #include "Core/HLE/sceKernel.h" enum FileAccess @@ -69,28 +67,10 @@ private: struct PSPFileInfo { - PSPFileInfo() + PSPFileInfo() : size(0), access(0), exists(false), type(FILETYPE_NORMAL), isOnSectorSystem(false), startSector(0), numSectors(0) {} - void DoState(PointerWrap &p) - { - auto s = p.Section("PSPFileInfo", 1); - if (!s) - return; - - p.Do(name); - p.Do(size); - p.Do(access); - p.Do(exists); - p.Do(type); - p.Do(atime); - p.Do(ctime); - p.Do(mtime); - p.Do(isOnSectorSystem); - p.Do(startSector); - p.Do(numSectors); - p.Do(sectorSize); - } + void DoState(PointerWrap &p); std::string name; s64 size; diff --git a/Core/FileSystems/ISOFileSystem.cpp b/Core/FileSystems/ISOFileSystem.cpp index c2c2ebdce..82a213973 100644 --- a/Core/FileSystems/ISOFileSystem.cpp +++ b/Core/FileSystems/ISOFileSystem.cpp @@ -15,15 +15,17 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include +#include +#include + #include "Globals.h" #include "Common/Common.h" +#include "Common/ChunkFile.h" #include "Core/FileSystems/ISOFileSystem.h" #include "Core/HLE/sceKernel.h" #include "Core/MemMap.h" #include "Core/Reporting.h" -#include -#include -#include const int sectorSize = 2048; diff --git a/Core/FileSystems/MetaFileSystem.cpp b/Core/FileSystems/MetaFileSystem.cpp index 34123f690..2975258b4 100644 --- a/Core/FileSystems/MetaFileSystem.cpp +++ b/Core/FileSystems/MetaFileSystem.cpp @@ -15,8 +15,10 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include #include +#include + +#include "Common/ChunkFile.h" #include "Common/StringUtils.h" #include "Core/FileSystems/MetaFileSystem.h" #include "Core/HLE/sceKernelThread.h" diff --git a/Core/HLE/sceCcc.cpp b/Core/HLE/sceCcc.cpp index c3beafc28..e0a8d755a 100644 --- a/Core/HLE/sceCcc.cpp +++ b/Core/HLE/sceCcc.cpp @@ -19,6 +19,7 @@ #include "util/text/utf16.h" #include "util/text/shiftjis.h" +#include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" #include "Core/Reporting.h" diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 414dc6e5d..60fe5e7c9 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -30,6 +30,7 @@ #include "gfx_es2/gl_state.h" #endif +#include "Common/ChunkFile.h" #include "Core/CoreTiming.h" #include "Core/CoreParameter.h" #include "Core/Reporting.h" diff --git a/Core/HLE/sceDmac.cpp b/Core/HLE/sceDmac.cpp index 36191f743..2400e2140 100644 --- a/Core/HLE/sceDmac.cpp +++ b/Core/HLE/sceDmac.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Globals.h" +#include "Common/ChunkFile.h" #include "Core/CoreTiming.h" #include "Core/MemMap.h" #include "Core/Reporting.h" diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp index 440416ba1..a89fb23b7 100644 --- a/Core/HLE/sceFont.cpp +++ b/Core/HLE/sceFont.cpp @@ -7,10 +7,11 @@ #include #include -#include "HLE.h" -#include "../MIPS/MIPS.h" -#include "ChunkFile.h" +#include "Common/ChunkFile.h" +#include "Core/HLE/HLE.h" +#include "Core/MIPS/MIPS.h" #include "Core/FileSystems/FileSystem.h" +#include "Core/FileSystems/MetaFileSystem.h" #include "Core/Reporting.h" #include "Core/System.h" #include "Core/HLE/sceKernel.h" diff --git a/Core/HLE/sceGe.cpp b/Core/HLE/sceGe.cpp index 6398a8b58..38b01e86c 100644 --- a/Core/HLE/sceGe.cpp +++ b/Core/HLE/sceGe.cpp @@ -18,6 +18,7 @@ #include #include +#include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" #include "Core/MIPS/MIPS.h" #include "Core/System.h" diff --git a/Core/HLE/sceJpeg.cpp b/Core/HLE/sceJpeg.cpp index 0dd29226a..cda0a1497 100644 --- a/Core/HLE/sceJpeg.cpp +++ b/Core/HLE/sceJpeg.cpp @@ -15,10 +15,12 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include "native/ext/jpge/jpgd.h" + +#include "Common.h" +#include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" #include "Core/Reporting.h" -#include "Common.h" -#include "native/ext/jpge/jpgd.h" //Uncomment if you want to dump JPEGs loaded through sceJpeg to a file //#define JPEG_DEBUG diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp index e88ebe9e2..7ad6eda32 100644 --- a/Core/HLE/sceKernelMemory.cpp +++ b/Core/HLE/sceKernelMemory.cpp @@ -19,6 +19,8 @@ #include #include #include + +#include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" #include "Core/System.h" #include "Core/MIPS/MIPS.h" diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index a37f827b7..7d0ec825c 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -20,6 +20,7 @@ #include #include "native/base/stringutil.h" +#include "Common/ChunkFile.h" #include "Common/FileUtil.h" #include "Core/Config.h" #include "Core/HLE/HLE.h" diff --git a/Core/HLE/scePauth.cpp b/Core/HLE/scePauth.cpp index b3fc111a8..4c5399cae 100644 --- a/Core/HLE/scePauth.cpp +++ b/Core/HLE/scePauth.cpp @@ -15,11 +15,12 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" - -#include "scePauth.h" #include "zlib.h" +#include "Core/FileSystems/MetaFileSystem.h" +#include "Core/HLE/scePauth.h" +#include "Core/HLE/HLE.h" + int scePauth_F7AA47F6(u32 srcPtr, int srcLength, u32 destLengthPtr, u32 workArea) { ERROR_LOG(HLE, "UNIMPL scePauth_F7AA47F6(%08x, %08x, %08x, %08x)", srcPtr, srcLength, destLengthPtr, workArea); diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp index bcf4dfa7b..950577e22 100644 --- a/Core/HLE/scePsmf.cpp +++ b/Core/HLE/scePsmf.cpp @@ -19,6 +19,7 @@ #include "Common/ChunkFile.h" #include "Core/Reporting.h" +#include "Core/FileSystems/MetaFileSystem.h" #include "Core/HLE/scePsmf.h" #include "Core/HLE/sceMpeg.h" #include "Core/HW/MediaEngine.h" diff --git a/Core/HLE/sceRtc.cpp b/Core/HLE/sceRtc.cpp index 442272c06..926259462 100644 --- a/Core/HLE/sceRtc.cpp +++ b/Core/HLE/sceRtc.cpp @@ -25,6 +25,7 @@ #include #include "base/timeutil.h" +#include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" #include "Core/MIPS/MIPS.h" #include "Core/Reporting.h" diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp index b1cd91fa1..67cbc9aa3 100644 --- a/Core/HLE/sceUmd.cpp +++ b/Core/HLE/sceUmd.cpp @@ -26,6 +26,7 @@ #include "Core/HLE/KernelWaitHelpers.h" #include "Core/FileSystems/BlockDevices.h" +#include "Core/FileSystems/MetaFileSystem.h" #include "Core/FileSystems/ISOFileSystem.h" #include "Core/FileSystems/VirtualDiscFileSystem.h" diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index f5c8a952d..02288f658 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -17,24 +17,25 @@ #include -#include "HLE.h" -#include "../MIPS/MIPS.h" +#include "file/ini_file.h" + +#include "Common/ChunkFile.h" +#include "Core/HLE/HLE.h" +#include "Core/MIPS/MIPS.h" #include "Core/Reporting.h" -#include "sceKernel.h" -#include "sceKernelThread.h" -#include "sceUtility.h" +#include "Core/HLE/sceKernel.h" +#include "Core/HLE/sceKernelThread.h" +#include "Core/HLE/sceUtility.h" -#include "sceCtrl.h" -#include "../Util/PPGeDraw.h" -#include "../Dialog/PSPSaveDialog.h" -#include "../Dialog/PSPMsgDialog.h" -#include "../Dialog/PSPPlaceholderDialog.h" -#include "../Dialog/PSPOskDialog.h" -#include "../Dialog/PSPGamedataInstallDialog.h" -#include "../Dialog/PSPNetconfDialog.h" - -#include "../native/file/ini_file.h" +#include "Core/HLE/sceCtrl.h" +#include "Core/Util/PPGeDraw.h" +#include "Core/Dialog/PSPSaveDialog.h" +#include "Core/Dialog/PSPMsgDialog.h" +#include "Core/Dialog/PSPPlaceholderDialog.h" +#include "Core/Dialog/PSPOskDialog.h" +#include "Core/Dialog/PSPGamedataInstallDialog.h" +#include "Core/Dialog/PSPNetconfDialog.h" const int SCE_ERROR_MODULE_BAD_ID = 0x80111101; const int SCE_ERROR_MODULE_ALREADY_LOADED = 0x80111102; diff --git a/Core/HW/AsyncIOManager.cpp b/Core/HW/AsyncIOManager.cpp index 9623a5f62..0f550a18e 100644 --- a/Core/HW/AsyncIOManager.cpp +++ b/Core/HW/AsyncIOManager.cpp @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include "Common/ChunkFile.h" #include "Core/Reporting.h" #include "Core/System.h" #include "Core/HW/AsyncIOManager.h" diff --git a/Core/Loaders.cpp b/Core/Loaders.cpp index 3e938dae2..1b551f061 100644 --- a/Core/Loaders.cpp +++ b/Core/Loaders.cpp @@ -16,16 +16,17 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "file/file_util.h" -#include "Common/FileUtil.h" -#include "MIPS/MIPS.h" -#include "MIPS/MIPSCodeUtils.h" -#include "HLE/HLE.h" -#include "HLE/sceKernelModule.h" -#include "PSPLoaders.h" -#include "MemMap.h" -#include "Loaders.h" -#include "System.h" +#include "Common/FileUtil.h" +#include "Core/MIPS/MIPS.h" +#include "Core/MIPS/MIPSCodeUtils.h" +#include "Core/FileSystems/MetaFileSystem.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/sceKernelModule.h" +#include "Core/PSPLoaders.h" +#include "Core/MemMap.h" +#include "Core/Loaders.h" +#include "Core/System.h" // TODO : improve, look in the file more IdentifiedFileType Identify_File(std::string &filename) diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp index bd9c580fe..964102c7b 100644 --- a/Core/MIPS/MIPS.cpp +++ b/Core/MIPS/MIPS.cpp @@ -19,7 +19,9 @@ #include #include "math/math_util.h" + #include "Common.h" +#include "Common/ChunkFile.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSTables.h" #include "Core/MIPS/MIPSDebugInterface.h" @@ -337,4 +339,4 @@ const char *MIPSState::DisasmAt(u32 compilerPC) { static char temp[256]; MIPSDisAsm(Memory::Read_Instruction(compilerPC), 0, temp); return temp; -} \ No newline at end of file +} diff --git a/Core/PSPLoaders.cpp b/Core/PSPLoaders.cpp index 825d1e20a..a1ca5ca11 100644 --- a/Core/PSPLoaders.cpp +++ b/Core/PSPLoaders.cpp @@ -15,33 +15,35 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "ELF/ElfReader.h" +#include "file/file_util.h" + +#include "Common/StringUtils.h" + +#include "Core/ELF/ElfReader.h" +#include "Core/ELF/ParamSFO.h" #include "FileSystems/BlockDevices.h" #include "FileSystems/DirectoryFileSystem.h" #include "FileSystems/ISOFileSystem.h" +#include "FileSystems/MetaFileSystem.h" #include "FileSystems/VirtualDiscFileSystem.h" -#include "MemMap.h" +#include "Core/MemMap.h" -#include "MIPS/MIPS.h" -#include "MIPS/MIPSAnalyst.h" -#include "MIPS/MIPSCodeUtils.h" - -#include "file/file_util.h" -#include "StringUtils.h" +#include "Core/MIPS/MIPS.h" +#include "Core/MIPS/MIPSAnalyst.h" +#include "Core/MIPS/MIPSCodeUtils.h" #include "Host.h" -#include "System.h" -#include "PSPLoaders.h" -#include "HLE/HLE.h" -#include "HLE/sceKernel.h" -#include "HLE/sceKernelThread.h" -#include "HLE/sceKernelModule.h" -#include "HLE/sceKernelMemory.h" -#include "ELF/ParamSFO.h" #include "Core/Config.h" +#include "Core/System.h" +#include "Core/PSPLoaders.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/sceKernel.h" +#include "Core/HLE/sceKernelThread.h" +#include "Core/HLE/sceKernelModule.h" +#include "Core/HLE/sceKernelMemory.h" // We gather the game info before actually loading/booting the ISO // to determine if the emulator should enable extra memory and diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp index 615a4875a..b86965840 100644 --- a/Core/SaveState.cpp +++ b/Core/SaveState.cpp @@ -17,8 +17,12 @@ #include +#include "base/timeutil.h" +#include "i18n/i18n.h" + #include "Common/StdMutex.h" #include "Common/FileUtil.h" +#include "Common/ChunkFile.h" #include "Core/SaveState.h" #include "Core/Config.h" @@ -26,16 +30,15 @@ #include "Core/CoreTiming.h" #include "Core/Host.h" #include "Core/System.h" +#include "Core/FileSystems/MetaFileSystem.h" #include "Core/HLE/HLE.h" #include "Core/HLE/sceKernel.h" -#include "HW/MemoryStick.h" #include "Core/MemMap.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/JitCommon/JitCommon.h" +#include "HW/MemoryStick.h" #include "GPU/GPUState.h" #include "UI/OnScreenDisplay.h" -#include "base/timeutil.h" -#include "i18n/i18n.h" namespace SaveState { diff --git a/Core/System.h b/Core/System.h index 4700e1387..d7c3507c2 100644 --- a/Core/System.h +++ b/Core/System.h @@ -17,13 +17,14 @@ #pragma once -#include "../Globals.h" +#include "Globals.h" #include "Core/MemMap.h" #include "Core/Host.h" -#include "Core/FileSystems/MetaFileSystem.h" #include "Core/CoreParameter.h" #include "Core/ELF/ParamSFO.h" +class MetaFileSystem; + extern MetaFileSystem pspFileSystem; extern ParamSFOData g_paramSFO; @@ -87,4 +88,4 @@ extern volatile CoreState coreState; extern volatile bool coreStatePending; void Core_UpdateState(CoreState newState); -CoreParameter &PSP_CoreParameter(); \ No newline at end of file +CoreParameter &PSP_CoreParameter(); diff --git a/Core/Util/PPGeDraw.cpp b/Core/Util/PPGeDraw.cpp index 85b858a04..2f61df35a 100644 --- a/Core/Util/PPGeDraw.cpp +++ b/Core/Util/PPGeDraw.cpp @@ -16,17 +16,21 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include "Core/Util/PPGeDraw.h" + +#include "image/zim_load.h" +#include "image/png_load.h" +#include "util/text/utf8.h" + +#include "Common/ChunkFile.h" #include "GPU/ge_constants.h" #include "GPU/GPUState.h" #include "GPU/GPUInterface.h" +#include "Core/FileSystems/MetaFileSystem.h" +#include "Core/Util/PPGeDraw.h" #include "Core/HLE/sceKernel.h" #include "Core/HLE/sceKernelMemory.h" #include "Core/HLE/sceGe.h" #include "Core/MemMap.h" -#include "image/zim_load.h" -#include "image/png_load.h" -#include "util/text/utf8.h" #include "Core/System.h" static u32 atlasPtr; diff --git a/GPU/GLES/GLES_GPU.cpp b/GPU/GLES/GLES_GPU.cpp index 70d6ee9b8..c8269917d 100644 --- a/GPU/GLES/GLES_GPU.cpp +++ b/GPU/GLES/GLES_GPU.cpp @@ -18,6 +18,8 @@ #include "base/logging.h" #include "gfx_es2/gl_state.h" +#include "Common/ChunkFile.h" + #include "Core/Debugger/Breakpoints.h" #include "Core/MemMap.h" #include "Core/Host.h" diff --git a/UI/CwCheatScreen.h b/UI/CwCheatScreen.h index 783bbf754..948b06627 100644 --- a/UI/CwCheatScreen.h +++ b/UI/CwCheatScreen.h @@ -15,6 +15,10 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include +#include +#include + #include "base/functional.h" #include "ui/view.h" #include "ui/ui_screen.h" @@ -22,6 +26,7 @@ #include "../Core/CwCheat.h" #include "UI/MiscScreens.h" #include "UI/GameSettingsScreen.h" + using namespace UI; extern std::string activeCheatFile; extern std::string gameTitle; diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index c2444abdd..371144255 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -35,6 +35,8 @@ #include "UI/TiltAnalogSettingsScreen.h" #include "UI/TiltEventProcessor.h" +#include "Common/KeyMap.h" +#include "Common/FileUtil.h" #include "Core/Config.h" #include "Core/Host.h" #include "Core/System.h" @@ -43,7 +45,6 @@ #include "android/jni/TestRunner.h" #include "GPU/GPUInterface.h" #include "GPU/GLES/Framebuffer.h" -#include "Common/KeyMap.h" #ifdef _WIN32 namespace MainWindow { diff --git a/android/jni/Android.mk b/android/jni/Android.mk index f35bbdd73..04441c8a6 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -252,6 +252,7 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Core/HLE/scePauth.cpp \ $(SRC)/Core/FileSystems/BlockDevices.cpp \ $(SRC)/Core/FileSystems/ISOFileSystem.cpp \ + $(SRC)/Core/FileSystems/FileSystem.cpp \ $(SRC)/Core/FileSystems/MetaFileSystem.cpp \ $(SRC)/Core/FileSystems/DirectoryFileSystem.cpp \ $(SRC)/Core/FileSystems/VirtualDiscFileSystem.cpp \ diff --git a/android/jni/TestRunner.cpp b/android/jni/TestRunner.cpp index 0b79e9c8f..2b88f3e6a 100644 --- a/android/jni/TestRunner.cpp +++ b/android/jni/TestRunner.cpp @@ -22,6 +22,7 @@ // It currently just runs one test but that can be easily changed. #include +#include #include #include @@ -157,4 +158,4 @@ void RunTests() PSP_CoreParameter().pixelHeight = pixel_yres; PSP_CoreParameter().headLess = false; g_Config.sReportHost = savedReportHost; -} \ No newline at end of file +} diff --git a/lang b/lang index d8e1f6abb..dbc1d9521 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit d8e1f6abb7e61e905e14e5d3dfe679ebfd58bc76 +Subproject commit dbc1d95219486ca6f683f2b2032c437fe213464e diff --git a/native b/native index 6670d0003..d9467bca8 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 6670d0003a1960244993145703cd26c732b1c435 +Subproject commit d9467bca85933f85e978d22da8c711d072513131