Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move native/util, native/data and native/i18 to Common/Data.

Browse source 
Also move colorutil.cpp/h

linking build fix experiment

Delete a bunch of unused CMakeLists.txt files

CMakeLists.txt linking fix

Don't include NativeApp.h from any headers.

Android.mk buildfix

Half of the UWP fix

Buildfix

Minor project file cleanup

Buildfixes

Guess what? More buildfixes!
This commit is contained in:
Henrik Rydgård 2020-10-01 13:05:04 +02:00
parent 5c9b7bb859
commit ff8148dd92
191 changed files with 583 additions and 797 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -116,3 +116,6 @@ debian/ppsspp/
# RenderDoc
*.rdc
# bad output from libretro. don't want to accidentally add it
nul

42
CMakeLists.txt
View file

@ -433,6 +433,27 @@ add_library(Common STATIC
Common/Crypto/sha1.h
Common/Crypto/sha256.cpp
Common/Crypto/sha256.h
Common/Data/Collections/ConstMap.h
Common/Data/Collections/TinySet.h
Common/Data/Color/RGBAUtil.cpp
Common/Data/Color/RGBAUtil.h
Common/Data/Encoding/Base64.cpp
Common/Data/Encoding/Base64.h
Common/Data/Encoding/Compression.cpp
Common/Data/Encoding/Compression.h
Common/Data/Encoding/Shiftjis.h
Common/Data/Encoding/Utf8.cpp
Common/Data/Encoding/Utf8.h
Common/Data/Encoding/Utf16.h
Common/Data/Hash/Hash.cpp
Common/Data/Hash/Hash.h
Common/Data/Text/I18n.cpp
Common/Data/Text/I18n.h
Common/Data/Text/Parsers.cpp
Common/Data/Text/Parsers.h
Common/Data/Text/WrapText.cpp
Common/Data/Text/WrapText.h
Common/Data/Random/Rng.h
Common/Input/GestureDetector.cpp
Common/Input/GestureDetector.h
Common/Input/KeyCodes.h
@ -957,14 +978,8 @@ endif()
add_library(native STATIC
${nativeExtra}
ext/native/base/colorutil.cpp
ext/native/base/colorutil.h
ext/native/base/display.cpp
ext/native/base/display.h
ext/native/data/base64.cpp
ext/native/data/base64.h
ext/native/data/compression.cpp
ext/native/data/compression.h
ext/native/file/chunk_file.cpp
ext/native/file/chunk_file.h
ext/native/file/fd_util.cpp
@ -1005,8 +1020,6 @@ add_library(native STATIC
ext/native/gfx_es2/glsl_program.h
ext/native/gfx_es2/gl3stub.c
ext/native/gfx_es2/gl3stub.h
ext/native/i18n/i18n.cpp
ext/native/i18n/i18n.h
ext/native/image/png_load.cpp
ext/native/image/png_load.h
ext/native/image/zim_load.cpp
@ -1069,17 +1082,6 @@ add_library(native STATIC
ext/native/ui/view.h
ext/native/ui/viewgroup.cpp
ext/native/ui/viewgroup.h
ext/native/util/hash/hash.cpp
ext/native/util/hash/hash.h
ext/native/util/random/rng.h
ext/native/util/text/utf8.h
ext/native/util/text/utf8.cpp
ext/native/util/text/parsers.h
ext/native/util/text/parsers.cpp
ext/native/util/text/wrap_text.h
ext/native/util/text/wrap_text.cpp
ext/native/util/const_map.h
ext/native/util/tiny_set.h
ext/jpge/jpgd.cpp
ext/jpge/jpgd.h
ext/jpge/jpge.cpp
@ -1096,7 +1098,7 @@ if(ANDROID)
set(ATOMIC_LIB atomic)
endif()
target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARY} gason udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB})
target_link_libraries(native ${LIBZIP_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARY} gason udis86 ${RT_LIB} ${nativeExtraLibs} ${ATOMIC_LIB} Common)
if(TARGET Ext::GLEW)
target_link_libraries(native Ext::GLEW)
endif()

2
Common/ArmCPUDetect.cpp
View file

@ -26,7 +26,7 @@
#include "CPUDetect.h"
#include "StringUtils.h"
#include "FileUtil.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#if PPSSPP_PLATFORM(WINDOWS)
#if PPSSPP_PLATFORM(UWP)

21
Common/Common.vcxproj
View file

@ -359,6 +359,19 @@
<ClInclude Include="BitScan.h" />
<ClInclude Include="BitSet.h" />
<ClInclude Include="Buffer.h" />
<ClInclude Include="Data\Collections\ConstMap.h" />
<ClInclude Include="Data\Collections\TinySet.h" />
<ClInclude Include="Data\Color\RGBAUtil.h" />
<ClInclude Include="Data\Encoding\Base64.h" />
<ClInclude Include="Data\Encoding\Compression.h" />
<ClInclude Include="Data\Encoding\Shiftjis.h" />
<ClInclude Include="Data\Encoding\Utf16.h" />
<ClInclude Include="Data\Encoding\Utf8.h" />
<ClInclude Include="Data\Hash\Hash.h" />
<ClInclude Include="Data\Random\Rng.h" />
<ClInclude Include="Data\Text\I18n.h" />
<ClInclude Include="Data\Text\Parsers.h" />
<ClInclude Include="Data\Text\WrapText.h" />
<ClInclude Include="FakeEmitter.h" />
<ClInclude Include="Input\GestureDetector.h" />
<ClInclude Include="Input\InputState.h" />
@ -614,6 +627,14 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Data\Color\RGBAUtil.cpp" />
<ClCompile Include="Data\Encoding\Base64.cpp" />
<ClCompile Include="Data\Encoding\Compression.cpp" />
<ClCompile Include="Data\Encoding\Utf8.cpp" />
<ClCompile Include="Data\Hash\Hash.cpp" />
<ClCompile Include="Data\Text\I18n.cpp" />
<ClCompile Include="Data\Text\Parsers.cpp" />
<ClCompile Include="Data\Text\WrapText.cpp" />
<ClCompile Include="Input\GestureDetector.cpp" />
<ClCompile Include="Input\InputState.cpp" />
<ClCompile Include="Log.cpp" />

84
Common/Common.vcxproj.filters
View file

@ -137,6 +137,45 @@
<ClInclude Include="Input\KeyCodes.h">
<Filter>Input</Filter>
</ClInclude>
<ClInclude Include="Data\Random\Rng.h">
<Filter>Data\Random</Filter>
</ClInclude>
<ClInclude Include="Data\Text\I18n.h">
<Filter>Data\Text</Filter>
</ClInclude>
<ClInclude Include="Data\Text\Parsers.h">
<Filter>Data\Text</Filter>
</ClInclude>
<ClInclude Include="Data\Text\WrapText.h">
<Filter>Data\Text</Filter>
</ClInclude>
<ClInclude Include="Data\Encoding\Base64.h">
<Filter>Data\Encoding</Filter>
</ClInclude>
<ClInclude Include="Data\Encoding\Compression.h">
<Filter>Data\Encoding</Filter>
</ClInclude>
<ClInclude Include="Data\Encoding\Shiftjis.h">
<Filter>Data\Encoding</Filter>
</ClInclude>
<ClInclude Include="Data\Encoding\Utf8.h">
<Filter>Data\Encoding</Filter>
</ClInclude>
<ClInclude Include="Data\Encoding\Utf16.h">
<Filter>Data\Encoding</Filter>
</ClInclude>
<ClInclude Include="Data\Hash\Hash.h">
<Filter>Data\Hash</Filter>
</ClInclude>
<ClInclude Include="Data\Collections\ConstMap.h">
<Filter>Data\Collections</Filter>
</ClInclude>
<ClInclude Include="Data\Collections\TinySet.h">
<Filter>Data\Collections</Filter>
</ClInclude>
<ClInclude Include="Data\Color\RGBAUtil.h">
<Filter>Data\Color</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ABI.cpp" />
@ -270,6 +309,30 @@
<ClCompile Include="Input\InputState.cpp">
<Filter>Input</Filter>
</ClCompile>
<ClCompile Include="Data\Text\I18n.cpp">
<Filter>Data\Text</Filter>
</ClCompile>
<ClCompile Include="Data\Text\Parsers.cpp">
<Filter>Data\Text</Filter>
</ClCompile>
<ClCompile Include="Data\Text\WrapText.cpp">
<Filter>Data\Text</Filter>
</ClCompile>
<ClCompile Include="Data\Encoding\Base64.cpp">
<Filter>Data\Encoding</Filter>
</ClCompile>
<ClCompile Include="Data\Encoding\Compression.cpp">
<Filter>Data\Encoding</Filter>
</ClCompile>
<ClCompile Include="Data\Encoding\Utf8.cpp">
<Filter>Data\Encoding</Filter>
</ClCompile>
<ClCompile Include="Data\Hash\Hash.cpp">
<Filter>Data\Hash</Filter>
</ClCompile>
<ClCompile Include="Data\Color\RGBAUtil.cpp">
<Filter>Data\Color</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Crypto">
@ -299,6 +362,27 @@
<Filter Include="Input">
<UniqueIdentifier>{fd0bac4f-e3e2-4201-8902-2d19b50d5bf7}</UniqueIdentifier>
</Filter>
<Filter Include="Data">
<UniqueIdentifier>{072c36eb-a283-40b2-b8b1-02ec57d3bbae}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Collections">
<UniqueIdentifier>{a162915f-e53a-4f42-a222-e863235a2d37}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Hash">
<UniqueIdentifier>{891eae07-622d-46d5-9fc6-a4c320649eb9}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Encoding">
<UniqueIdentifier>{0bd9bfae-7d4e-4f54-9aae-8fb11ab8c999}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Random">
<UniqueIdentifier>{16fc7858-b6db-4eb2-bd4c-1354ffacda5f}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Text">
<UniqueIdentifier>{c2d25b54-23fc-4e80-8d9b-5d7e94fe557e}</UniqueIdentifier>
</Filter>
<Filter Include="Data\Color">
<UniqueIdentifier>{1ada1f0f-6f1c-4bf2-8450-1fc63d77da17}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="..\ext\libpng17\CMakeLists.txt">

2
Common/ConsoleListener.cpp
View file

@ -33,7 +33,7 @@
#include "ppsspp_config.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Common.h"
#include "Common/ConsoleListener.h"
#include "Common/StringUtils.h"

0
ext/native/util/const_map.h → Common/Data/Collections/ConstMap.h
View file

0
ext/native/util/tiny_set.h → Common/Data/Collections/TinySet.h
View file

2
ext/native/base/colorutil.cpp → Common/Data/Color/RGBAUtil.cpp
View file

@ -1,4 +1,4 @@
#include "base/colorutil.h"
#include "Common/Data/Color/RGBAUtil.h"
template <typename T>
static T clamp(T f, T low, T high) {

0
ext/native/base/colorutil.h → Common/Data/Color/RGBAUtil.h
View file

2
ext/native/data/base64.cpp → Common/Data/Encoding/Base64.cpp
View file

@ -1,4 +1,4 @@
#include "data/base64.h"
#include "Common/Data/Encoding/Base64.h"
// TODO: This is a simple but not very efficient implementation.
std::string Base64Encode(const uint8_t *p, size_t sz) {

0
ext/native/data/base64.h → Common/Data/Encoding/Base64.h
View file

0
ext/native/data/compression.cpp → Common/Data/Encoding/Compression.cpp
View file

0
ext/native/data/compression.h → Common/Data/Encoding/Compression.h
View file

0
ext/native/util/text/shiftjis.h → Common/Data/Encoding/Shiftjis.h
View file

0
ext/native/util/text/utf16.h → Common/Data/Encoding/Utf16.h
View file

4
ext/native/util/text/utf8.cpp → Common/Data/Encoding/Utf8.cpp
View file

@ -27,8 +27,8 @@
#include <algorithm>
#include <string>
#include "utf8.h"
#include "utf16.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Data/Encoding/Utf16.h"
// is start of UTF sequence
inline bool isutf(char c) {

0
ext/native/util/text/utf8.h → Common/Data/Encoding/Utf8.h
View file

2
ext/native/util/hash/hash.cpp → Common/Data/Hash/Hash.cpp
View file

@ -1,5 +1,5 @@
#include <cstdint>
#include "util/hash/hash.h"
#include "Common/Data/Hash/Hash.h"
namespace hash {

0
ext/native/util/hash/hash.h → Common/Data/Hash/Hash.h
View file

0
ext/native/util/random/rng.h → Common/Data/Random/Rng.h
View file

2
ext/native/i18n/i18n.cpp → Common/Data/Text/I18n.cpp
View file

@ -1,4 +1,4 @@
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "file/ini_file.h"
#include "file/vfs.h"

0
ext/native/i18n/i18n.h → Common/Data/Text/I18n.h
View file

2
ext/native/util/text/parsers.cpp → Common/Data/Text/Parsers.cpp
View file

@ -2,7 +2,7 @@
#include <cstdio>
#include <string>
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/StringUtils.h"

0
ext/native/util/text/parsers.h → Common/Data/Text/Parsers.h
View file

4
ext/native/util/text/wrap_text.cpp → Common/Data/Text/WrapText.cpp
View file

@ -1,7 +1,7 @@
#include <cstring>
#include "gfx_es2/draw_buffer.h"
#include "util/text/utf8.h"
#include "util/text/wrap_text.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Data/Text/WrapText.h"
bool WordWrapper::IsCJK(uint32_t c) {
if (c < 0x1000) {

0
ext/native/util/text/wrap_text.h → Common/Data/Text/WrapText.h
View file

2
Common/FileUtil.cpp
View file

@ -60,7 +60,7 @@
#endif // !defined(IOS)
#endif // __APPLE__
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include <sys/stat.h>

4
Common/KeyMap.cpp
View file

@ -24,11 +24,11 @@
#include "CommonWindows.h"
#endif
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "file/ini_file.h"
#include "Common/Input/InputState.h"
#include "ppsspp_config.h"
#include "Common/Log.h"
#include "Common/KeyMap.h"
#include "Common/StringUtils.h"

2
Common/Log.cpp
View file

@ -22,7 +22,7 @@
#include "Common.h"
#include "Common/Log.h"
#include "StringUtils.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#if PPSSPP_PLATFORM(ANDROID)
#include <android/log.h>

2
Common/LogManager.cpp
View file

@ -20,7 +20,7 @@
#include <algorithm>
#include <cstring>
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/LogManager.h"
#include "Common/ConsoleListener.h"

2
Common/SysError.cpp
View file

@ -18,7 +18,7 @@
#include <cstring>
#include <string>
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "SysError.h"
#ifdef _WIN32

4
Core/Config.cpp
View file

@ -26,11 +26,11 @@
#include "base/display.h"
#include "base/NativeApp.h"
#include "file/ini_file.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "json/json_reader.h"
#include "gfx_es2/gpu_features.h"
#include "net/http_client.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "net/url.h"
#include "Common/CPUDetect.h"

4
Core/CwCheat.cpp
View file

@ -1,7 +1,7 @@
#include <algorithm>
#include <cctype>
#include <cstdint>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/StringUtils.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
@ -19,7 +19,7 @@
#include "GPU/Common/PostShader.h"
#ifdef _WIN32
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#endif
static int CheatEvent = -1;

2
Core/Debugger/SymbolMap.cpp
View file

@ -31,7 +31,7 @@
#include <algorithm>
#include <memory>
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "zlib.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"

2
Core/Debugger/WebSocket/DisasmSubscriber.cpp
View file

@ -18,7 +18,7 @@
#include <algorithm>
#include <cctype>
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/StringUtils.h"
#include "Core/Debugger/Breakpoints.h"

2
Core/Debugger/WebSocket/GPUBufferSubscriber.cpp
View file

@ -20,7 +20,7 @@
#include <png.h>
#include <zlib.h>
#endif
#include "data/base64.h"
#include "Common/Data/Encoding/Base64.h"
#include "Common/StringUtils.h"
#include "Core/Debugger/WebSocket/GPUBufferSubscriber.h"
#include "Core/Debugger/WebSocket/WebSocketUtils.h"

2
Core/Debugger/WebSocket/GPURecordSubscriber.cpp
View file

@ -15,7 +15,7 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "data/base64.h"
#include "Common/Data/Encoding/Base64.h"
#include "Common/FileUtil.h"
#include "Core/Debugger/WebSocket/GPURecordSubscriber.h"
#include "Core/Debugger/WebSocket/WebSocketUtils.h"

2
Core/Debugger/WebSocket/WebSocketUtils.cpp
View file

@ -17,7 +17,7 @@
#include <cmath>
#include <limits>
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/StringUtils.h"
#include "Core/Debugger/WebSocket/WebSocketUtils.h"

2
Core/Dialog/PSPDialog.cpp
View file

@ -15,7 +15,7 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"

4
Core/Dialog/PSPMsgDialog.cpp
View file

@ -25,8 +25,8 @@
#include "Core/HLE/sceCtrl.h"
#include "Core/MemMapHelpers.h"
#include "Core/Reporting.h"
#include "i18n/i18n.h"
#include "util/text/utf8.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
static const float FONT_SCALE = 0.65f;

4
Core/Dialog/PSPNetconfDialog.cpp
View file

@ -19,7 +19,7 @@
#include "Common/CommonWindows.h"
#endif
#include <TimeUtil.h>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/Config.h"
@ -31,7 +31,7 @@
#include "Core/HLE/sceNet.h"
#include "Core/HLE/sceNetAdhoc.h"
#include "Core/Dialog/PSPNetconfDialog.h"
#include "ext/native/util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#define NETCONF_CONNECT_APNET 0

4
Core/Dialog/PSPOskDialog.cpp
View file

@ -17,9 +17,9 @@
#include <algorithm>
#include "base/NativeApp.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "math/math_util.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/Dialog/PSPOskDialog.h"

2
Core/Dialog/PSPSaveDialog.cpp
View file

@ -21,7 +21,7 @@
#include <thread>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/FileUtil.h"

2
Core/Dialog/SavedataParam.cpp
View file

@ -15,7 +15,7 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Log.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"

2
Core/FileLoaders/DiskCachingFileLoader.cpp
View file

@ -24,7 +24,7 @@
#include "ppsspp_config.h"
#include "file/file_util.h"
#include "file/free.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/FileUtil.h"
#include "Common/CommonWindows.h"
#include "Core/FileLoaders/DiskCachingFileLoader.h"

2
Core/FileLoaders/LocalFileLoader.cpp
View file

@ -18,7 +18,7 @@
#include <cstdio>
#include "ppsspp_config.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "file/file_util.h"
#include "Common/FileUtil.h"
#include "Core/FileLoaders/LocalFileLoader.h"

3
Core/FileSystems/BlockDevices.cpp
View file

@ -18,7 +18,8 @@
#include <cstdio>
#include <cstring>
#include <algorithm>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/FileUtil.h"
#include "Common/Swap.h"
#include "Core/Loaders.h"

4
Core/FileSystems/DirectoryFileSystem.cpp
View file

@ -22,8 +22,8 @@
#include "file/free.h"
#include "file/zip_read.h"
#include "i18n/i18n.h"
#include "util/text/utf8.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Common/StringUtils.h"

2
Core/FileSystems/VirtualDiscFileSystem.cpp
View file

@ -26,7 +26,7 @@
#include "Core/HLE/sceKernel.h"
#include "Core/Reporting.h"
#include "file/zip_read.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#ifdef _WIN32
#include "Common/CommonWindows.h"

4
Core/HLE/proAdhoc.cpp
View file

@ -37,9 +37,9 @@
#include <cstring>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Common/TimeUtil.h"

2
Core/HLE/proAdhocServer.cpp
View file

@ -49,7 +49,7 @@
#define MSG_NOSIGNAL 0x00
#endif
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/FileUtil.h"

6
Core/HLE/sceCcc.cpp
View file

@ -15,9 +15,9 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "util/text/utf8.h"
#include "util/text/utf16.h"
#include "util/text/shiftjis.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Data/Encoding/Utf16.h"
#include "Common/Data/Encoding/Shiftjis.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"

3
Core/HLE/sceDisplay.cpp
View file

@ -26,9 +26,10 @@
#include <sys/time.h>
#endif
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "profiler/profiler.h"
#include "base/NativeApp.h"
#include "gfx_es2/gpu_features.h"
#include "Common/Serialize/Serializer.h"

2
Core/HLE/sceNet.cpp
View file

@ -23,7 +23,7 @@
#endif
#include "net/resolve.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"

2
Core/HLE/sceNetAdhoc.cpp
View file

@ -56,7 +56,7 @@
#include "Core/HLE/sceNet.h"
#include "Core/HLE/proAdhocServer.h"
#include "Core/HLE/KernelWaitHelpers.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
// shared in sceNetAdhoc.h since it need to be used from sceNet.cpp also

1
Core/HLE/sceUsb.cpp
View file

@ -15,7 +15,6 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "base/NativeApp.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/HLE/HLE.h"

3
Core/HLE/sceUsbCam.cpp
View file

@ -18,8 +18,9 @@
#include <algorithm>
#include <mutex>
#include "base/NativeApp.h"
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/HLE/HLE.h"

1
Core/HLE/sceUsbMic.cpp
View file

@ -17,7 +17,6 @@
#include <mutex>
#include "base/NativeApp.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/HLE/HLE.h"

2
Core/MIPS/MIPS.h
View file

@ -21,7 +21,7 @@
#include <cstddef>
#include "util/random/rng.h"
#include "Common/Data/Random/Rng.h"
#include "Common/Common.h"
#include "Common/CommonTypes.h"
// #include "Core/CoreParameter.h"

2
Core/MIPS/MIPSAsm.cpp
View file

@ -6,7 +6,7 @@
#include "Common/CommonTypes.h"
#include "ext/armips/Core/Assembler.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Core/Debugger/SymbolMap.h"
#include "Core/MemMapHelpers.h"
#include "Core/MIPS/JitCommon/JitCommon.h"

2
Core/PSPLoaders.cpp
View file

@ -18,7 +18,7 @@
#include <thread>
#include "file/file_util.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/FileUtil.h"

4
Core/SaveState.cpp
View file

@ -20,9 +20,9 @@
#include <thread>
#include <mutex>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/FileUtil.h"
#include "Common/Serialize/Serializer.h"

2
Core/System.cpp
View file

@ -35,7 +35,7 @@
#include "base/NativeApp.h"
#include "math/math_util.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/FileUtil.h"
#include "Common/TimeUtil.h"

4
Core/TextureReplacer.cpp
View file

@ -23,10 +23,10 @@
#include <algorithm>
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "ext/xxhash.h"
#include "file/ini_file.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/ColorConv.h"
#include "Common/FileUtil.h"
#include "Common/StringUtils.h"

4
Core/Util/GameManager.cpp
View file

@ -29,7 +29,7 @@
#else
#include "ext/libzip/zip.h"
#endif
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "file/ini_file.h"
#include "Common/Log.h"
@ -42,7 +42,7 @@
#include "Core/System.h"
#include "Core/FileSystems/ISOFileSystem.h"
#include "Core/Util/GameManager.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
GameManager g_GameManager;

4
Core/Util/PPGeDraw.cpp
View file

@ -17,13 +17,13 @@
#include <algorithm>
#include "base/colorutil.h"
#include "Common/Data/Color/RGBAUtil.h"
#include "file/vfs.h"
#include "gfx/texture_atlas.h"
#include "gfx_es2/draw_text.h"
#include "image/zim_load.h"
#include "image/png_load.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"

2
Core/Util/PortManager.cpp
View file

@ -30,7 +30,7 @@
#include <string>
#include <thread>
#include "Common/TimeUtil.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "net/resolve.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Log.h"

2
GPU/Common/FramebufferManagerCommon.cpp
View file

@ -22,7 +22,7 @@
#include "ext/native/thin3d/thin3d.h"
#include "gfx_es2/gpu_features.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/ColorConv.h"
#include "Common/Common.h"
#include "Core/Config.h"

2
GPU/D3D11/GPU_D3D11.cpp
View file

@ -41,7 +41,7 @@
#include "Common/GraphicsContext.h"
#include "base/NativeApp.h"
#include "profiler/profiler.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Core/Debugger/Breakpoints.h"
#include "Core/MemMapHelpers.h"
#include "Core/MIPS/MIPS.h"

2
GPU/D3D11/ShaderManagerD3D11.cpp
View file

@ -26,7 +26,7 @@
#include "math/math_util.h"
#include "math/dataconv.h"
#include "thin3d/thin3d.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Log.h"
#include "Common/Common.h"
#include "Core/Config.h"

2
GPU/Directx9/GPU_DX9.cpp
View file

@ -21,7 +21,7 @@
#include "Common/GraphicsContext.h"
#include "base/NativeApp.h"
#include "profiler/profiler.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Core/Debugger/Breakpoints.h"
#include "Core/MemMapHelpers.h"
#include "Core/MIPS/MIPS.h"

4
GPU/Directx9/ShaderManagerDX9.cpp
View file

@ -23,12 +23,12 @@
#include <map>
#include "gfx/d3d9_shader.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "math/lin/matrix4x4.h"
#include "math/math_util.h"
#include "math/dataconv.h"
#include "thin3d/thin3d.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Common.h"
#include "Common/Log.h"

2
GPU/GLES/GPU_GLES.cpp
View file

@ -16,7 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "profiler/profiler.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Log.h"
#include "Common/Serialize/Serializer.h"

2
GPU/GLES/ShaderManagerGLES.cpp
View file

@ -26,7 +26,7 @@
#include "math/dataconv.h"
#include "gfx/gl_debug_log.h"
#include "gfx_es2/gpu_features.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "math/math_util.h"
#include "math/lin/matrix4x4.h"
#include "profiler/profiler.h"

2
GPU/GLES/TextureCacheGLES.cpp
View file

@ -20,7 +20,7 @@
#include "ext/xxhash.h"
#include "gfx/gl_debug_log.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "math/math_util.h"
#include "profiler/profiler.h"
#include "thin3d/GLRenderManager.h"

1
GPU/GPUCommon.h
View file

@ -365,7 +365,6 @@ private:
// Debug stats.
double timeSteppingStarted_;
double timeSpentStepping_;
int lastVsync_ = -1;
};

2
GPU/Vulkan/ShaderManagerVulkan.cpp
View file

@ -24,7 +24,7 @@
#include "math/dataconv.h"
#include "profiler/profiler.h"
#include "thin3d/thin3d.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/StringUtils.h"
#include "Common/Vulkan/VulkanContext.h"

2
GPU/Vulkan/TextureCacheVulkan.cpp
View file

@ -20,7 +20,7 @@
#include "ext/xxhash.h"
#include "file/vfs.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "math/math_util.h"
#include "profiler/profiler.h"
#include "thin3d/thin3d.h"

2
Qt/NKCodeFromQt.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "util/const_map.h"
#include "Common/Data/Collections/ConstMap.h"
#include <map>
// TODO: Add any missing keys

9
Qt/QtMain.cpp
View file

@ -30,12 +30,15 @@
#include "SDL/SDLJoystick.h"
#include "SDL_audio.h"
#endif
#include "QtMain.h"
#include "base/NativeApp.h"
#include "gfx_es2/gpu_features.h"
#include "i18n/i18n.h"
#include "math/math_util.h"
#include "QtMain.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Thread/ThreadUtil.h"
#include "util/text/utf8.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Core/HW/Camera.h"

1
Qt/QtMain.h
View file

@ -30,7 +30,6 @@ QTM_USE_NAMESPACE
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "thin3d/thin3d.h"
#include "base/NativeApp.h"
#include "net/resolve.h"
#include "NKCodeFromQt.h"

1
Qt/mainwindow.h
View file

@ -8,6 +8,7 @@
#include <QMainWindow>
#include <QActionGroup>
#include "base/NativeApp.h"
#include "ConsoleListener.h"
#include "Core/Core.h"
#include "Core/Config.h"

2
SDL/NKCodeFromSDL.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "util/const_map.h"
#include "Common/Data/Collections/ConstMap.h"
#include <map>
// TODO: Add any missing keys

12
SDL/SDLJoystick.cpp
View file

@ -1,11 +1,13 @@
#include "SDL/SDLJoystick.h"
#include "Core/Config.h"
#include "Common/FileUtil.h"
#include "file/vfs.h"
#include <iostream>
#include <string>
#include "base/NativeApp.h"
#include "file/vfs.h"
#include "Common/FileUtil.h"
#include "Core/Config.h"
#include "SDL/SDLJoystick.h"
using namespace std;
static int SDLJoystickEventHandlerWrapper(void* userdata, SDL_Event* event)

1
SDL/SDLJoystick.h
View file

@ -10,7 +10,6 @@
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "net/resolve.h"
#include "base/NativeApp.h"
class SDLJoystick{
public:

16
SDL/SDLMain.cpp
View file

@ -21,19 +21,13 @@ SDLJoystick *joystick = NULL;
#include <locale>
#include "base/display.h"
#include "Common/TimeUtil.h"
#include "base/NativeApp.h"
#include "ext/glslang/glslang/Public/ShaderLang.h"
#include "image/png_load.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "net/resolve.h"
#include "NKCodeFromSDL.h"
#include "util/const_map.h"
#include "util/text/utf8.h"
#include "math/math_util.h"
#include "thin3d/GLRenderManager.h"
#include "Common/Thread/ThreadUtil.h"
#include "math.h"
#include "SDL_syswm.h"
@ -46,11 +40,17 @@ SDLJoystick *joystick = NULL;
#include <X11/Xlib-xcb.h>
#endif
#include "Common/GraphicsContext.h"
#include "Common/TimeUtil.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "Common/Data/Collections/ConstMap.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Thread/ThreadUtil.h"
#include "Core/System.h"
#include "Core/Core.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Common/GraphicsContext.h"
#include "SDLGLGraphicsContext.h"
#include "SDLVulkanGraphicsContext.h"

2
SDL/SDLVulkanGraphicsContext.cpp
View file

@ -5,7 +5,7 @@
#include "thin3d/thin3d.h"
#include "thin3d/thin3d_create.h"
#include "thin3d/VulkanRenderManager.h"
#include "util/text/parsers.h"
#include "Common/Data/Text/Parsers.h"
#include "Core/System.h"
#include "SDLVulkanGraphicsContext.h"

9
UI/ChatScreen.cpp
View file

@ -1,12 +1,15 @@
#include <ctype.h>
#include "ppsspp_config.h"
#include "i18n/i18n.h"
#include "base/NativeApp.h"
#include "ui/root.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "ui/viewgroup.h"
#include "ui/ui.h"
#include "util/text/utf8.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Core/Config.h"
#include "Core/System.h"
#include "Core/HLE/proAdhoc.h"
@ -21,7 +24,7 @@ void ChatMenu::CreatePopupContents(UI::ViewGroup *parent) {
#if PPSSPP_PLATFORM(WINDOWS) || defined(USING_QT_UI) || defined(SDL)
chatEdit_ = bottom->Add(new TextEdit("", n->T("Chat Here"), new LinearLayoutParams(1.0)));
#if defined(USING_WIN_UI)
//freeze the ui when using ctrl + C hotkey need workaround
// freeze the ui when using ctrl + C hotkey need workaround
if (g_Config.bBypassOSKWithKeyboard && !g_Config.bFullScreen) {
System_InputBoxGetString(n->T("Chat"), n->T("Chat Here"), [](bool result, const std::string &value) {
if (result) {

4
UI/ComboKeyMappingScreen.cpp
View file

@ -15,8 +15,8 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "i18n/i18n.h"
#include "base/colorutil.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Color/RGBAUtil.h"
#include "base/display.h"
#include "file/path.h"
#include "gfx_es2/draw_buffer.h"

13
UI/ControlMappingScreen.cpp
View file

@ -19,23 +19,24 @@
#include <deque>
#include <mutex>
#include "base/colorutil.h"
#include "base/display.h"
#include "base/NativeApp.h"
#include "gfx/texture_atlas.h"
#include "i18n/i18n.h"
#include "Common/Input/KeyCodes.h"
#include "Common/Input/InputState.h"
#include "ui/root.h"
#include "ui/ui.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "ui/viewgroup.h"
#include "Common/Data/Color/RGBAUtil.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Input/KeyCodes.h"
#include "Common/Input/InputState.h"
#include "Common/Log.h"
#include "Common/KeyMap.h"
#include "Core/Host.h"
#include "Core/HLE/sceCtrl.h"
#include "Core/System.h"
#include "Common/Log.h"
#include "Common/KeyMap.h"
#include "Core/Config.h"
#include "UI/ControlMappingScreen.h"
#include "UI/GameSettingsScreen.h"

2
UI/ControlMappingScreen.h
View file

@ -22,10 +22,10 @@
#include <mutex>
#include <vector>
#include "i18n/i18n.h"
#include "ui/view.h"
#include "ui/ui_screen.h"
#include "Common/Data/Text/I18n.h"
#include "UI/MiscScreens.h"
class ControlMapper;

5
UI/CwCheatScreen.cpp
View file

@ -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 "base/NativeApp.h"
#include "ext/xxhash.h"
#include "i18n/i18n.h"
#include "ui/ui.h"
#include "util/text/utf8.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/FileUtil.h"
#include "Common/StringUtils.h"
#include "Core/Core.h"

3
UI/DevScreens.cpp
View file

@ -19,8 +19,9 @@
#include "ppsspp_config.h"
#include "base/display.h"
#include "base/NativeApp.h"
#include "gfx_es2/gpu_features.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "ui/viewgroup.h"

2
UI/DevScreens.h
View file

@ -24,7 +24,7 @@
#include <vector>
#include "file/file_util.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "ui/ui_screen.h"
#include "UI/MiscScreens.h"

2
UI/DiscordIntegration.cpp
View file

@ -5,7 +5,7 @@
#include "Common/Log.h"
#include "Core/Config.h"
#include "DiscordIntegration.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#if (PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(LINUX)) && !PPSSPP_PLATFORM(ANDROID) && !PPSSPP_PLATFORM(UWP)

7
UI/DisplayLayoutScreen.cpp
View file

@ -18,15 +18,16 @@
#include <algorithm>
#include <vector>
#include "base/colorutil.h"
#include "base/display.h"
#include "base/NativeApp.h"
#include "gfx/texture_atlas.h"
#include "gfx_es2/draw_buffer.h"
#include "i18n/i18n.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "DisplayLayoutScreen.h"
#include "Common/Data/Color/RGBAUtil.h"
#include "Common/Data/Text/I18n.h"
#include "UI/DisplayLayoutScreen.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Core/System.h"

5
UI/EmuScreen.cpp
View file

@ -20,21 +20,22 @@
#include <algorithm>
#include "base/display.h"
#include "base/NativeApp.h"
#include "profiler/profiler.h"
#include "gfx/texture_atlas.h"
#include "gfx_es2/gpu_features.h"
#include "gfx_es2/draw_text.h"
#include "Common/Input/InputState.h"
#include "math/curves.h"
#include "ui/root.h"
#include "ui/ui.h"
#include "ui/ui_context.h"
#include "ui/ui_tween.h"
#include "ui/view.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Input/InputState.h"
#include "Common/KeyMap.h"
#include "Common/Log.h"
#include "Common/TimeUtil.h"

2
UI/GPUDriverTestScreen.cpp
View file

@ -1,5 +1,5 @@
#include "GPUDriverTestScreen.h"
#include "i18n/i18n.h"
#include "Common/Data/Text/I18n.h"
#include "ui/view.h"
static const std::vector<Draw::ShaderSource> fsDiscard = {

7
UI/GameScreen.cpp
View file

@ -18,12 +18,15 @@
#include <algorithm>
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "gfx_es2/draw_buffer.h"
#include "i18n/i18n.h"
#include "util/text/utf8.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "ui/viewgroup.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/FileUtil.h"
#include "Core/Host.h"
#include "Core/Config.h"

Some files were not shown because too many files have changed in this diff Show more