From ff8148dd92ad7ea1923b5a6260cdf971cc83887c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 1 Oct 2020 13:05:04 +0200 Subject: [PATCH] Move native/util, native/data and native/i18 to Common/Data. 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! --- .gitignore | 3 + CMakeLists.txt | 42 +++---- Common/ArmCPUDetect.cpp | 2 +- Common/Common.vcxproj | 21 ++++ Common/Common.vcxproj.filters | 84 +++++++++++++ Common/ConsoleListener.cpp | 2 +- .../Data/Collections/ConstMap.h | 0 .../Data/Collections/TinySet.h | 0 .../Data/Color/RGBAUtil.cpp | 2 +- .../Data/Color/RGBAUtil.h | 0 .../Data/Encoding/Base64.cpp | 2 +- .../base64.h => Common/Data/Encoding/Base64.h | 0 .../Data/Encoding/Compression.cpp | 0 .../Data/Encoding/Compression.h | 0 .../Data/Encoding/Shiftjis.h | 0 .../utf16.h => Common/Data/Encoding/Utf16.h | 0 .../utf8.cpp => Common/Data/Encoding/Utf8.cpp | 4 +- .../utf8.h => Common/Data/Encoding/Utf8.h | 0 .../hash.cpp => Common/Data/Hash/Hash.cpp | 2 +- .../hash/hash.h => Common/Data/Hash/Hash.h | 0 .../random/rng.h => Common/Data/Random/Rng.h | 0 .../i18n.cpp => Common/Data/Text/I18n.cpp | 2 +- .../i18n/i18n.h => Common/Data/Text/I18n.h | 0 .../Data/Text/Parsers.cpp | 2 +- .../parsers.h => Common/Data/Text/Parsers.h | 0 .../Data/Text/WrapText.cpp | 4 +- .../Data/Text/WrapText.h | 0 Common/FileUtil.cpp | 2 +- Common/KeyMap.cpp | 4 +- Common/Log.cpp | 2 +- Common/LogManager.cpp | 2 +- Common/SysError.cpp | 2 +- Core/Config.cpp | 4 +- Core/CwCheat.cpp | 4 +- Core/Debugger/SymbolMap.cpp | 2 +- Core/Debugger/WebSocket/DisasmSubscriber.cpp | 2 +- .../WebSocket/GPUBufferSubscriber.cpp | 2 +- .../WebSocket/GPURecordSubscriber.cpp | 2 +- Core/Debugger/WebSocket/WebSocketUtils.cpp | 2 +- Core/Dialog/PSPDialog.cpp | 2 +- Core/Dialog/PSPMsgDialog.cpp | 4 +- Core/Dialog/PSPNetconfDialog.cpp | 4 +- Core/Dialog/PSPOskDialog.cpp | 4 +- Core/Dialog/PSPSaveDialog.cpp | 2 +- Core/Dialog/SavedataParam.cpp | 2 +- Core/FileLoaders/DiskCachingFileLoader.cpp | 2 +- Core/FileLoaders/LocalFileLoader.cpp | 2 +- Core/FileSystems/BlockDevices.cpp | 3 +- Core/FileSystems/DirectoryFileSystem.cpp | 4 +- Core/FileSystems/VirtualDiscFileSystem.cpp | 2 +- Core/HLE/proAdhoc.cpp | 4 +- Core/HLE/proAdhocServer.cpp | 2 +- Core/HLE/sceCcc.cpp | 6 +- Core/HLE/sceDisplay.cpp | 3 +- Core/HLE/sceNet.cpp | 2 +- Core/HLE/sceNetAdhoc.cpp | 2 +- Core/HLE/sceUsb.cpp | 1 - Core/HLE/sceUsbCam.cpp | 3 +- Core/HLE/sceUsbMic.cpp | 1 - Core/MIPS/MIPS.h | 2 +- Core/MIPS/MIPSAsm.cpp | 2 +- Core/PSPLoaders.cpp | 2 +- Core/SaveState.cpp | 4 +- Core/System.cpp | 2 +- Core/TextureReplacer.cpp | 4 +- Core/Util/GameManager.cpp | 4 +- Core/Util/PPGeDraw.cpp | 4 +- Core/Util/PortManager.cpp | 2 +- GPU/Common/FramebufferManagerCommon.cpp | 2 +- GPU/D3D11/GPU_D3D11.cpp | 2 +- GPU/D3D11/ShaderManagerD3D11.cpp | 2 +- GPU/Directx9/GPU_DX9.cpp | 2 +- GPU/Directx9/ShaderManagerDX9.cpp | 4 +- GPU/GLES/GPU_GLES.cpp | 2 +- GPU/GLES/ShaderManagerGLES.cpp | 2 +- GPU/GLES/TextureCacheGLES.cpp | 2 +- GPU/GPUCommon.h | 1 - GPU/Vulkan/ShaderManagerVulkan.cpp | 2 +- GPU/Vulkan/TextureCacheVulkan.cpp | 2 +- Qt/NKCodeFromQt.h | 2 +- Qt/QtMain.cpp | 9 +- Qt/QtMain.h | 1 - Qt/mainwindow.h | 1 + SDL/NKCodeFromSDL.h | 2 +- SDL/SDLJoystick.cpp | 12 +- SDL/SDLJoystick.h | 1 - SDL/SDLMain.cpp | 16 +-- SDL/SDLVulkanGraphicsContext.cpp | 2 +- UI/ChatScreen.cpp | 9 +- UI/ComboKeyMappingScreen.cpp | 4 +- UI/ControlMappingScreen.cpp | 13 +- UI/ControlMappingScreen.h | 2 +- UI/CwCheatScreen.cpp | 5 +- UI/DevScreens.cpp | 3 +- UI/DevScreens.h | 2 +- UI/DiscordIntegration.cpp | 2 +- UI/DisplayLayoutScreen.cpp | 7 +- UI/EmuScreen.cpp | 5 +- UI/GPUDriverTestScreen.cpp | 2 +- UI/GameScreen.cpp | 7 +- UI/GameSettingsScreen.cpp | 7 +- UI/GamepadEmu.cpp | 2 +- UI/InstallZipScreen.cpp | 2 +- UI/MainScreen.cpp | 7 +- UI/MiscScreens.cpp | 7 +- UI/NativeApp.cpp | 4 +- UI/OnScreenDisplay.cpp | 2 +- UI/PauseScreen.cpp | 3 +- UI/RemoteISOScreen.cpp | 3 +- UI/ReportScreen.cpp | 9 +- UI/SavedataScreen.cpp | 6 +- UI/Store.cpp | 2 +- UI/TextureUtil.cpp | 2 +- UI/TiltAnalogSettingsScreen.cpp | 2 +- UI/TouchControlLayoutScreen.cpp | 4 +- UI/TouchControlVisibilityScreen.cpp | 2 +- UWP/CommonUWP/CommonUWP.vcxproj | 21 ++++ UWP/CommonUWP/CommonUWP.vcxproj.filters | 84 +++++++++++++ UWP/NativeUWP/NativeUWP.vcxproj | 20 ---- UWP/NativeUWP/NativeUWP.vcxproj.filters | 69 ----------- UWP/PPSSPP_UWPMain.cpp | 2 +- UWP/UWPUtil.h | 2 +- Windows/Debugger/BreakpointWindow.cpp | 2 +- Windows/Debugger/CtrlDisAsmView.cpp | 2 +- Windows/Debugger/CtrlRegisterList.cpp | 2 +- Windows/Debugger/DebuggerShared.cpp | 2 +- Windows/Debugger/Debugger_Disasm.cpp | 2 +- Windows/Debugger/Debugger_Lists.cpp | 2 +- Windows/Debugger/Debugger_MemoryDlg.cpp | 2 +- Windows/Debugger/Debugger_VFPUDlg.cpp | 2 +- Windows/Debugger/DumpMemoryWindow.cpp | 2 +- Windows/EmuThread.cpp | 4 +- Windows/GEDebugger/GEDebugger.cpp | 2 +- Windows/GPU/D3D11Context.cpp | 4 +- Windows/GPU/D3D9Context.cpp | 4 +- Windows/GPU/WindowsGLContext.cpp | 4 +- Windows/GPU/WindowsVulkanContext.cpp | 2 +- Windows/InputBox.cpp | 2 +- Windows/MainWindow.cpp | 4 +- Windows/MainWindowMenu.cpp | 4 +- Windows/W32Util/Misc.cpp | 2 +- Windows/W32Util/PropertySheet.cpp | 2 +- Windows/W32Util/ShellUtil.cpp | 2 +- Windows/WindowsHost.cpp | 2 +- Windows/main.cpp | 4 +- android/jni/Android.mk | 111 ++++++++++++++---- android/jni/AndroidVulkanContext.cpp | 2 +- android/jni/Locals.mk | 2 +- android/jni/app-android.cpp | 2 +- ext/native/Android.mk | 99 ---------------- ext/native/base/CMakeLists.txt | 12 -- ext/native/base/linked_ptr.h | 60 ---------- ext/native/file/CMakeLists.txt | 14 --- ext/native/file/file_util.cpp | 2 +- ext/native/file/free.cpp | 2 +- ext/native/file/ini_file.cpp | 4 +- ext/native/gfx/CMakeLists.txt | 12 -- ext/native/gfx_es2/CMakeLists.txt | 16 --- ext/native/gfx_es2/draw_buffer.cpp | 4 +- ext/native/gfx_es2/draw_buffer.h | 2 +- ext/native/gfx_es2/draw_text.cpp | 6 +- ext/native/gfx_es2/draw_text.h | 2 +- ext/native/gfx_es2/draw_text_android.cpp | 6 +- ext/native/gfx_es2/draw_text_qt.cpp | 6 +- ext/native/gfx_es2/draw_text_uwp.cpp | 6 +- ext/native/gfx_es2/draw_text_win.cpp | 6 +- ext/native/gfx_es2/gpu_features.h | 1 - ext/native/image/CMakeLists.txt | 14 --- ext/native/json/CMakeLists.txt | 15 --- ext/native/json/json_writer_test.cpp | 25 ---- ext/native/math/CMakeLists.txt | 14 --- ext/native/native.vcxproj | 23 ---- ext/native/native.vcxproj.filters | 76 ------------ ext/native/net/CMakeLists.txt | 11 -- ext/native/net/http_client.cpp | 4 +- ext/native/net/websocket_server.cpp | 2 +- ext/native/profiler/CMakeLists.txt | 11 -- ext/native/thin3d/GLQueueRunner.h | 2 +- ext/native/thin3d/VulkanQueueRunner.h | 2 +- ext/native/thin3d/thin3d_d3d11.cpp | 2 +- ext/native/tools/atlastool.cpp | 2 +- ext/native/ui/CMakeLists.txt | 17 --- ext/native/ui/screen.h | 5 +- ext/native/ui/ui.cpp | 2 +- ext/native/ui/ui_screen.cpp | 2 +- ext/native/ui/ui_tween.cpp | 2 +- ext/native/ui/view.cpp | 2 +- ext/native/util/CMakeLists.txt | 14 --- libretro/LibretroVulkanContext.cpp | 2 +- libretro/Makefile.common | 17 +-- unittest/UnitTest.cpp | 2 +- 191 files changed, 583 insertions(+), 797 deletions(-) rename ext/native/util/const_map.h => Common/Data/Collections/ConstMap.h (100%) rename ext/native/util/tiny_set.h => Common/Data/Collections/TinySet.h (100%) rename ext/native/base/colorutil.cpp => Common/Data/Color/RGBAUtil.cpp (97%) rename ext/native/base/colorutil.h => Common/Data/Color/RGBAUtil.h (100%) rename ext/native/data/base64.cpp => Common/Data/Encoding/Base64.cpp (95%) rename ext/native/data/base64.h => Common/Data/Encoding/Base64.h (100%) rename ext/native/data/compression.cpp => Common/Data/Encoding/Compression.cpp (100%) rename ext/native/data/compression.h => Common/Data/Encoding/Compression.h (100%) rename ext/native/util/text/shiftjis.h => Common/Data/Encoding/Shiftjis.h (100%) rename ext/native/util/text/utf16.h => Common/Data/Encoding/Utf16.h (100%) rename ext/native/util/text/utf8.cpp => Common/Data/Encoding/Utf8.cpp (99%) rename ext/native/util/text/utf8.h => Common/Data/Encoding/Utf8.h (100%) rename ext/native/util/hash/hash.cpp => Common/Data/Hash/Hash.cpp (95%) rename ext/native/util/hash/hash.h => Common/Data/Hash/Hash.h (100%) rename ext/native/util/random/rng.h => Common/Data/Random/Rng.h (100%) rename ext/native/i18n/i18n.cpp => Common/Data/Text/I18n.cpp (99%) rename ext/native/i18n/i18n.h => Common/Data/Text/I18n.h (100%) rename ext/native/util/text/parsers.cpp => Common/Data/Text/Parsers.cpp (98%) rename ext/native/util/text/parsers.h => Common/Data/Text/Parsers.h (100%) rename ext/native/util/text/wrap_text.cpp => Common/Data/Text/WrapText.cpp (98%) rename ext/native/util/text/wrap_text.h => Common/Data/Text/WrapText.h (100%) delete mode 100644 ext/native/Android.mk delete mode 100644 ext/native/base/CMakeLists.txt delete mode 100644 ext/native/base/linked_ptr.h delete mode 100644 ext/native/file/CMakeLists.txt delete mode 100644 ext/native/gfx/CMakeLists.txt delete mode 100644 ext/native/gfx_es2/CMakeLists.txt delete mode 100644 ext/native/image/CMakeLists.txt delete mode 100644 ext/native/json/CMakeLists.txt delete mode 100644 ext/native/json/json_writer_test.cpp delete mode 100644 ext/native/math/CMakeLists.txt delete mode 100644 ext/native/net/CMakeLists.txt delete mode 100644 ext/native/profiler/CMakeLists.txt delete mode 100644 ext/native/ui/CMakeLists.txt delete mode 100644 ext/native/util/CMakeLists.txt diff --git a/.gitignore b/.gitignore index 07b897f328..818e0a459a 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,6 @@ debian/ppsspp/ # RenderDoc *.rdc + +# bad output from libretro. don't want to accidentally add it +nul diff --git a/CMakeLists.txt b/CMakeLists.txt index 29d2a45cc6..acbbbe43ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/Common/ArmCPUDetect.cpp b/Common/ArmCPUDetect.cpp index 90aeaf8433..5a1d53fc4a 100644 --- a/Common/ArmCPUDetect.cpp +++ b/Common/ArmCPUDetect.cpp @@ -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) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 8f64506e1f..5a4aef7e51 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -359,6 +359,19 @@ + + + + + + + + + + + + + @@ -614,6 +627,14 @@ false false + + + + + + + + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index b32b1da778..6408cd9512 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -137,6 +137,45 @@ Input + + Data\Random + + + Data\Text + + + Data\Text + + + Data\Text + + + Data\Encoding + + + Data\Encoding + + + Data\Encoding + + + Data\Encoding + + + Data\Encoding + + + Data\Hash + + + Data\Collections + + + Data\Collections + + + Data\Color + @@ -270,6 +309,30 @@ Input + + Data\Text + + + Data\Text + + + Data\Text + + + Data\Encoding + + + Data\Encoding + + + Data\Encoding + + + Data\Hash + + + Data\Color + @@ -299,6 +362,27 @@ {fd0bac4f-e3e2-4201-8902-2d19b50d5bf7} + + {072c36eb-a283-40b2-b8b1-02ec57d3bbae} + + + {a162915f-e53a-4f42-a222-e863235a2d37} + + + {891eae07-622d-46d5-9fc6-a4c320649eb9} + + + {0bd9bfae-7d4e-4f54-9aae-8fb11ab8c999} + + + {16fc7858-b6db-4eb2-bd4c-1354ffacda5f} + + + {c2d25b54-23fc-4e80-8d9b-5d7e94fe557e} + + + {1ada1f0f-6f1c-4bf2-8450-1fc63d77da17} + diff --git a/Common/ConsoleListener.cpp b/Common/ConsoleListener.cpp index ce3cc1f1b7..e5625c4f0f 100644 --- a/Common/ConsoleListener.cpp +++ b/Common/ConsoleListener.cpp @@ -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" diff --git a/ext/native/util/const_map.h b/Common/Data/Collections/ConstMap.h similarity index 100% rename from ext/native/util/const_map.h rename to Common/Data/Collections/ConstMap.h diff --git a/ext/native/util/tiny_set.h b/Common/Data/Collections/TinySet.h similarity index 100% rename from ext/native/util/tiny_set.h rename to Common/Data/Collections/TinySet.h diff --git a/ext/native/base/colorutil.cpp b/Common/Data/Color/RGBAUtil.cpp similarity index 97% rename from ext/native/base/colorutil.cpp rename to Common/Data/Color/RGBAUtil.cpp index 6074dd9be0..8b93a0fc96 100644 --- a/ext/native/base/colorutil.cpp +++ b/Common/Data/Color/RGBAUtil.cpp @@ -1,4 +1,4 @@ -#include "base/colorutil.h" +#include "Common/Data/Color/RGBAUtil.h" template static T clamp(T f, T low, T high) { diff --git a/ext/native/base/colorutil.h b/Common/Data/Color/RGBAUtil.h similarity index 100% rename from ext/native/base/colorutil.h rename to Common/Data/Color/RGBAUtil.h diff --git a/ext/native/data/base64.cpp b/Common/Data/Encoding/Base64.cpp similarity index 95% rename from ext/native/data/base64.cpp rename to Common/Data/Encoding/Base64.cpp index 8df7abaa1e..50dbc465a5 100644 --- a/ext/native/data/base64.cpp +++ b/Common/Data/Encoding/Base64.cpp @@ -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) { diff --git a/ext/native/data/base64.h b/Common/Data/Encoding/Base64.h similarity index 100% rename from ext/native/data/base64.h rename to Common/Data/Encoding/Base64.h diff --git a/ext/native/data/compression.cpp b/Common/Data/Encoding/Compression.cpp similarity index 100% rename from ext/native/data/compression.cpp rename to Common/Data/Encoding/Compression.cpp diff --git a/ext/native/data/compression.h b/Common/Data/Encoding/Compression.h similarity index 100% rename from ext/native/data/compression.h rename to Common/Data/Encoding/Compression.h diff --git a/ext/native/util/text/shiftjis.h b/Common/Data/Encoding/Shiftjis.h similarity index 100% rename from ext/native/util/text/shiftjis.h rename to Common/Data/Encoding/Shiftjis.h diff --git a/ext/native/util/text/utf16.h b/Common/Data/Encoding/Utf16.h similarity index 100% rename from ext/native/util/text/utf16.h rename to Common/Data/Encoding/Utf16.h diff --git a/ext/native/util/text/utf8.cpp b/Common/Data/Encoding/Utf8.cpp similarity index 99% rename from ext/native/util/text/utf8.cpp rename to Common/Data/Encoding/Utf8.cpp index a847feef96..8e3bb0f05d 100644 --- a/ext/native/util/text/utf8.cpp +++ b/Common/Data/Encoding/Utf8.cpp @@ -27,8 +27,8 @@ #include #include -#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) { diff --git a/ext/native/util/text/utf8.h b/Common/Data/Encoding/Utf8.h similarity index 100% rename from ext/native/util/text/utf8.h rename to Common/Data/Encoding/Utf8.h diff --git a/ext/native/util/hash/hash.cpp b/Common/Data/Hash/Hash.cpp similarity index 95% rename from ext/native/util/hash/hash.cpp rename to Common/Data/Hash/Hash.cpp index 5af7728d0d..d19e1a1e00 100644 --- a/ext/native/util/hash/hash.cpp +++ b/Common/Data/Hash/Hash.cpp @@ -1,5 +1,5 @@ #include -#include "util/hash/hash.h" +#include "Common/Data/Hash/Hash.h" namespace hash { diff --git a/ext/native/util/hash/hash.h b/Common/Data/Hash/Hash.h similarity index 100% rename from ext/native/util/hash/hash.h rename to Common/Data/Hash/Hash.h diff --git a/ext/native/util/random/rng.h b/Common/Data/Random/Rng.h similarity index 100% rename from ext/native/util/random/rng.h rename to Common/Data/Random/Rng.h diff --git a/ext/native/i18n/i18n.cpp b/Common/Data/Text/I18n.cpp similarity index 99% rename from ext/native/i18n/i18n.cpp rename to Common/Data/Text/I18n.cpp index 72ec1f949f..e0bd685049 100644 --- a/ext/native/i18n/i18n.cpp +++ b/Common/Data/Text/I18n.cpp @@ -1,4 +1,4 @@ -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "file/ini_file.h" #include "file/vfs.h" diff --git a/ext/native/i18n/i18n.h b/Common/Data/Text/I18n.h similarity index 100% rename from ext/native/i18n/i18n.h rename to Common/Data/Text/I18n.h diff --git a/ext/native/util/text/parsers.cpp b/Common/Data/Text/Parsers.cpp similarity index 98% rename from ext/native/util/text/parsers.cpp rename to Common/Data/Text/Parsers.cpp index f36f3ff33d..ab7c057339 100644 --- a/ext/native/util/text/parsers.cpp +++ b/Common/Data/Text/Parsers.cpp @@ -2,7 +2,7 @@ #include #include -#include "util/text/parsers.h" +#include "Common/Data/Text/Parsers.h" #include "Common/StringUtils.h" diff --git a/ext/native/util/text/parsers.h b/Common/Data/Text/Parsers.h similarity index 100% rename from ext/native/util/text/parsers.h rename to Common/Data/Text/Parsers.h diff --git a/ext/native/util/text/wrap_text.cpp b/Common/Data/Text/WrapText.cpp similarity index 98% rename from ext/native/util/text/wrap_text.cpp rename to Common/Data/Text/WrapText.cpp index 68ca6d7b5a..c46688c50e 100644 --- a/ext/native/util/text/wrap_text.cpp +++ b/Common/Data/Text/WrapText.cpp @@ -1,7 +1,7 @@ #include #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) { diff --git a/ext/native/util/text/wrap_text.h b/Common/Data/Text/WrapText.h similarity index 100% rename from ext/native/util/text/wrap_text.h rename to Common/Data/Text/WrapText.h diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp index d99be4d46a..f7d78334b6 100644 --- a/Common/FileUtil.cpp +++ b/Common/FileUtil.cpp @@ -60,7 +60,7 @@ #endif // !defined(IOS) #endif // __APPLE__ -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp index 2a3fb0bb81..408e8a3124 100644 --- a/Common/KeyMap.cpp +++ b/Common/KeyMap.cpp @@ -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" diff --git a/Common/Log.cpp b/Common/Log.cpp index dd0802ad86..1d3b1ba56c 100644 --- a/Common/Log.cpp +++ b/Common/Log.cpp @@ -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 diff --git a/Common/LogManager.cpp b/Common/LogManager.cpp index aa090315ac..66c85c70b8 100644 --- a/Common/LogManager.cpp +++ b/Common/LogManager.cpp @@ -20,7 +20,7 @@ #include #include -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Common/LogManager.h" #include "Common/ConsoleListener.h" diff --git a/Common/SysError.cpp b/Common/SysError.cpp index 841655bfbe..2bf17740aa 100644 --- a/Common/SysError.cpp +++ b/Common/SysError.cpp @@ -18,7 +18,7 @@ #include #include -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "SysError.h" #ifdef _WIN32 diff --git a/Core/Config.cpp b/Core/Config.cpp index c5e36508f9..8f56969908 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -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" diff --git a/Core/CwCheat.cpp b/Core/CwCheat.cpp index 38b70abd77..5feb26a353 100644 --- a/Core/CwCheat.cpp +++ b/Core/CwCheat.cpp @@ -1,7 +1,7 @@ #include #include #include -#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; diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp index 5786898624..bc5dc32e2a 100644 --- a/Core/Debugger/SymbolMap.cpp +++ b/Core/Debugger/SymbolMap.cpp @@ -31,7 +31,7 @@ #include #include -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "zlib.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" diff --git a/Core/Debugger/WebSocket/DisasmSubscriber.cpp b/Core/Debugger/WebSocket/DisasmSubscriber.cpp index e84596b849..172abf5f57 100644 --- a/Core/Debugger/WebSocket/DisasmSubscriber.cpp +++ b/Core/Debugger/WebSocket/DisasmSubscriber.cpp @@ -18,7 +18,7 @@ #include #include -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Common/StringUtils.h" #include "Core/Debugger/Breakpoints.h" diff --git a/Core/Debugger/WebSocket/GPUBufferSubscriber.cpp b/Core/Debugger/WebSocket/GPUBufferSubscriber.cpp index 7e6d03966e..155d70c70e 100644 --- a/Core/Debugger/WebSocket/GPUBufferSubscriber.cpp +++ b/Core/Debugger/WebSocket/GPUBufferSubscriber.cpp @@ -20,7 +20,7 @@ #include #include #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" diff --git a/Core/Debugger/WebSocket/GPURecordSubscriber.cpp b/Core/Debugger/WebSocket/GPURecordSubscriber.cpp index 961a4d0d04..7e62ef4700 100644 --- a/Core/Debugger/WebSocket/GPURecordSubscriber.cpp +++ b/Core/Debugger/WebSocket/GPURecordSubscriber.cpp @@ -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" diff --git a/Core/Debugger/WebSocket/WebSocketUtils.cpp b/Core/Debugger/WebSocket/WebSocketUtils.cpp index 013121ff80..1f34621ee1 100644 --- a/Core/Debugger/WebSocket/WebSocketUtils.cpp +++ b/Core/Debugger/WebSocket/WebSocketUtils.cpp @@ -17,7 +17,7 @@ #include #include -#include "util/text/parsers.h" +#include "Common/Data/Text/Parsers.h" #include "Common/StringUtils.h" #include "Core/Debugger/WebSocket/WebSocketUtils.h" diff --git a/Core/Dialog/PSPDialog.cpp b/Core/Dialog/PSPDialog.cpp index fd01a96d4f..2a65cb03a7 100644 --- a/Core/Dialog/PSPDialog.cpp +++ b/Core/Dialog/PSPDialog.cpp @@ -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" diff --git a/Core/Dialog/PSPMsgDialog.cpp b/Core/Dialog/PSPMsgDialog.cpp index 292c213558..d68abaa9b5 100755 --- a/Core/Dialog/PSPMsgDialog.cpp +++ b/Core/Dialog/PSPMsgDialog.cpp @@ -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; diff --git a/Core/Dialog/PSPNetconfDialog.cpp b/Core/Dialog/PSPNetconfDialog.cpp index 976360fb2d..3dfb8d45c7 100644 --- a/Core/Dialog/PSPNetconfDialog.cpp +++ b/Core/Dialog/PSPNetconfDialog.cpp @@ -19,7 +19,7 @@ #include "Common/CommonWindows.h" #endif #include -#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 diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index 60bcb6d6f5..cf52cd9fe0 100755 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -17,9 +17,9 @@ #include #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" diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index 637ddfdff4..3a3166b7c8 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -21,7 +21,7 @@ #include -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "Common/Thread/ThreadUtil.h" #include "Common/FileUtil.h" diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index 46940fb9db..82b79e9c4c 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -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" diff --git a/Core/FileLoaders/DiskCachingFileLoader.cpp b/Core/FileLoaders/DiskCachingFileLoader.cpp index 4b8888c802..fc2991b399 100644 --- a/Core/FileLoaders/DiskCachingFileLoader.cpp +++ b/Core/FileLoaders/DiskCachingFileLoader.cpp @@ -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" diff --git a/Core/FileLoaders/LocalFileLoader.cpp b/Core/FileLoaders/LocalFileLoader.cpp index 8e757b3315..fc91550059 100644 --- a/Core/FileLoaders/LocalFileLoader.cpp +++ b/Core/FileLoaders/LocalFileLoader.cpp @@ -18,7 +18,7 @@ #include #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" diff --git a/Core/FileSystems/BlockDevices.cpp b/Core/FileSystems/BlockDevices.cpp index b8f2b4432b..a890926cac 100644 --- a/Core/FileSystems/BlockDevices.cpp +++ b/Core/FileSystems/BlockDevices.cpp @@ -18,7 +18,8 @@ #include #include #include -#include "i18n/i18n.h" + +#include "Common/Data/Text/I18n.h" #include "Common/FileUtil.h" #include "Common/Swap.h" #include "Core/Loaders.h" diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp index ccb4365323..b4c3ca2260 100644 --- a/Core/FileSystems/DirectoryFileSystem.cpp +++ b/Core/FileSystems/DirectoryFileSystem.cpp @@ -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" diff --git a/Core/FileSystems/VirtualDiscFileSystem.cpp b/Core/FileSystems/VirtualDiscFileSystem.cpp index df3375fffb..c713d9965c 100644 --- a/Core/FileSystems/VirtualDiscFileSystem.cpp +++ b/Core/FileSystems/VirtualDiscFileSystem.cpp @@ -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" diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index 4c39013bf5..425bb63413 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -37,9 +37,9 @@ #include -#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" diff --git a/Core/HLE/proAdhocServer.cpp b/Core/HLE/proAdhocServer.cpp index a345ab0b50..52b84febb1 100644 --- a/Core/HLE/proAdhocServer.cpp +++ b/Core/HLE/proAdhocServer.cpp @@ -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" diff --git a/Core/HLE/sceCcc.cpp b/Core/HLE/sceCcc.cpp index 2dba0143cd..51da548291 100644 --- a/Core/HLE/sceCcc.cpp +++ b/Core/HLE/sceCcc.cpp @@ -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" diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index f2f55aebf2..390d8f2621 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -26,9 +26,10 @@ #include #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" diff --git a/Core/HLE/sceNet.cpp b/Core/HLE/sceNet.cpp index 6750c94750..629a9766c8 100644 --- a/Core/HLE/sceNet.cpp +++ b/Core/HLE/sceNet.cpp @@ -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" diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 614b9f1d1b..770302556f 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -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 diff --git a/Core/HLE/sceUsb.cpp b/Core/HLE/sceUsb.cpp index 60622c9cf0..520b057826 100644 --- a/Core/HLE/sceUsb.cpp +++ b/Core/HLE/sceUsb.cpp @@ -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" diff --git a/Core/HLE/sceUsbCam.cpp b/Core/HLE/sceUsbCam.cpp index 7f0a20a68e..7de78168ee 100644 --- a/Core/HLE/sceUsbCam.cpp +++ b/Core/HLE/sceUsbCam.cpp @@ -18,8 +18,9 @@ #include #include -#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" diff --git a/Core/HLE/sceUsbMic.cpp b/Core/HLE/sceUsbMic.cpp index 30035f1584..91855a0804 100644 --- a/Core/HLE/sceUsbMic.cpp +++ b/Core/HLE/sceUsbMic.cpp @@ -17,7 +17,6 @@ #include -#include "base/NativeApp.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Core/HLE/HLE.h" diff --git a/Core/MIPS/MIPS.h b/Core/MIPS/MIPS.h index bcc9910358..31df9d8baf 100644 --- a/Core/MIPS/MIPS.h +++ b/Core/MIPS/MIPS.h @@ -21,7 +21,7 @@ #include -#include "util/random/rng.h" +#include "Common/Data/Random/Rng.h" #include "Common/Common.h" #include "Common/CommonTypes.h" // #include "Core/CoreParameter.h" diff --git a/Core/MIPS/MIPSAsm.cpp b/Core/MIPS/MIPSAsm.cpp index a6ed1261ac..0e59e62da1 100644 --- a/Core/MIPS/MIPSAsm.cpp +++ b/Core/MIPS/MIPSAsm.cpp @@ -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" diff --git a/Core/PSPLoaders.cpp b/Core/PSPLoaders.cpp index 26ad3572ec..09eabf4dc3 100644 --- a/Core/PSPLoaders.cpp +++ b/Core/PSPLoaders.cpp @@ -18,7 +18,7 @@ #include #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" diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp index a2ed973231..e354cdc3f7 100644 --- a/Core/SaveState.cpp +++ b/Core/SaveState.cpp @@ -20,9 +20,9 @@ #include #include -#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" diff --git a/Core/System.cpp b/Core/System.cpp index ceaf38c076..e812043278 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -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" diff --git a/Core/TextureReplacer.cpp b/Core/TextureReplacer.cpp index 32e49b0a6c..56a3f743f9 100644 --- a/Core/TextureReplacer.cpp +++ b/Core/TextureReplacer.cpp @@ -23,10 +23,10 @@ #include -#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" diff --git a/Core/Util/GameManager.cpp b/Core/Util/GameManager.cpp index 19f8c67009..3c943bda9a 100644 --- a/Core/Util/GameManager.cpp +++ b/Core/Util/GameManager.cpp @@ -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; diff --git a/Core/Util/PPGeDraw.cpp b/Core/Util/PPGeDraw.cpp index c724c0b37e..17881b5204 100644 --- a/Core/Util/PPGeDraw.cpp +++ b/Core/Util/PPGeDraw.cpp @@ -17,13 +17,13 @@ #include -#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" diff --git a/Core/Util/PortManager.cpp b/Core/Util/PortManager.cpp index 0e2fb75c28..63bfd5baa7 100644 --- a/Core/Util/PortManager.cpp +++ b/Core/Util/PortManager.cpp @@ -30,7 +30,7 @@ #include #include #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" diff --git a/GPU/Common/FramebufferManagerCommon.cpp b/GPU/Common/FramebufferManagerCommon.cpp index 7ff1c477f7..4accc058c5 100644 --- a/GPU/Common/FramebufferManagerCommon.cpp +++ b/GPU/Common/FramebufferManagerCommon.cpp @@ -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" diff --git a/GPU/D3D11/GPU_D3D11.cpp b/GPU/D3D11/GPU_D3D11.cpp index 48eae62704..27db9fd389 100644 --- a/GPU/D3D11/GPU_D3D11.cpp +++ b/GPU/D3D11/GPU_D3D11.cpp @@ -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" diff --git a/GPU/D3D11/ShaderManagerD3D11.cpp b/GPU/D3D11/ShaderManagerD3D11.cpp index 7ca95da1fb..81b093f11d 100644 --- a/GPU/D3D11/ShaderManagerD3D11.cpp +++ b/GPU/D3D11/ShaderManagerD3D11.cpp @@ -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" diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index ad858ea665..07aae4fadf 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -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" diff --git a/GPU/Directx9/ShaderManagerDX9.cpp b/GPU/Directx9/ShaderManagerDX9.cpp index a7129030a3..2a359f0ef5 100644 --- a/GPU/Directx9/ShaderManagerDX9.cpp +++ b/GPU/Directx9/ShaderManagerDX9.cpp @@ -23,12 +23,12 @@ #include #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" diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 062705f8a3..0623af9e33 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -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" diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index 6c1bffa637..76eb5a0393 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -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" diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp index e3bb89094e..cfa92a0296 100644 --- a/GPU/GLES/TextureCacheGLES.cpp +++ b/GPU/GLES/TextureCacheGLES.cpp @@ -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" diff --git a/GPU/GPUCommon.h b/GPU/GPUCommon.h index ede1b44720..f5ff5b87c4 100644 --- a/GPU/GPUCommon.h +++ b/GPU/GPUCommon.h @@ -365,7 +365,6 @@ private: // Debug stats. double timeSteppingStarted_; double timeSpentStepping_; - int lastVsync_ = -1; }; diff --git a/GPU/Vulkan/ShaderManagerVulkan.cpp b/GPU/Vulkan/ShaderManagerVulkan.cpp index a1ec302265..6e62cd1338 100644 --- a/GPU/Vulkan/ShaderManagerVulkan.cpp +++ b/GPU/Vulkan/ShaderManagerVulkan.cpp @@ -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" diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp index d84827b698..e160116cd1 100644 --- a/GPU/Vulkan/TextureCacheVulkan.cpp +++ b/GPU/Vulkan/TextureCacheVulkan.cpp @@ -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" diff --git a/Qt/NKCodeFromQt.h b/Qt/NKCodeFromQt.h index 2a87141720..b53b09ffff 100644 --- a/Qt/NKCodeFromQt.h +++ b/Qt/NKCodeFromQt.h @@ -1,6 +1,6 @@ #pragma once -#include "util/const_map.h" +#include "Common/Data/Collections/ConstMap.h" #include // TODO: Add any missing keys diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp index 0010db1920..af33f80668 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp @@ -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" diff --git a/Qt/QtMain.h b/Qt/QtMain.h index 82123fc990..2fce102089 100644 --- a/Qt/QtMain.h +++ b/Qt/QtMain.h @@ -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" diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h index 150fc53471..6334bc4aca 100644 --- a/Qt/mainwindow.h +++ b/Qt/mainwindow.h @@ -8,6 +8,7 @@ #include #include +#include "base/NativeApp.h" #include "ConsoleListener.h" #include "Core/Core.h" #include "Core/Config.h" diff --git a/SDL/NKCodeFromSDL.h b/SDL/NKCodeFromSDL.h index d71654c945..bd184eef01 100644 --- a/SDL/NKCodeFromSDL.h +++ b/SDL/NKCodeFromSDL.h @@ -1,6 +1,6 @@ #pragma once -#include "util/const_map.h" +#include "Common/Data/Collections/ConstMap.h" #include // TODO: Add any missing keys diff --git a/SDL/SDLJoystick.cpp b/SDL/SDLJoystick.cpp index 72254a1534..ecb94e25a1 100644 --- a/SDL/SDLJoystick.cpp +++ b/SDL/SDLJoystick.cpp @@ -1,11 +1,13 @@ -#include "SDL/SDLJoystick.h" -#include "Core/Config.h" -#include "Common/FileUtil.h" -#include "file/vfs.h" - #include #include +#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) diff --git a/SDL/SDLJoystick.h b/SDL/SDLJoystick.h index 5b4d67f1ab..ea14076d64 100644 --- a/SDL/SDLJoystick.h +++ b/SDL/SDLJoystick.h @@ -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: diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index f0ab1df43a..3f50a032cb 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -21,19 +21,13 @@ SDLJoystick *joystick = NULL; #include #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 #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" diff --git a/SDL/SDLVulkanGraphicsContext.cpp b/SDL/SDLVulkanGraphicsContext.cpp index 76361240ce..9bc9bf925b 100644 --- a/SDL/SDLVulkanGraphicsContext.cpp +++ b/SDL/SDLVulkanGraphicsContext.cpp @@ -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" diff --git a/UI/ChatScreen.cpp b/UI/ChatScreen.cpp index 5430945518..b7e4b33819 100644 --- a/UI/ChatScreen.cpp +++ b/UI/ChatScreen.cpp @@ -1,12 +1,15 @@ #include #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) { diff --git a/UI/ComboKeyMappingScreen.cpp b/UI/ComboKeyMappingScreen.cpp index 3ccc55c824..971780ac91 100644 --- a/UI/ComboKeyMappingScreen.cpp +++ b/UI/ComboKeyMappingScreen.cpp @@ -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" diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index 07205f10ea..f60f25285f 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -19,23 +19,24 @@ #include #include -#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" diff --git a/UI/ControlMappingScreen.h b/UI/ControlMappingScreen.h index 3d7b6879e5..3f548c2f66 100644 --- a/UI/ControlMappingScreen.h +++ b/UI/ControlMappingScreen.h @@ -22,10 +22,10 @@ #include #include -#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; diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp index b0d2bfc5f2..eb67a666b8 100644 --- a/UI/CwCheatScreen.cpp +++ b/UI/CwCheatScreen.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 "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" diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 022f157ed6..a577639e2a 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -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" diff --git a/UI/DevScreens.h b/UI/DevScreens.h index 7b71ad6f13..0d32460d4e 100644 --- a/UI/DevScreens.h +++ b/UI/DevScreens.h @@ -24,7 +24,7 @@ #include #include "file/file_util.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "ui/ui_screen.h" #include "UI/MiscScreens.h" diff --git a/UI/DiscordIntegration.cpp b/UI/DiscordIntegration.cpp index ccc2a16e7a..f5838fc72c 100644 --- a/UI/DiscordIntegration.cpp +++ b/UI/DiscordIntegration.cpp @@ -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) diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index 7dba4e28ed..4ae30dd4ad 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -18,15 +18,16 @@ #include #include -#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" diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 48c45e557f..0c816c817f 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -20,21 +20,22 @@ #include #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" diff --git a/UI/GPUDriverTestScreen.cpp b/UI/GPUDriverTestScreen.cpp index 87018d8399..c23517066b 100644 --- a/UI/GPUDriverTestScreen.cpp +++ b/UI/GPUDriverTestScreen.cpp @@ -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 fsDiscard = { diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index 6b4f0b05e1..81b5c585d1 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -18,12 +18,15 @@ #include #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" diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 5d8d04ff1c..472aa840f0 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -20,14 +20,15 @@ #include #include "base/display.h" // Only to check screen aspect ratio with pixel_yres/pixel_xres +#include "base/NativeApp.h" -#include "base/colorutil.h" +#include "Common/Data/Color/RGBAUtil.h" #include "math/curves.h" #include "net/resolve.h" #include "gfx_es2/gpu_features.h" #include "gfx_es2/draw_buffer.h" -#include "i18n/i18n.h" -#include "util/text/utf8.h" +#include "Common/Data/Text/I18n.h" +#include "Common/Data/Encoding/Utf8.h" #include "ui/root.h" #include "ui/view.h" #include "ui/viewgroup.h" diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp index ade3f154a1..d43bac8a08 100644 --- a/UI/GamepadEmu.cpp +++ b/UI/GamepadEmu.cpp @@ -17,7 +17,7 @@ #include -#include "base/colorutil.h" +#include "Common/Data/Color/RGBAUtil.h" #include "base/display.h" #include "base/NativeApp.h" #include "gfx/texture_atlas.h" diff --git a/UI/InstallZipScreen.cpp b/UI/InstallZipScreen.cpp index 3a586b776b..a8fc7f5038 100644 --- a/UI/InstallZipScreen.cpp +++ b/UI/InstallZipScreen.cpp @@ -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 "ui/ui.h" #include "ui/view.h" #include "ui/viewgroup.h" diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 319c8b860e..14394a18d3 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -19,8 +19,8 @@ #include #include "ppsspp_config.h" -#include "base/colorutil.h" #include "base/display.h" +#include "base/NativeApp.h" #include "file/path.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" @@ -29,8 +29,9 @@ #include "ui/ui_context.h" #include "ui/view.h" #include "ui/viewgroup.h" -#include "util/text/utf8.h" +#include "Common/Data/Color/RGBAUtil.h" +#include "Common/Data/Encoding/Utf8.h" #include "Common/FileUtil.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" @@ -56,7 +57,7 @@ #include "Core/Config.h" #include "Core/Loaders.h" #include "GPU/GPUInterface.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "Core/HLE/sceDisplay.h" #include "Core/HLE/sceUmd.h" diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 00b3f02b9e..9f8044613c 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -20,18 +20,19 @@ #include #include -#include "base/colorutil.h" +#include "base/NativeApp.h" #include "base/display.h" #include "gfx_es2/draw_buffer.h" #include "math/curves.h" -#include "i18n/i18n.h" #include "ui/ui_context.h" #include "ui/view.h" #include "ui/viewgroup.h" #include "ui/ui.h" -#include "util/random/rng.h" #include "file/vfs.h" +#include "Common/Data/Color/RGBAUtil.h" +#include "Common/Data/Text/I18n.h" +#include "Common/Data/Random/Rng.h" #include "Common/TimeUtil.h" #include "Common/FileUtil.h" #include "Core/Config.h" diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index dd11226078..7b4fd4bff9 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -52,7 +52,7 @@ #include "gfx/texture_atlas.h" #include "gfx_es2/draw_text.h" #include "gfx_es2/gpu_features.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "Common/Input/InputState.h" #include "math/fast/fast_math.h" #include "math/math_util.h" @@ -63,7 +63,7 @@ #include "ui/screen.h" #include "ui/ui_context.h" #include "ui/view.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "android/jni/app-android.h" diff --git a/UI/OnScreenDisplay.cpp b/UI/OnScreenDisplay.cpp index f45fb125d8..38f8549e7b 100644 --- a/UI/OnScreenDisplay.cpp +++ b/UI/OnScreenDisplay.cpp @@ -1,6 +1,6 @@ #include "UI/OnScreenDisplay.h" -#include "base/colorutil.h" +#include "Common/Data/Color/RGBAUtil.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index ee36bba3ba..f2ec060b2a 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -18,7 +18,7 @@ #include #include -#include "i18n/i18n.h" +#include "base/NativeApp.h" #include "gfx_es2/draw_buffer.h" #include "ui/view.h" #include "ui/viewgroup.h" @@ -26,6 +26,7 @@ #include "ui/ui_screen.h" #include "thin3d/thin3d.h" +#include "Common/Data/Text/I18n.h" #include "Common/StringUtils.h" #include "Core/Reporting.h" diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp index e0c5a4c990..680ba3b47c 100644 --- a/UI/RemoteISOScreen.cpp +++ b/UI/RemoteISOScreen.cpp @@ -25,15 +25,16 @@ #include #endif +#include "base/NativeApp.h" #include "file/path.h" // TODO: For text align flags, probably shouldn't be in gfx_es2/... #include "gfx_es2/draw_buffer.h" -#include "i18n/i18n.h" #include "json/json_reader.h" #include "net/http_client.h" #include "net/resolve.h" #include "net/url.h" +#include "Common/Data/Text/I18n.h" #include "Common/Common.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp index ae7a8909a9..59765847f0 100644 --- a/UI/ReportScreen.cpp +++ b/UI/ReportScreen.cpp @@ -18,21 +18,22 @@ #include #include "base/display.h" +#include "base/NativeApp.h" // TODO: For text align flags, probably shouldn't be in gfx_es2/... #include "gfx_es2/draw_buffer.h" -#include "i18n/i18n.h" #include "thin3d/thin3d.h" #include "ui/ui_context.h" #include "UI/PauseScreen.h" #include "UI/ReportScreen.h" +#include "Common/Data/Text/I18n.h" +#include "Common/FileUtil.h" +#include "Common/Log.h" +#include "Common/StringUtils.h" #include "Core/Core.h" #include "Core/Reporting.h" #include "Core/Screenshot.h" #include "Core/System.h" -#include "Common/FileUtil.h" -#include "Common/Log.h" -#include "Common/StringUtils.h" using namespace UI; diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index bb28391c79..0521f830e5 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -18,12 +18,12 @@ #include #include -#include "base/colorutil.h" +#include "Common/Data/Color/RGBAUtil.h" #include "gfx_es2/draw_buffer.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "math/curves.h" #include "Common/Thread/PrioritizedWorkQueue.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "ui/ui_context.h" #include "ui/view.h" #include "ui/viewgroup.h" diff --git a/UI/Store.cpp b/UI/Store.cpp index 846161711b..f07a95d868 100644 --- a/UI/Store.cpp +++ b/UI/Store.cpp @@ -19,7 +19,7 @@ #include "json/json_reader.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "ui/screen.h" #include "ui/ui_context.h" #include "ui/viewgroup.h" diff --git a/UI/TextureUtil.cpp b/UI/TextureUtil.cpp index 7fac93cc5c..0ca4228be2 100644 --- a/UI/TextureUtil.cpp +++ b/UI/TextureUtil.cpp @@ -1,6 +1,6 @@ #include -#include "base/colorutil.h" +#include "Common/Data/Color/RGBAUtil.h" #include "thin3d/thin3d.h" #include "image/zim_load.h" #include "image/png_load.h" diff --git a/UI/TiltAnalogSettingsScreen.cpp b/UI/TiltAnalogSettingsScreen.cpp index 1281c5658f..e4379606e7 100644 --- a/UI/TiltAnalogSettingsScreen.cpp +++ b/UI/TiltAnalogSettingsScreen.cpp @@ -18,7 +18,7 @@ #include "TiltAnalogSettingsScreen.h" #include "Core/Config.h" #include "Core/System.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" void TiltAnalogSettingsScreen::CreateViews() { using namespace UI; diff --git a/UI/TouchControlLayoutScreen.cpp b/UI/TouchControlLayoutScreen.cpp index f8835f1e74..46b4c49eae 100644 --- a/UI/TouchControlLayoutScreen.cpp +++ b/UI/TouchControlLayoutScreen.cpp @@ -18,9 +18,9 @@ #include #include -#include "base/colorutil.h" +#include "Common/Data/Color/RGBAUtil.h" #include "gfx_es2/draw_buffer.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "math/math_util.h" #include "ui/ui_context.h" diff --git a/UI/TouchControlVisibilityScreen.cpp b/UI/TouchControlVisibilityScreen.cpp index 1e3b1fd63d..d04cf4e95c 100644 --- a/UI/TouchControlVisibilityScreen.cpp +++ b/UI/TouchControlVisibilityScreen.cpp @@ -19,7 +19,7 @@ #include "TouchControlVisibilityScreen.h" #include "Core/Config.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" static const int leftColumnWidth = 140; diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index c57672cdde..92edcd468f 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -386,6 +386,19 @@ + + + + + + + + + + + + + @@ -449,6 +462,14 @@ + + + + + + + + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 1d396b672e..7edd0a7f0e 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -16,6 +16,27 @@ {7368a8e7-cf29-49e9-87be-f1e69771555e} + + {93937cf8-9cc6-4ea5-a9c8-bdc186aa0317} + + + {ad268930-1885-451c-969d-39871232244a} + + + {553115bf-c2fa-4c7d-a1db-587b2337c73f} + + + {4451d43c-69ec-42d2-8f0f-09032a1c46f1} + + + {c6e1a659-b5d9-4015-93b4-9e383959b19c} + + + {99f1fb79-2a8c-4ac0-8cba-57d9b2f87d32} + + + {7277c320-2c19-40d0-81a4-2f6cbb20790c} + @@ -124,6 +145,30 @@ Thread + + Data\Encoding + + + Data\Encoding + + + Data\Encoding + + + Data\Color + + + Data\Hash + + + Data\Text + + + Data\Text + + + Data\Text + @@ -223,6 +268,45 @@ Thread + + Data\Collections + + + Data\Collections + + + Data\Random + + + Data\Encoding + + + Data\Encoding + + + Data\Encoding + + + Data\Encoding + + + Data\Encoding + + + Data\Color + + + Data\Hash + + + Data\Text + + + Data\Text + + + Data\Text + diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj index d622fc813c..115cd1d8f1 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj +++ b/UWP/NativeUWP/NativeUWP.vcxproj @@ -379,11 +379,8 @@ - - - @@ -399,7 +396,6 @@ - @@ -428,22 +424,11 @@ - - - - - - - - - - - @@ -458,7 +443,6 @@ - @@ -598,10 +582,6 @@ - - - - Create Create diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters index 66c9bf1ea3..63749eb6bf 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj.filters +++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters @@ -10,9 +10,6 @@ {63177c91-8ebd-4e87-ad4e-e6b8b52879c8} - - {58d2f6cf-2448-4095-8479-9fe5d765b573} - {8a254b8c-46f2-4ff1-bc53-deea7e614276} @@ -31,21 +28,12 @@ {d8c0dd74-7ad2-440a-a3e0-5dbf3435a2fc} - - {a522f449-7873-4af7-908e-7cc91eb8bfc0} - {96ac6deb-ad00-4ee4-9f0d-515d78d1886b} - - {4d23e7d3-0b9b-4dbe-95df-6ab250782a66} - - - base - base @@ -55,18 +43,6 @@ thin3d - - util - - - util - - - util - - - util - gfx @@ -160,9 +136,6 @@ net - - i18n - gfx @@ -175,9 +148,6 @@ gfx - - data - math @@ -186,9 +156,6 @@ net - - data - gfx @@ -196,9 +163,6 @@ - - base - base @@ -208,30 +172,6 @@ thin3d - - util - - - util - - - util - - - util - - - util - - - util - - - util - - - util - gfx @@ -334,9 +274,6 @@ net - - i18n - gfx @@ -349,17 +286,11 @@ gfx - - data - net - - data - gfx diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index 8ddddcce9a..b66c452f59 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -13,7 +13,7 @@ #include "base/display.h" #include "Common/Thread/ThreadUtil.h" #include "thin3d/thin3d_create.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Common/Common.h" #include "Common/DirectXHelper.h" diff --git a/UWP/UWPUtil.h b/UWP/UWPUtil.h index de80bba6a7..685ebc396e 100644 --- a/UWP/UWPUtil.h +++ b/UWP/UWPUtil.h @@ -1,6 +1,6 @@ #pragma once -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" inline Platform::String ^ToPlatformString(std::string str) { return ref new Platform::String(ConvertUTF8ToWString(str).c_str()); diff --git a/Windows/Debugger/BreakpointWindow.cpp b/Windows/Debugger/BreakpointWindow.cpp index b00da57324..60ed43195e 100644 --- a/Windows/Debugger/BreakpointWindow.cpp +++ b/Windows/Debugger/BreakpointWindow.cpp @@ -1,6 +1,6 @@ #include -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "BreakpointWindow.h" #include "../resource.h" diff --git a/Windows/Debugger/CtrlDisAsmView.cpp b/Windows/Debugger/CtrlDisAsmView.cpp index 7717503399..c37127f0dc 100644 --- a/Windows/Debugger/CtrlDisAsmView.cpp +++ b/Windows/Debugger/CtrlDisAsmView.cpp @@ -20,7 +20,7 @@ #include "Windows/main.h" #include "Common/CommonWindows.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "ext/xxhash.h" #include "base/display.h" diff --git a/Windows/Debugger/CtrlRegisterList.cpp b/Windows/Debugger/CtrlRegisterList.cpp index 05be2dee21..791838cdd3 100644 --- a/Windows/Debugger/CtrlRegisterList.cpp +++ b/Windows/Debugger/CtrlRegisterList.cpp @@ -4,7 +4,7 @@ #include #include "base/display.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Windows/resource.h" #include "Core/MemMap.h" #include "Windows/W32Util/Misc.h" diff --git a/Windows/Debugger/DebuggerShared.cpp b/Windows/Debugger/DebuggerShared.cpp index 7771edb5f2..9f3bc64313 100644 --- a/Windows/Debugger/DebuggerShared.cpp +++ b/Windows/Debugger/DebuggerShared.cpp @@ -1,4 +1,4 @@ -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "DebuggerShared.h" #include "../InputBox.h" diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp index f5d80c6e77..39d29e7f62 100644 --- a/Windows/Debugger/Debugger_Disasm.cpp +++ b/Windows/Debugger/Debugger_Disasm.cpp @@ -24,7 +24,7 @@ #include "Core/CoreTiming.h" #include "Core/MIPS/MIPSAnalyst.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Common/CommonWindows.h" #include "Common/StringUtils.h" diff --git a/Windows/Debugger/Debugger_Lists.cpp b/Windows/Debugger/Debugger_Lists.cpp index f6c5bd9561..4463678dda 100644 --- a/Windows/Debugger/Debugger_Lists.cpp +++ b/Windows/Debugger/Debugger_Lists.cpp @@ -8,7 +8,7 @@ #include "Windows/main.h" #include "BreakpointWindow.h" #include "../../Core/HLE/sceKernelThread.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" enum { TL_NAME, TL_PROGRAMCOUNTER, TL_ENTRYPOINT, TL_PRIORITY, TL_STATE, TL_WAITTYPE, TL_COLUMNCOUNT }; enum { BPL_ENABLED, BPL_TYPE, BPL_OFFSET, BPL_SIZELABEL, BPL_OPCODE, BPL_CONDITION, BPL_HITS, BPL_COLUMNCOUNT }; diff --git a/Windows/Debugger/Debugger_MemoryDlg.cpp b/Windows/Debugger/Debugger_MemoryDlg.cpp index 7e76443bfa..9604616f01 100644 --- a/Windows/Debugger/Debugger_MemoryDlg.cpp +++ b/Windows/Debugger/Debugger_MemoryDlg.cpp @@ -5,7 +5,7 @@ #include "..\resource.h" #include "base/display.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Core/Debugger/SymbolMap.h" #include "Core/MIPS/MIPSDebugInterface.h" // BAD diff --git a/Windows/Debugger/Debugger_VFPUDlg.cpp b/Windows/Debugger/Debugger_VFPUDlg.cpp index beb8caf41e..8851afd62e 100644 --- a/Windows/Debugger/Debugger_VFPUDlg.cpp +++ b/Windows/Debugger/Debugger_VFPUDlg.cpp @@ -4,7 +4,7 @@ #include #include #include "Windows/resource.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Core/Debugger/SymbolMap.h" #include "Windows/Debugger/Debugger_VFPUDlg.h" diff --git a/Windows/Debugger/DumpMemoryWindow.cpp b/Windows/Debugger/DumpMemoryWindow.cpp index 1fdb549486..3676307420 100644 --- a/Windows/Debugger/DumpMemoryWindow.cpp +++ b/Windows/Debugger/DumpMemoryWindow.cpp @@ -1,6 +1,6 @@ #include #include -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Core/Core.h" #include "Core/MemMap.h" #include "Windows/Debugger/DumpMemoryWindow.h" diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp index 7c3a878435..bfb2df00c6 100644 --- a/Windows/EmuThread.cpp +++ b/Windows/EmuThread.cpp @@ -3,9 +3,9 @@ #include #include "base/NativeApp.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "Common/Input/InputState.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Common/Log.h" #include "Common/StringUtils.h" diff --git a/Windows/GEDebugger/GEDebugger.cpp b/Windows/GEDebugger/GEDebugger.cpp index c22b00b554..61ca7784a2 100644 --- a/Windows/GEDebugger/GEDebugger.cpp +++ b/Windows/GEDebugger/GEDebugger.cpp @@ -20,7 +20,7 @@ #include #include -#include "util/text/parsers.h" +#include "Common/Data/Text/Parsers.h" #include "Common/ColorConv.h" #include "Common/StringUtils.h" #include "Core/Config.h" diff --git a/Windows/GPU/D3D11Context.cpp b/Windows/GPU/D3D11Context.cpp index 74f3b9b67b..9ced64d60c 100644 --- a/Windows/GPU/D3D11Context.cpp +++ b/Windows/GPU/D3D11Context.cpp @@ -6,8 +6,8 @@ #include "Common/Log.h" #include "base/display.h" -#include "util/text/utf8.h" -#include "i18n/i18n.h" +#include "Common/Data/Encoding/Utf8.h" +#include "Common/Data/Text/I18n.h" #include "Core/Config.h" #include "Core/ConfigValues.h" diff --git a/Windows/GPU/D3D9Context.cpp b/Windows/GPU/D3D9Context.cpp index 0014c31121..be91557b47 100644 --- a/Windows/GPU/D3D9Context.cpp +++ b/Windows/GPU/D3D9Context.cpp @@ -6,8 +6,8 @@ #include "gfx/d3d9_state.h" #include "base/display.h" -#include "util/text/utf8.h" -#include "i18n/i18n.h" +#include "Common/Data/Encoding/Utf8.h" +#include "Common/Data/Text/I18n.h" #include "Common/Log.h" #include "Core/Config.h" diff --git a/Windows/GPU/WindowsGLContext.cpp b/Windows/GPU/WindowsGLContext.cpp index 01933b2701..57b4a51cd7 100644 --- a/Windows/GPU/WindowsGLContext.cpp +++ b/Windows/GPU/WindowsGLContext.cpp @@ -27,8 +27,8 @@ #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/Core.h" -#include "util/text/utf8.h" -#include "i18n/i18n.h" +#include "Common/Data/Encoding/Utf8.h" +#include "Common/Data/Text/I18n.h" #include "UI/OnScreenDisplay.h" #include "ext/glslang/glslang/Public/ShaderLang.h" diff --git a/Windows/GPU/WindowsVulkanContext.cpp b/Windows/GPU/WindowsVulkanContext.cpp index 38b7623352..1c6557b2e3 100644 --- a/Windows/GPU/WindowsVulkanContext.cpp +++ b/Windows/GPU/WindowsVulkanContext.cpp @@ -58,7 +58,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 "Windows/GPU/WindowsVulkanContext.h" #ifdef _DEBUG diff --git a/Windows/InputBox.cpp b/Windows/InputBox.cpp index d661e39a9c..314aac514c 100644 --- a/Windows/InputBox.cpp +++ b/Windows/InputBox.cpp @@ -2,7 +2,7 @@ #include "Common/CommonWindows.h" #include "Windows/InputBox.h" #include "Windows/resource.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" static std::wstring textBoxContents; static std::wstring out; diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp index 2f3545d5d7..f4d2be55bf 100644 --- a/Windows/MainWindow.cpp +++ b/Windows/MainWindow.cpp @@ -36,11 +36,11 @@ #include "base/NativeApp.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" #include "Common/Thread/ThreadUtil.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Core/Core.h" #include "Core/Config.h" diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index d054c50741..310be72aa3 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -7,8 +7,8 @@ #include "resource.h" -#include "i18n/i18n.h" -#include "util/text/utf8.h" +#include "Common/Data/Text/I18n.h" +#include "Common/Data/Encoding/Utf8.h" #include "base/NativeApp.h" #include "gfx_es2/gpu_features.h" diff --git a/Windows/W32Util/Misc.cpp b/Windows/W32Util/Misc.cpp index b4544d08a9..d646302986 100644 --- a/Windows/W32Util/Misc.cpp +++ b/Windows/W32Util/Misc.cpp @@ -6,7 +6,7 @@ #include #include "Misc.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" bool KeyDownAsync(int vkey) { #if PPSSPP_PLATFORM(UWP) diff --git a/Windows/W32Util/PropertySheet.cpp b/Windows/W32Util/PropertySheet.cpp index dc2407dc1d..be56607b5f 100644 --- a/Windows/W32Util/PropertySheet.cpp +++ b/Windows/W32Util/PropertySheet.cpp @@ -1,7 +1,7 @@ #include "Windows/stdafx.h" #include "Misc.h" #include "PropertySheet.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include diff --git a/Windows/W32Util/ShellUtil.cpp b/Windows/W32Util/ShellUtil.cpp index e53ad9f43f..c6d3a2bc49 100644 --- a/Windows/W32Util/ShellUtil.cpp +++ b/Windows/W32Util/ShellUtil.cpp @@ -7,7 +7,7 @@ #include #include -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "ShellUtil.h" #include diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index 4442fd4d19..3269917f10 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -37,7 +37,7 @@ #include "file/file_util.h" #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Common/StringUtils.h" #include "Core/Core.h" diff --git a/Windows/main.cpp b/Windows/main.cpp index 04713ef2e9..33843554dd 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -35,10 +35,10 @@ #include "base/NativeApp.h" #include "file/vfs.h" #include "file/zip_read.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "profiler/profiler.h" #include "Common/Thread/ThreadUtil.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "net/resolve.h" #include "Core/Config.h" diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 00b311b8a8..34309d62b9 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -101,25 +101,60 @@ ARCH_FILES := \ Arm64EmitterTest.cpp endif -ifeq ($(TARGET_ARCH_ABI),armeabi) -ARCH_FILES := \ - $(SRC)/Common/ArmEmitter.cpp \ - $(SRC)/Common/ArmCPUDetect.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompALU.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompBranch.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompFPU.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompLoadStore.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompVFPU.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompVFPUNEON.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompVFPUNEONUtil.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompReplace.cpp \ - $(SRC)/Core/MIPS/ARM/ArmAsm.cpp \ - $(SRC)/Core/MIPS/ARM/ArmJit.cpp \ - $(SRC)/Core/MIPS/ARM/ArmRegCache.cpp \ - $(SRC)/Core/MIPS/ARM/ArmRegCacheFPU.cpp \ - $(SRC)/GPU/Common/VertexDecoderArm.cpp \ - ArmEmitterTest.cpp -endif +NATIVE_FILES :=\ + $(SRC)/ext/native/base/display.cpp \ + $(SRC)/ext/native/file/fd_util.cpp \ + $(SRC)/ext/native/file/chunk_file.cpp \ + $(SRC)/ext/native/file/file_util.cpp \ + $(SRC)/ext/native/file/free.cpp \ + $(SRC)/ext/native/file/path.cpp \ + $(SRC)/ext/native/file/ini_file.cpp \ + $(SRC)/ext/native/file/zip_read.cpp \ + $(SRC)/ext/native/json/json_reader.cpp \ + $(SRC)/ext/native/json/json_writer.cpp \ + $(SRC)/ext/native/math/fast/fast_math.c \ + $(SRC)/ext/native/math/fast/fast_matrix.c \ + $(SRC)/ext/native/math/dataconv.cpp \ + $(SRC)/ext/native/math/math_util.cpp \ + $(SRC)/ext/native/math/curves.cpp \ + $(SRC)/ext/native/math/expression_parser.cpp \ + $(SRC)/ext/native/math/lin/vec3.cpp.arm \ + $(SRC)/ext/native/math/lin/matrix4x4.cpp.arm \ + $(SRC)/ext/native/net/http_client.cpp \ + $(SRC)/ext/native/net/http_server.cpp \ + $(SRC)/ext/native/net/http_headers.cpp \ + $(SRC)/ext/native/net/resolve.cpp \ + $(SRC)/ext/native/net/sinks.cpp \ + $(SRC)/ext/native/net/url.cpp \ + $(SRC)/ext/native/net/websocket_server.cpp \ + $(SRC)/ext/native/profiler/profiler.cpp \ + $(SRC)/ext/native/gfx_es2/glsl_program.cpp \ + $(SRC)/ext/native/gfx_es2/gpu_features.cpp \ + $(SRC)/ext/native/gfx_es2/gl3stub.c \ + $(SRC)/ext/native/gfx_es2/draw_buffer.cpp.arm \ + $(SRC)/ext/native/gfx_es2/draw_text.cpp.arm \ + $(SRC)/ext/native/gfx_es2/draw_text_android.cpp.arm \ + $(SRC)/ext/native/gfx/gl_debug_log.cpp \ + $(SRC)/ext/native/gfx/texture_atlas.cpp \ + $(SRC)/ext/native/image/zim_load.cpp \ + $(SRC)/ext/native/image/zim_save.cpp \ + $(SRC)/ext/native/image/png_load.cpp \ + $(SRC)/ext/native/thin3d/thin3d.cpp \ + $(SRC)/ext/native/thin3d/thin3d_gl.cpp \ + $(SRC)/ext/native/thin3d/thin3d_vulkan.cpp \ + $(SRC)/ext/native/thin3d/GLRenderManager.cpp \ + $(SRC)/ext/native/thin3d/GLQueueRunner.cpp \ + $(SRC)/ext/native/thin3d/VulkanRenderManager.cpp \ + $(SRC)/ext/native/thin3d/VulkanQueueRunner.cpp \ + $(SRC)/ext/native/thin3d/DataFormatGL.cpp \ + $(SRC)/ext/native/ui/root.cpp \ + $(SRC)/ext/native/ui/view.cpp \ + $(SRC)/ext/native/ui/viewgroup.cpp \ + $(SRC)/ext/native/ui/ui.cpp \ + $(SRC)/ext/native/ui/ui_screen.cpp \ + $(SRC)/ext/native/ui/ui_tween.cpp \ + $(SRC)/ext/native/ui/ui_context.cpp \ + $(SRC)/ext/native/ui/screen.cpp EGL_FILES := \ $(SRC)/Common/GL/GLInterface/EGL.cpp \ @@ -205,6 +240,7 @@ EXEC_AND_LIB_FILES := \ $(VULKAN_FILES) \ $(SPIRV_CROSS_FILES) \ $(EXT_FILES) \ + $(NATIVE_FILES) \ TestRunner.cpp \ $(SRC)/Core/MIPS/MIPS.cpp.arm \ $(SRC)/Core/MIPS/MIPSAnalyst.cpp \ @@ -233,6 +269,14 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Common/Crypto/md5.cpp \ $(SRC)/Common/Crypto/sha1.cpp \ $(SRC)/Common/Crypto/sha256.cpp \ + $(SRC)/Common/Data/Color/RGBAUtil.cpp \ + $(SRC)/Common/Data/Encoding/Base64.cpp \ + $(SRC)/Common/Data/Encoding/Compression.cpp \ + $(SRC)/Common/Data/Encoding/Utf8.cpp \ + $(SRC)/Common/Data/Hash/Hash.cpp \ + $(SRC)/Common/Data/Text/I18n.cpp \ + $(SRC)/Common/Data/Text/Parsers.cpp \ + $(SRC)/Common/Data/Text/WrapText.cpp \ $(SRC)/Common/Thread/Executor.cpp \ $(SRC)/Common/Thread/PrioritizedWorkQueue.cpp \ $(SRC)/Common/Thread/ThreadPool.cpp \ @@ -571,6 +615,34 @@ LOCAL_SRC_FILES := \ $(SRC)/UI/TextureUtil.cpp \ $(SRC)/UI/ComboKeyMappingScreen.cpp +#NATIVE +#LOCAL_CFLAGS := -O3 -DUSING_GLES2 -fsigned-char -fno-strict-aliasing -Wall -Wno-multichar -D__STDC_CONSTANT_MACROS +#LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder +#LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../ext $(LOCAL_PATH)/../../ext/libpng17 $(LOCAL_PATH)/../../ext/libzip $(LOCAL_PATH)/../../ext/glslang .. + +#Portable native and separate code on android in future is easy you needs add files +#by ($(target_arch_ABI),arquitecture (armeabi-v7a , armeabi , x86 , MIPS) +# ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a) +LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A +LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ + $(SRC)/ext/native/math/fast/fast_matrix_neon.S.neon \ + ../../ext/libpng17/arm/arm_init.c \ + ../../ext/libpng17/arm/filter_neon_intrinsics.c \ + ../../ext/libpng17/arm/filter_neon.S.neon + +else ifeq ($(TARGET_ARCH_ABI),armeabi) +LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI -march=armv6 +else ifeq ($(TARGET_ARCH_ABI),x86) +LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86 +LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ + $(SRC)/ext/native/math/fast/fast_matrix_sse.c +else ifeq ($(TARGET_ARCH_ABI),x86_64) +LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_X64 +LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ + $(SRC)/ext/native/math/fast/fast_matrix_sse.c +endif + ifneq ($(SKIPAPP),1) include $(BUILD_SHARED_LIBRARY) endif @@ -630,7 +702,6 @@ ifeq ($(UNITTEST),1) endif $(call import-module,libzip) -$(call import-module,native) $(call import-module,glslang-build) $(call import-module,miniupnp-build) diff --git a/android/jni/AndroidVulkanContext.cpp b/android/jni/AndroidVulkanContext.cpp index c3d490e3b1..49eb548c2d 100644 --- a/android/jni/AndroidVulkanContext.cpp +++ b/android/jni/AndroidVulkanContext.cpp @@ -7,7 +7,7 @@ #include "Common/Vulkan/VulkanLoader.h" #include "thin3d/VulkanRenderManager.h" #include "thin3d/thin3d_create.h" -#include "util/text/parsers.h" +#include "Common/Data/Text/Parsers.h" #include "Core/Config.h" #include "Core/ConfigValues.h" #include "Core/System.h" diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk index 3984fad081..d18d5d6e85 100644 --- a/android/jni/Locals.mk +++ b/android/jni/Locals.mk @@ -19,7 +19,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/$(NATIVE) \ $(LOCAL_PATH) -LOCAL_STATIC_LIBRARIES := native libzip glslang-build miniupnp-build +LOCAL_STATIC_LIBRARIES := libzip glslang-build miniupnp-build LOCAL_LDLIBS := -lz -landroid -lGLESv2 -lOpenSLES -lEGL -ldl -llog -latomic ifneq ($(NDK_DEBUG),1) # Prettier stack traces are nice on other platforms. diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 981f1ec979..3813fbb44a 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -58,7 +58,7 @@ struct JNIEnv {}; #include "profiler/profiler.h" #include "math/math_util.h" #include "net/resolve.h" -#include "util/text/parsers.h" +#include "Common/Data/Text/Parsers.h" #include "android/jni/AndroidAudio.h" #include "gfx/gl_common.h" #include "gfx_es2/gpu_features.h" diff --git a/ext/native/Android.mk b/ext/native/Android.mk deleted file mode 100644 index 7469bb066a..0000000000 --- a/ext/native/Android.mk +++ /dev/null @@ -1,99 +0,0 @@ -# Basic Android.mk for libnative - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := libnative -LOCAL_ARM_MODE := arm -LOCAL_SRC_FILES :=\ - base/display.cpp \ - base/colorutil.cpp \ - data/base64.cpp \ - data/compression.cpp \ - file/fd_util.cpp \ - file/chunk_file.cpp \ - file/file_util.cpp \ - file/free.cpp \ - file/path.cpp \ - file/ini_file.cpp \ - file/zip_read.cpp \ - json/json_reader.cpp \ - json/json_writer.cpp \ - i18n/i18n.cpp \ - math/fast/fast_math.c \ - math/fast/fast_matrix.c \ - math/dataconv.cpp \ - math/math_util.cpp \ - math/curves.cpp \ - math/expression_parser.cpp \ - math/lin/vec3.cpp.arm \ - math/lin/matrix4x4.cpp.arm \ - net/http_client.cpp \ - net/http_server.cpp \ - net/http_headers.cpp \ - net/resolve.cpp \ - net/sinks.cpp \ - net/url.cpp \ - net/websocket_server.cpp \ - profiler/profiler.cpp \ - gfx_es2/glsl_program.cpp \ - gfx_es2/gpu_features.cpp \ - gfx_es2/gl3stub.c \ - gfx_es2/draw_buffer.cpp.arm \ - gfx_es2/draw_text.cpp.arm \ - gfx_es2/draw_text_android.cpp.arm \ - gfx/gl_debug_log.cpp \ - gfx/texture_atlas.cpp \ - image/zim_load.cpp \ - image/zim_save.cpp \ - image/png_load.cpp \ - thin3d/thin3d.cpp \ - thin3d/thin3d_gl.cpp \ - thin3d/thin3d_vulkan.cpp \ - thin3d/GLRenderManager.cpp \ - thin3d/GLQueueRunner.cpp \ - thin3d/VulkanRenderManager.cpp \ - thin3d/VulkanQueueRunner.cpp \ - thin3d/DataFormatGL.cpp \ - ui/root.cpp \ - ui/view.cpp \ - ui/viewgroup.cpp \ - ui/ui.cpp \ - ui/ui_screen.cpp \ - ui/ui_tween.cpp \ - ui/ui_context.cpp \ - ui/screen.cpp \ - util/text/utf8.cpp \ - util/text/parsers.cpp \ - util/text/wrap_text.cpp \ - util/hash/hash.cpp - -LOCAL_CFLAGS := -O3 -DUSING_GLES2 -fsigned-char -fno-strict-aliasing -Wall -Wno-multichar -D__STDC_CONSTANT_MACROS -LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../ext $(LOCAL_PATH)/../../ext/libpng17 $(LOCAL_PATH)/../../ext/libzip $(LOCAL_PATH)/../../ext/glslang .. - -#Portable native and separate code on android in future is easy you needs add files -#by ($(target_arch_ABI),arquitecture (armeabi-v7a , armeabi , x86 , MIPS) -# ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) -ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a) -LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A -LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ - math/fast/fast_matrix_neon.S.neon \ - ../../ext/libpng17/arm/arm_init.c \ - ../../ext/libpng17/arm/filter_neon_intrinsics.c \ - ../../ext/libpng17/arm/filter_neon.S.neon - -else ifeq ($(TARGET_ARCH_ABI),armeabi) -LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI -march=armv6 -else ifeq ($(TARGET_ARCH_ABI),x86) -LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86 -LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ - math/fast/fast_matrix_sse.c -else ifeq ($(TARGET_ARCH_ABI),x86_64) -LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_X64 -LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ - math/fast/fast_matrix_sse.c -endif - -include $(BUILD_STATIC_LIBRARY) diff --git a/ext/native/base/CMakeLists.txt b/ext/native/base/CMakeLists.txt deleted file mode 100644 index 1e4f0530dd..0000000000 --- a/ext/native/base/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(SRCS - colorutil.cpp - ../thread/threadutil.cpp - display.cpp - buffer.cpp -) - -add_library(base STATIC ${SRCS}) - -if(UNIX) - add_definitions(-fPIC) -endif(UNIX) diff --git a/ext/native/base/linked_ptr.h b/ext/native/base/linked_ptr.h deleted file mode 100644 index 7eec84eed6..0000000000 --- a/ext/native/base/linked_ptr.h +++ /dev/null @@ -1,60 +0,0 @@ -// From http://ootips.org/yonat/4dev/linked_ptr.h - -/* -* linked_ptr - simple reference linked pointer -* (like reference counting, just using a linked list of the references -* instead of their count.) -* -* The implementation stores three pointers for every linked_ptr, but -* does not allocate anything on the free store. -*/ - -#pragma once - -template class linked_ptr -{ -public: - explicit linked_ptr(X* p = 0) throw() : itsPtr(p) {itsPrev = itsNext = this;} - ~linked_ptr() {release();} - linked_ptr(const linked_ptr& r) throw() {acquire(r);} - - linked_ptr& operator=(const linked_ptr& r) - { - if (this != &r) { - release(); - acquire(r); - } - return *this; - } - - X& operator*() const throw() {return *itsPtr;} - X* operator->() const throw() {return itsPtr;} - X* get() const throw() {return itsPtr;} - bool unique() const throw() {return itsPrev ? itsPrev==this : true;} - -private: - X* itsPtr; - mutable const linked_ptr* itsPrev; - mutable const linked_ptr* itsNext; - - void acquire(const linked_ptr& r) throw() - { // insert this to the list - itsPtr = r.itsPtr; - itsNext = r.itsNext; - itsNext->itsPrev = this; - itsPrev = &r; - r.itsNext = this; - } - - void release() - { // erase this from the list, delete if unique - if (unique()) delete itsPtr; - else { - itsPrev->itsNext = itsNext; - itsNext->itsPrev = itsPrev; - itsPrev = itsNext = 0; - } - itsPtr = 0; - } -}; - diff --git a/ext/native/file/CMakeLists.txt b/ext/native/file/CMakeLists.txt deleted file mode 100644 index 6cb73d143a..0000000000 --- a/ext/native/file/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SRCS - chunk_file.cpp - zip_read.cpp - file_util.cpp - free.cpp) - -set(SRCS ${SRCS}) - -add_library(file STATIC ${SRCS}) -target_link_libraries(file general zip) - -if(UNIX) - add_definitions(-fPIC) -endif(UNIX) diff --git a/ext/native/file/file_util.cpp b/ext/native/file/file_util.cpp index 56f211bd57..0453cd5a88 100644 --- a/ext/native/file/file_util.cpp +++ b/ext/native/file/file_util.cpp @@ -19,7 +19,7 @@ #include #include "file/file_util.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Common/StringUtils.h" diff --git a/ext/native/file/free.cpp b/ext/native/file/free.cpp index fd458ae428..7c571d4a3d 100644 --- a/ext/native/file/free.cpp +++ b/ext/native/file/free.cpp @@ -17,7 +17,7 @@ #include #endif -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" bool free_disk_space(const std::string &dir, uint64_t &space) { #ifdef _WIN32 diff --git a/ext/native/file/ini_file.cpp b/ext/native/file/ini_file.cpp index b6dcf0d977..d0a5c71bf9 100644 --- a/ext/native/file/ini_file.cpp +++ b/ext/native/file/ini_file.cpp @@ -18,10 +18,10 @@ #include "file/ini_file.h" #include "file/vfs.h" -#include "util/text/parsers.h" +#include "Common/Data/Text/Parsers.h" #ifdef _WIN32 -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #endif #include "Common/StringUtils.h" diff --git a/ext/native/gfx/CMakeLists.txt b/ext/native/gfx/CMakeLists.txt deleted file mode 100644 index 19b9e236ed..0000000000 --- a/ext/native/gfx/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(SRCS - gl_debug_log.cpp - #gl_lost_manager.cpp - texture_atlas.cpp) - -set(SRCS ${SRCS}) - -add_library(gfx STATIC ${SRCS}) - -if(UNIX) - add_definitions(-fPIC) -endif(UNIX) diff --git a/ext/native/gfx_es2/CMakeLists.txt b/ext/native/gfx_es2/CMakeLists.txt deleted file mode 100644 index 75fbdd6ea8..0000000000 --- a/ext/native/gfx_es2/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -set(SRCS - draw_buffer.cpp - draw_text.cpp - glsl_program.cpp - gpu_features.cpp - gl_state.cpp) - -set(SRCS ${SRCS}) - -add_library(gfx_es2 STATIC ${SRCS}) -target_link_libraries(gfx_es2 general gfx) -target_link_libraries(gfx_es2 general file) - -if(UNIX) - add_definitions(-fPIC) -endif(UNIX) diff --git a/ext/native/gfx_es2/draw_buffer.cpp b/ext/native/gfx_es2/draw_buffer.cpp index 12307755f8..15ea08c217 100644 --- a/ext/native/gfx_es2/draw_buffer.cpp +++ b/ext/native/gfx_es2/draw_buffer.cpp @@ -9,8 +9,8 @@ #include "gfx/gl_debug_log.h" #include "gfx_es2/draw_buffer.h" #include "gfx_es2/draw_text.h" -#include "util/text/utf8.h" -#include "util/text/wrap_text.h" +#include "Common/Data/Encoding/Utf8.h" +#include "Common/Data/Text/WrapText.h" #include "Common/Log.h" #include "Common/StringUtils.h" diff --git a/ext/native/gfx_es2/draw_buffer.h b/ext/native/gfx_es2/draw_buffer.h index 001a91cd57..97edf9f3ca 100644 --- a/ext/native/gfx_es2/draw_buffer.h +++ b/ext/native/gfx_es2/draw_buffer.h @@ -5,7 +5,7 @@ #include #include -#include "base/colorutil.h" +#include "Common/Data/Color/RGBAUtil.h" #include "gfx/texture_atlas.h" #include "math/geom2d.h" #include "math/lin/matrix4x4.h" diff --git a/ext/native/gfx_es2/draw_text.cpp b/ext/native/gfx_es2/draw_text.cpp index 581ea31274..c8d5d374d1 100644 --- a/ext/native/gfx_es2/draw_text.cpp +++ b/ext/native/gfx_es2/draw_text.cpp @@ -1,8 +1,8 @@ #include "base/display.h" #include "thin3d/thin3d.h" -#include "util/hash/hash.h" -#include "util/text/wrap_text.h" -#include "util/text/utf8.h" +#include "Common/Data/Hash/Hash.h" +#include "Common/Data/Text/WrapText.h" +#include "Common/Data/Encoding/Utf8.h" #include "gfx_es2/draw_text.h" #include "gfx_es2/draw_text_win.h" #include "gfx_es2/draw_text_uwp.h" diff --git a/ext/native/gfx_es2/draw_text.h b/ext/native/gfx_es2/draw_text.h index 094ccdd28d..7ee06aad5f 100644 --- a/ext/native/gfx_es2/draw_text.h +++ b/ext/native/gfx_es2/draw_text.h @@ -14,7 +14,7 @@ #include #include "gfx_es2/draw_buffer.h" -#include "util/text/wrap_text.h" +#include "Common/Data/Text/WrapText.h" namespace Draw { class DrawContext; diff --git a/ext/native/gfx_es2/draw_text_android.cpp b/ext/native/gfx_es2/draw_text_android.cpp index 8a61ce8cb2..c824c0cd48 100644 --- a/ext/native/gfx_es2/draw_text_android.cpp +++ b/ext/native/gfx_es2/draw_text_android.cpp @@ -1,8 +1,8 @@ #include "base/display.h" #include "thin3d/thin3d.h" -#include "util/hash/hash.h" -#include "util/text/wrap_text.h" -#include "util/text/utf8.h" +#include "Common/Data/Hash/Hash.h" +#include "Common/Data/Text/WrapText.h" +#include "Common/Data/Encoding/Utf8.h" #include "gfx_es2/draw_text.h" #include "gfx_es2/draw_text_android.h" diff --git a/ext/native/gfx_es2/draw_text_qt.cpp b/ext/native/gfx_es2/draw_text_qt.cpp index 877e218ce7..f522e2c993 100644 --- a/ext/native/gfx_es2/draw_text_qt.cpp +++ b/ext/native/gfx_es2/draw_text_qt.cpp @@ -1,8 +1,8 @@ #include "base/display.h" #include "thin3d/thin3d.h" -#include "util/hash/hash.h" -#include "util/text/wrap_text.h" -#include "util/text/utf8.h" +#include "Common/Data/Hash/Hash.h" +#include "Common/Data/Text/WrapText.h" +#include "Common/Data/Encoding/Utf8.h" #include "gfx_es2/draw_text.h" #include "gfx_es2/draw_text_qt.h" diff --git a/ext/native/gfx_es2/draw_text_uwp.cpp b/ext/native/gfx_es2/draw_text_uwp.cpp index 3968767ee3..3171b01608 100644 --- a/ext/native/gfx_es2/draw_text_uwp.cpp +++ b/ext/native/gfx_es2/draw_text_uwp.cpp @@ -1,8 +1,8 @@ #include "base/display.h" #include "thin3d/thin3d.h" -#include "util/hash/hash.h" -#include "util/text/wrap_text.h" -#include "util/text/utf8.h" +#include "Common/Data/Hash/Hash.h" +#include "Common/Data/Text/WrapText.h" +#include "Common/Data/Encoding/Utf8.h" #include "gfx_es2/draw_text.h" #include "gfx_es2/draw_text_uwp.h" diff --git a/ext/native/gfx_es2/draw_text_win.cpp b/ext/native/gfx_es2/draw_text_win.cpp index 48315e5152..320d2968f3 100644 --- a/ext/native/gfx_es2/draw_text_win.cpp +++ b/ext/native/gfx_es2/draw_text_win.cpp @@ -1,8 +1,8 @@ #include "base/display.h" #include "thin3d/thin3d.h" -#include "util/hash/hash.h" -#include "util/text/wrap_text.h" -#include "util/text/utf8.h" +#include "Common/Data/Hash/Hash.h" +#include "Common/Data/Text/WrapText.h" +#include "Common/Data/Encoding/Utf8.h" #include "gfx_es2/draw_text.h" #include "gfx_es2/draw_text_win.h" diff --git a/ext/native/gfx_es2/gpu_features.h b/ext/native/gfx_es2/gpu_features.h index 4617e544a4..6f7dd50f54 100644 --- a/ext/native/gfx_es2/gpu_features.h +++ b/ext/native/gfx_es2/gpu_features.h @@ -5,7 +5,6 @@ #pragma once #include -#include "base/NativeApp.h" enum { GPU_VENDOR_NVIDIA = 1, diff --git a/ext/native/image/CMakeLists.txt b/ext/native/image/CMakeLists.txt deleted file mode 100644 index c835ef7134..0000000000 --- a/ext/native/image/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SRCS - png_load.cpp - zim_load.cpp - zim_save.cpp -) - -set(SRCS ${SRCS}) - -add_library(image STATIC ${SRCS}) - -if(UNIX) - add_definitions(-fPIC) -endif(UNIX) - diff --git a/ext/native/json/CMakeLists.txt b/ext/native/json/CMakeLists.txt deleted file mode 100644 index 9c3ec2f57f..0000000000 --- a/ext/native/json/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -set(SRCS - json_writer.cpp) - -set(SRCS ${SRCS}) - -add_library(jsonwriter STATIC ${SRCS}) - - - -add_executable(json_writer_test json_writer_test.cpp) -target_link_libraries(json_writer_test jsonwriter) - -if(UNIX) - add_definitions(-fPIC) -endif(UNIX) diff --git a/ext/native/json/json_writer_test.cpp b/ext/native/json/json_writer_test.cpp deleted file mode 100644 index 46875ac12b..0000000000 --- a/ext/native/json/json_writer_test.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "json/json_writer.h" -#include - -int main() { - JsonWriter j; - j.begin(); - j.pushDict("settings"); - j.writeInt("volume", 50); - j.writeInt("sound", 60); - j.pop(); - j.pushDict("user"); - j.writeFloat("level", 1.5); - j.writeString("name", "hello"); - j.pop(); - j.writeInt("outer", 3); - j.pushArray("ints"); - j.writeInt(3); - j.writeInt(4); - j.writeInt(6); - j.pop(); - j.writeString("yo!", "yo"); - j.end(); - std::cout << j.str(); - return 0; -} diff --git a/ext/native/math/CMakeLists.txt b/ext/native/math/CMakeLists.txt deleted file mode 100644 index 3d6e0daa52..0000000000 --- a/ext/native/math/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SRCS - lin/matrix4x4.cpp - lin/vec3.cpp - curves.cpp - math_util.cpp - ) - -set(SRCS ${SRCS}) - -add_library(lin STATIC ${SRCS}) - -if(UNIX) - add_definitions(-fPIC) -endif(UNIX) diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index 3bf1ea67e9..b5b4fe78b1 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -371,20 +371,13 @@ true - - - - - - - @@ -414,13 +407,11 @@ - - @@ -450,15 +441,8 @@ - - - - - - - true @@ -480,8 +464,6 @@ true true - - @@ -509,7 +491,6 @@ - @@ -524,7 +505,6 @@ - @@ -560,9 +540,6 @@ - - - diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index 44381c85cb..cfb2d16ef1 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -1,20 +1,10 @@  - - file - - - - base - tools - - ui - math\fast @@ -65,9 +55,6 @@ math - - base - json @@ -98,9 +85,6 @@ ui - - util - math @@ -110,12 +94,6 @@ gfx - - util - - - i18n - file @@ -134,18 +112,12 @@ ui - - data - math gfx - - util - gfx @@ -155,12 +127,6 @@ math\fast - - util - - - util - thin3d @@ -185,9 +151,6 @@ net - - util - gfx @@ -239,18 +202,12 @@ net - - data - thin3d ui - - util - gfx @@ -292,9 +249,6 @@ gfx - - base - json @@ -334,12 +288,6 @@ gfx - - util - - - i18n - file @@ -355,21 +303,12 @@ ui - - data - math gfx - - util - - - util - gfx @@ -415,9 +354,6 @@ net - - util - thin3d @@ -466,9 +402,6 @@ net - - data - thin3d @@ -504,21 +437,12 @@ {d738c2d1-749d-4b60-b98f-f3da0bbbf40c} - - {e36ca540-863c-496b-b0f4-b1ece3e72feb} - - - {d5fa3d62-88bf-4dc4-9814-28f3c0444e62} - {6a548b3d-3a4c-4114-aa2f-0b42bf7bf2ce} {4515306f-4664-46bf-a89b-abfec5520a15} - - {02e8ef95-82c7-4420-b029-a189a5e0fcbd} - {5ce64c0e-98e4-4411-86cc-aacaf2f60b21} diff --git a/ext/native/net/CMakeLists.txt b/ext/native/net/CMakeLists.txt deleted file mode 100644 index 10d69f4d51..0000000000 --- a/ext/native/net/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -set(SRCS - http_client.cpp - resolve.cpp) - -set(SRCS ${SRCS}) - -add_library(net STATIC ${SRCS}) - -if(UNIX) - add_definitions(-fPIC) -endif(UNIX) diff --git a/ext/native/net/http_client.cpp b/ext/native/net/http_client.cpp index f5a80ec17f..60c1ca8a90 100644 --- a/ext/native/net/http_client.cpp +++ b/ext/native/net/http_client.cpp @@ -20,12 +20,12 @@ #include #include -#include "data/compression.h" #include "file/fd_util.h" #include "net/resolve.h" #include "net/url.h" -#include "Common/Thread/ThreadUtil.h" +#include "Common/Thread/ThreadUtil.h" +#include "Common/Data/Encoding/Compression.h" #include "Common/Buffer.h" #include "Common/Log.h" diff --git a/ext/native/net/websocket_server.cpp b/ext/native/net/websocket_server.cpp index b769219f9c..60f41c2290 100644 --- a/ext/native/net/websocket_server.cpp +++ b/ext/native/net/websocket_server.cpp @@ -15,7 +15,7 @@ #include #endif -#include "data/base64.h" +#include "Common/Data/Encoding/Base64.h" #include "net/http_server.h" #include "net/sinks.h" #include "net/websocket_server.h" diff --git a/ext/native/profiler/CMakeLists.txt b/ext/native/profiler/CMakeLists.txt deleted file mode 100644 index f3f9673dac..0000000000 --- a/ext/native/profiler/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -set(SRCS - profiler.cpp -) - -# LGUIFileList.cpp - -add_library(profiler STATIC ${SRCS}) - -if(UNIX) - add_definitions(-fPIC) -endif(UNIX) diff --git a/ext/native/thin3d/GLQueueRunner.h b/ext/native/thin3d/GLQueueRunner.h index 031c17b06f..3737d13412 100644 --- a/ext/native/thin3d/GLQueueRunner.h +++ b/ext/native/thin3d/GLQueueRunner.h @@ -6,7 +6,7 @@ #include "gfx/gl_common.h" #include "thin3d/DataFormat.h" -#include "util/tiny_set.h" +#include "Common/Data/Collections/TinySet.h" struct GLRViewport { float x, y, w, h, minZ, maxZ; diff --git a/ext/native/thin3d/VulkanQueueRunner.h b/ext/native/thin3d/VulkanQueueRunner.h index e8daa6d599..d46efdb42d 100644 --- a/ext/native/thin3d/VulkanQueueRunner.h +++ b/ext/native/thin3d/VulkanQueueRunner.h @@ -6,7 +6,7 @@ #include "Common/Vulkan/VulkanContext.h" #include "math/dataconv.h" #include "thin3d/DataFormat.h" -#include "util/tiny_set.h" +#include "Common/Data/Collections/TinySet.h" class VKRFramebuffer; struct VKRImage; diff --git a/ext/native/thin3d/thin3d_d3d11.cpp b/ext/native/thin3d/thin3d_d3d11.cpp index 1457e79af1..1a5bc12d85 100644 --- a/ext/native/thin3d/thin3d_d3d11.cpp +++ b/ext/native/thin3d/thin3d_d3d11.cpp @@ -8,7 +8,7 @@ #endif #include "base/display.h" #include "math/dataconv.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "Common/ColorConv.h" diff --git a/ext/native/tools/atlastool.cpp b/ext/native/tools/atlastool.cpp index 4464861805..7207fcc093 100644 --- a/ext/native/tools/atlastool.cpp +++ b/ext/native/tools/atlastool.cpp @@ -46,7 +46,7 @@ // add kanjiFilter Array with KANJI_LEARNING_ORDER_ADDTIONAL. #define USE_KANJI KANJI_LEARNING_ORDER_ALL -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" using namespace std; static int global_id; diff --git a/ext/native/ui/CMakeLists.txt b/ext/native/ui/CMakeLists.txt deleted file mode 100644 index 016db5350c..0000000000 --- a/ext/native/ui/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -set(SRCS - ui.cpp - ui_context.cpp - view.cpp - viewgroup.cpp - screen.cpp - root.cpp -) - -set(SRCS ${SRCS}) - -add_library(ui STATIC ${SRCS}) - -if(UNIX) - add_definitions(-fPIC) -endif(UNIX) - diff --git a/ext/native/ui/screen.h b/ext/native/ui/screen.h index e6a1ae33d1..46f7261ddb 100644 --- a/ext/native/ui/screen.h +++ b/ext/native/ui/screen.h @@ -15,11 +15,10 @@ #include #include - -#include "base/NativeApp.h" -#include "Common/Input/InputState.h" +#include #include "Common/Common.h" +#include "Common/Input/InputState.h" namespace UI { class View; diff --git a/ext/native/ui/ui.cpp b/ext/native/ui/ui.cpp index f8ea4f574a..659aa5af5d 100644 --- a/ext/native/ui/ui.cpp +++ b/ext/native/ui/ui.cpp @@ -5,7 +5,7 @@ #include #include -#include "base/colorutil.h" +#include "Common/Data/Color/RGBAUtil.h" #include "ui/ui.h" #include "ui/ui_context.h" #include "gfx/texture_atlas.h" diff --git a/ext/native/ui/ui_screen.cpp b/ext/native/ui/ui_screen.cpp index 7a692f9bc2..0406ed271d 100644 --- a/ext/native/ui/ui_screen.cpp +++ b/ext/native/ui/ui_screen.cpp @@ -10,7 +10,7 @@ #include "ui/ui_context.h" #include "ui/screen.h" #include "ui/root.h" -#include "i18n/i18n.h" +#include "Common/Data/Text/I18n.h" #include "gfx_es2/draw_buffer.h" #include "Common/Log.h" diff --git a/ext/native/ui/ui_tween.cpp b/ext/native/ui/ui_tween.cpp index 4c3194d309..3263c0da70 100644 --- a/ext/native/ui/ui_tween.cpp +++ b/ext/native/ui/ui_tween.cpp @@ -1,4 +1,4 @@ -#include "base/colorutil.h" +#include "Common/Data/Color/RGBAUtil.h" #include "ui/ui_tween.h" #include "ui/view.h" #include "ui/viewgroup.h" diff --git a/ext/native/ui/view.cpp b/ext/native/ui/view.cpp index 7e261a5c7d..1f807d6b53 100644 --- a/ext/native/ui/view.cpp +++ b/ext/native/ui/view.cpp @@ -5,7 +5,7 @@ #include "Common/Input/KeyCodes.h" #include "gfx_es2/draw_buffer.h" #include "gfx/texture_atlas.h" -#include "util/text/utf8.h" +#include "Common/Data/Encoding/Utf8.h" #include "ui/ui.h" #include "ui/view.h" #include "ui/ui_context.h" diff --git a/ext/native/util/CMakeLists.txt b/ext/native/util/CMakeLists.txt deleted file mode 100644 index 9d632a0ad9..0000000000 --- a/ext/native/util/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(SRCS - hash/hash.cpp - text/utf8.cpp - text/wrap_text.cpp -) - -set(SRCS ${SRCS}) - -add_library(util STATIC ${SRCS}) - -if(UNIX) - add_definitions(-fPIC) -endif(UNIX) - diff --git a/libretro/LibretroVulkanContext.cpp b/libretro/LibretroVulkanContext.cpp index 906d8550cd..0f978e99b3 100644 --- a/libretro/LibretroVulkanContext.cpp +++ b/libretro/LibretroVulkanContext.cpp @@ -7,7 +7,7 @@ #include "Core/ConfigValues.h" #include "Core/System.h" #include "GPU/GPUInterface.h" -#include "util/text/parsers.h" +#include "Common/Data/Text/Parsers.h" #include "libretro/LibretroVulkanContext.h" #include "libretro/libretro_vulkan.h" diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 9a0f2ee842..145be50d2e 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -142,6 +142,16 @@ SOURCES_CXX += \ $(COMMONDIR)/Crypto/sha1.cpp \ $(COMMONDIR)/Crypto/sha256.cpp +SOURCES_CXX += \ + $(COMMONDIR)/Data/Color/RGBAUtil.cpp \ + $(COMMONDIR)/Data/Encoding/Base64.cpp \ + $(COMMONDIR)/Data/Encoding/Compression.cpp \ + $(COMMONDIR)/Data/Encoding/Utf8.cpp \ + $(COMMONDIR)/Data/Hash/Hash.cpp \ + $(COMMONDIR)/Data/Text/I18n.cpp \ + $(COMMONDIR)/Data/Text/Parsers.cpp \ + $(COMMONDIR)/Data/Text/WrapText.cpp \ + SOURCES_CXX += \ $(COMMONDIR)/Serialize/Serializer.cpp \ $(COMMONDIR)/Thread/Executor.cpp \ @@ -221,9 +231,7 @@ SOURCES_CXX += \ $(GPUDIR)/GLES/ShaderManagerGLES.cpp \ $(GPUDIR)/GLES/StateMappingGLES.cpp \ $(GPUDIR)/GLES/StencilBufferGLES.cpp \ - $(EXTDIR)/native/base/colorutil.cpp \ $(EXTDIR)/native/base/display.cpp \ - $(EXTDIR)/native/data/compression.cpp \ $(EXTDIR)/native/json/json_reader.cpp \ $(EXTDIR)/glslang/OGLCompilersDLL/InitializeDll.cpp \ $(EXTDIR)/glslang/glslang/GenericCodeGen/CodeGen.cpp \ @@ -298,7 +306,6 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \ $(NATIVEDIR)/gfx_es2/draw_text.cpp \ $(NATIVEDIR)/gfx_es2/gpu_features.cpp \ $(NATIVEDIR)/gfx_es2/glsl_program.cpp \ - $(NATIVEDIR)/i18n/i18n.cpp \ $(NATIVEDIR)/image/zim_load.cpp \ $(NATIVEDIR)/image/png_load.cpp \ $(NATIVEDIR)/math/curves.cpp \ @@ -321,10 +328,6 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \ $(NATIVEDIR)/ui/ui_tween.cpp \ $(NATIVEDIR)/ui/view.cpp \ $(NATIVEDIR)/ui/viewgroup.cpp \ - $(NATIVEDIR)/util/hash/hash.cpp \ - $(NATIVEDIR)/util/text/utf8.cpp \ - $(NATIVEDIR)/util/text/parsers.cpp \ - $(NATIVEDIR)/util/text/wrap_text.cpp \ $(EXTDIR)/jpge/jpgd.cpp \ $(EXTDIR)/jpge/jpge.cpp \ $(COREDIR)/AVIDump.cpp \ diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp index 74ce2a2dc1..43e947fe95 100644 --- a/unittest/UnitTest.cpp +++ b/unittest/UnitTest.cpp @@ -38,7 +38,7 @@ #include "Common/Input/InputState.h" #include "ext/disarm.h" #include "math/math_util.h" -#include "util/text/parsers.h" +#include "Common/Data/Text/Parsers.h" #include "Common/ArmEmitter.h" #include "Common/BitScan.h"