Move NativeApp.h to Common/System, split into NativeApp.h and System.h

Buildfix
This commit is contained in:
Henrik Rydgård 2020-10-04 10:30:18 +02:00
parent b7edf75437
commit f01ba6dc84
80 changed files with 289 additions and 246 deletions

View File

@ -814,7 +814,6 @@ if(ANDROID)
)
set(NativeAppSource ${NativeAppSource}
ext/native/base/NativeApp.h
android/jni/app-android.cpp
android/jni/AndroidEGLContext.cpp
android/jni/AndroidEGLContext.h

View File

@ -451,6 +451,9 @@
<ClInclude Include="StringUtils.h" />
<ClInclude Include="Swap.h" />
<ClInclude Include="SysError.h" />
<ClInclude Include="System\Display.h" />
<ClInclude Include="System\NativeApp.h" />
<ClInclude Include="System\System.h" />
<ClInclude Include="ThreadPools.h" />
<ClInclude Include="ThreadSafeList.h" />
<ClInclude Include="Thread\Executor.h" />
@ -722,6 +725,7 @@
<ClCompile Include="SysError.cpp" />
<ClCompile Include="OSVersion.cpp" />
<ClCompile Include="StringUtils.cpp" />
<ClCompile Include="System\Display.cpp" />
<ClCompile Include="ThreadPools.cpp" />
<ClCompile Include="Thread\Executor.cpp" />
<ClCompile Include="Thread\PrioritizedWorkQueue.cpp" />

View File

@ -229,6 +229,15 @@
<ClInclude Include="Profiler\Profiler.h">
<Filter>Profiler</Filter>
</ClInclude>
<ClInclude Include="System\Display.h">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="System\System.h">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="System\NativeApp.h">
<Filter>System</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ABI.cpp" />
@ -439,6 +448,9 @@
<ClCompile Include="Profiler\Profiler.cpp">
<Filter>Profiler</Filter>
</ClCompile>
<ClCompile Include="System\Display.cpp">
<Filter>System</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Crypto">

View File

@ -1,3 +1,5 @@
#include <cstring>
#include "Common/Log.h"
#include "Common/Data/Format/RIFF.h"

View File

@ -10,7 +10,6 @@
// otherwise the scheme breaks.
#include <string>
#include <cstdio>
#include <cstdint>
class RIFFReader {

View File

@ -27,11 +27,11 @@
#include <linux/ashmem.h>
#include <dlfcn.h>
#include "base/NativeApp.h"
#include "Common/Log.h"
#include "Common/MemoryUtil.h"
#include "Common/MemArena.h"
#include "Common/StringUtils.h"
#include "Common/System/System.h"
// Hopefully this ABI will never change...

View File

@ -21,9 +21,10 @@
#include <string>
#include "FileUtil.h"
#include "MemoryUtil.h"
#include "MemArena.h"
#include "Common/FileUtil.h"
#include "Common/MemoryUtil.h"
#include "Common/MemArena.h"
#include "Common/Log.h"
#include <sys/stat.h>
#include <fcntl.h>

View File

@ -2,7 +2,6 @@
#include <functional>
#include <string>
#include <vector>
// The Native App API.
//
@ -17,17 +16,6 @@ struct AxisInput;
class GraphicsContext;
enum SystemPermission {
SYSTEM_PERMISSION_STORAGE,
};
enum PermissionStatus {
PERMISSION_STATUS_UNKNOWN,
PERMISSION_STATUS_DENIED,
PERMISSION_STATUS_PENDING,
PERMISSION_STATUS_GRANTED,
};
// The first function to get called, just write strings to the two pointers.
// This might get called multiple times in some implementations, you must be able to handle that.
void NativeGetAppInfo(std::string *app_dir_name, std::string *app_nice_name, bool *landscape, std::string *version);
@ -101,89 +89,3 @@ void NativeSetMixer(void* mixer);
// Main thread.
void NativeShutdownGraphics();
void NativeShutdown();
// Calls back into Java / SDL
// These APIs must be implemented by every port (for example app-android.cpp, SDLMain.cpp).
// You are free to call these.
void SystemToast(const char *text);
void ShowKeyboard();
// Vibrate either takes a number of milliseconds to vibrate unconditionally,
// or you can specify these constants for "standard" feedback. On Android,
// these will only be performed if haptic feedback is enabled globally.
// Also, on Android, these will work even if you don't have the VIBRATE permission,
// while generic vibration will not if you don't have it.
enum {
HAPTIC_SOFT_KEYBOARD = -1,
HAPTIC_VIRTUAL_KEY = -2,
HAPTIC_LONG_PRESS_ACTIVATED = -3,
};
void Vibrate(int length_ms);
void OpenDirectory(const char *path);
void LaunchBrowser(const char *url);
void LaunchMarket(const char *url);
void LaunchEmail(const char *email_address);
void System_InputBoxGetString(const std::string &title, const std::string &defaultValue, std::function<void(bool, const std::string &)> cb);
void System_SendMessage(const char *command, const char *parameter);
PermissionStatus System_GetPermissionStatus(SystemPermission permission);
void System_AskForPermission(SystemPermission permission);
// This will get muddy with multi-screen support :/ But this will always be the type of the main device.
enum SystemDeviceType {
DEVICE_TYPE_MOBILE = 0, // phones and pads
DEVICE_TYPE_TV = 1, // Android TV and similar
DEVICE_TYPE_DESKTOP = 2, // Desktop computer
};
enum SystemProperty {
SYSPROP_NAME,
SYSPROP_LANGREGION,
SYSPROP_CPUINFO,
SYSPROP_BOARDNAME,
SYSPROP_CLIPBOARD_TEXT,
SYSPROP_GPUDRIVER_VERSION,
SYSPROP_HAS_FILE_BROWSER,
SYSPROP_HAS_IMAGE_BROWSER,
SYSPROP_HAS_BACK_BUTTON,
// Available as Int:
SYSPROP_SYSTEMVERSION,
SYSPROP_DISPLAY_XRES,
SYSPROP_DISPLAY_YRES,
SYSPROP_DISPLAY_REFRESH_RATE,
SYSPROP_DISPLAY_LOGICAL_DPI,
SYSPROP_DISPLAY_DPI,
SYSPROP_DISPLAY_COUNT,
SYSPROP_MOGA_VERSION,
// Float only:
SYSPROP_DISPLAY_SAFE_INSET_LEFT,
SYSPROP_DISPLAY_SAFE_INSET_RIGHT,
SYSPROP_DISPLAY_SAFE_INSET_TOP,
SYSPROP_DISPLAY_SAFE_INSET_BOTTOM,
SYSPROP_DEVICE_TYPE,
SYSPROP_APP_GOLD, // To avoid having #ifdef GOLD other than in main.cpp and similar.
// Exposed on Android. Choosing the optimal sample rate for audio
// will result in lower latencies. Buffer size is automatically matched
// by the OpenSL audio backend, only exposed here for debugging/info.
SYSPROP_AUDIO_SAMPLE_RATE,
SYSPROP_AUDIO_FRAMES_PER_BUFFER,
SYSPROP_AUDIO_OPTIMAL_SAMPLE_RATE,
SYSPROP_AUDIO_OPTIMAL_FRAMES_PER_BUFFER,
// Exposed on SDL.
SYSPROP_AUDIO_DEVICE_LIST,
SYSPROP_SUPPORTS_PERMISSIONS,
SYSPROP_SUPPORTS_SUSTAINED_PERF_MODE,
};
std::string System_GetProperty(SystemProperty prop);
int System_GetPropertyInt(SystemProperty prop);
float System_GetPropertyFloat(SystemProperty prop);
bool System_GetPropertyBool(SystemProperty prop);
std::vector<std::string> __cameraGetDeviceList();

101
Common/System/System.h Normal file
View File

@ -0,0 +1,101 @@
#pragma once
#include <string>
#include <vector>
#include <functional>
enum SystemPermission {
SYSTEM_PERMISSION_STORAGE,
};
enum PermissionStatus {
PERMISSION_STATUS_UNKNOWN,
PERMISSION_STATUS_DENIED,
PERMISSION_STATUS_PENDING,
PERMISSION_STATUS_GRANTED,
};
// These APIs must be implemented by every port (for example app-android.cpp, SDLMain.cpp).
// Ideally these should be safe to call from any thread.
void SystemToast(const char *text);
void ShowKeyboard();
// Vibrate either takes a number of milliseconds to vibrate unconditionally,
// or you can specify these constants for "standard" feedback. On Android,
// these will only be performed if haptic feedback is enabled globally.
// Also, on Android, these will work even if you don't have the VIBRATE permission,
// while generic vibration will not if you don't have it.
enum {
HAPTIC_SOFT_KEYBOARD = -1,
HAPTIC_VIRTUAL_KEY = -2,
HAPTIC_LONG_PRESS_ACTIVATED = -3,
};
void Vibrate(int length_ms);
void OpenDirectory(const char *path);
void LaunchBrowser(const char *url);
void LaunchMarket(const char *url);
void LaunchEmail(const char *email_address);
void System_InputBoxGetString(const std::string &title, const std::string &defaultValue, std::function<void(bool, const std::string &)> cb);
void System_SendMessage(const char *command, const char *parameter);
PermissionStatus System_GetPermissionStatus(SystemPermission permission);
void System_AskForPermission(SystemPermission permission);
// This will get muddy with multi-screen support :/ But this will always be the type of the main device.
enum SystemDeviceType {
DEVICE_TYPE_MOBILE = 0, // phones and pads
DEVICE_TYPE_TV = 1, // Android TV and similar
DEVICE_TYPE_DESKTOP = 2, // Desktop computer
};
enum SystemProperty {
SYSPROP_NAME,
SYSPROP_LANGREGION,
SYSPROP_CPUINFO,
SYSPROP_BOARDNAME,
SYSPROP_CLIPBOARD_TEXT,
SYSPROP_GPUDRIVER_VERSION,
SYSPROP_HAS_FILE_BROWSER,
SYSPROP_HAS_IMAGE_BROWSER,
SYSPROP_HAS_BACK_BUTTON,
// Available as Int:
SYSPROP_SYSTEMVERSION,
SYSPROP_DISPLAY_XRES,
SYSPROP_DISPLAY_YRES,
SYSPROP_DISPLAY_REFRESH_RATE,
SYSPROP_DISPLAY_LOGICAL_DPI,
SYSPROP_DISPLAY_DPI,
SYSPROP_DISPLAY_COUNT,
SYSPROP_MOGA_VERSION,
// Float only:
SYSPROP_DISPLAY_SAFE_INSET_LEFT,
SYSPROP_DISPLAY_SAFE_INSET_RIGHT,
SYSPROP_DISPLAY_SAFE_INSET_TOP,
SYSPROP_DISPLAY_SAFE_INSET_BOTTOM,
SYSPROP_DEVICE_TYPE,
SYSPROP_APP_GOLD, // To avoid having #ifdef GOLD other than in main.cpp and similar.
// Exposed on Android. Choosing the optimal sample rate for audio
// will result in lower latencies. Buffer size is automatically matched
// by the OpenSL audio backend, only exposed here for debugging/info.
SYSPROP_AUDIO_SAMPLE_RATE,
SYSPROP_AUDIO_FRAMES_PER_BUFFER,
SYSPROP_AUDIO_OPTIMAL_SAMPLE_RATE,
SYSPROP_AUDIO_OPTIMAL_FRAMES_PER_BUFFER,
// Exposed on SDL.
SYSPROP_AUDIO_DEVICE_LIST,
SYSPROP_SUPPORTS_PERMISSIONS,
SYSPROP_SUPPORTS_SUSTAINED_PERF_MODE,
};
std::string System_GetProperty(SystemProperty prop);
int System_GetPropertyInt(SystemProperty prop);
float System_GetPropertyFloat(SystemProperty prop);
bool System_GetPropertyBool(SystemProperty prop);
std::vector<std::string> __cameraGetDeviceList();

View File

@ -21,7 +21,7 @@
#include <cstring>
#include "Common/Log.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#ifndef _WIN32
#include <dlfcn.h>

View File

@ -24,8 +24,6 @@
#include "ppsspp_config.h"
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "gfx_es2/gpu_features.h"
#include "net/http_client.h"
#include "net/url.h"
@ -39,6 +37,8 @@
#include "Common/FileUtil.h"
#include "Common/LogManager.h"
#include "Common/OSVersion.h"
#include "Common/System/Display.h"
#include "Common/System/System.h"
#include "Common/StringUtils.h"
#include "Common/Vulkan/VulkanLoader.h"
#include "Core/Config.h"

View File

@ -22,7 +22,8 @@
#include <mutex>
#include <condition_variable>
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/System/Display.h"
#include "Common/TimeUtil.h"
#include "Common/Thread/ThreadUtil.h"

View File

@ -16,12 +16,14 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <algorithm>
#include "base/NativeApp.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Math/math_util.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Common/System/System.h"
#include "Common/Serialize/Serializer.h"
#include "Core/Dialog/PSPOskDialog.h"
#include "Core/Util/PPGeDraw.h"
#include "Core/HLE/sceCtrl.h"
@ -29,7 +31,6 @@
#include "Core/HLE/sceUtility.h"
#include "Core/Config.h"
#include "Core/Reporting.h"
#include "Common/Serialize/Serializer.h"
#include "GPU/GPUState.h"
#ifndef _WIN32

View File

@ -26,12 +26,11 @@
#include <sys/time.h>
#endif
#include "Common/Data/Text/I18n.h"
#include "Common/Profiler/Profiler.h"
#include "base/NativeApp.h"
#include "gfx_es2/gpu_features.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Profiler/Profiler.h"
#include "Common/System/System.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Common/Serialize/SerializeMap.h"

View File

@ -20,7 +20,7 @@
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/HLE/HLE.h"

View File

@ -16,7 +16,8 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <ctime>
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Serialize/SerializeFuncs.h"
#include "Core/HLE/HLE.h"

View File

@ -35,7 +35,7 @@
#include <cstring>
#include <atomic>
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "Common/MathUtil.h"
#include "Common/Serialize/Serializer.h"
#include "Common/Log.h"

View File

@ -26,7 +26,8 @@
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Data/Format/IniFile.h"
#include "Common/Input/InputState.h"
#include "Common/Log.h"

View File

@ -32,7 +32,7 @@
#include <mutex>
#include <condition_variable>
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Math/math_util.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/Data/Encoding/Utf8.h"

View File

@ -19,10 +19,10 @@
#include <set>
#include <cstdint>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "thin3d/thin3d.h"
#include "Common/System/Display.h"
#include "Common/System/System.h"
#include "Common/File/VFS/VFS.h"
#include "Common/Log.h"
#include "Common/TimeUtil.h"

View File

@ -39,7 +39,7 @@
#include "Common/Log.h"
#include "Common/Serialize/Serializer.h"
#include "Common/GraphicsContext.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Profiler/Profiler.h"
#include "Common/Data/Text/I18n.h"
#include "Core/Debugger/Breakpoints.h"

View File

@ -19,7 +19,7 @@
#include "Common/Serialize/Serializer.h"
#include "Common/GraphicsContext.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Profiler/Profiler.h"
#include "Common/Data/Text/I18n.h"
#include "Core/Debugger/Breakpoints.h"

View File

@ -31,7 +31,8 @@
#include "SDL_audio.h"
#endif
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "gfx_es2/gpu_features.h"
#include "Common/Math/math_util.h"

View File

@ -24,7 +24,8 @@ QTM_USE_NAMESPACE
#include "Common/System/Display.h"
#include "Common/TimeUtil.h"
#include "file/zip_read.h"
#include "Common/File/VFS/VFS.h"
#include "Common/File/VFS/AssetReader.h"
#include "gfx/gl_common.h"
#include "gfx_es2/gpu_features.h"
#include "Common/Input/InputState.h"

View File

@ -8,7 +8,8 @@
#include <QMessageBox>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Core/MIPS/MIPSDebugInterface.h"
#include "Core/Debugger/SymbolMap.h"
#include "Core/HLE/sceUmd.h"

View File

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

View File

@ -1,12 +1,16 @@
#include <vector>
#include "SDLGLGraphicsContext.h"
#include "gfx_es2/gpu_features.h"
#include "thin3d/thin3d_create.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/System/Display.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Core/System.h"
#include "base/NativeApp.h"
#include "Common/System/Display.h"
#include "gfx_es2/gpu_features.h"
#include "thin3d/thin3d_create.h"
#if defined(USING_EGL)
#include "EGL/egl.h"

View File

@ -1,7 +1,8 @@
#include <iostream>
#include <string>
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/File/VFS/VFS.h"
#include "Common/FileUtil.h"

View File

@ -21,7 +21,8 @@ SDLJoystick *joystick = NULL;
#include <locale>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "Common/System/NativeApp.h"
#include "ext/glslang/glslang/Public/ShaderLang.h"
#include "image/png_load.h"
#include "net/resolve.h"

View File

@ -1,6 +1,7 @@
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "Common/System/NativeApp.h"
#include "Common/System/Display.h"
#include "thin3d/thin3d.h"
#include "thin3d/thin3d_create.h"
@ -154,4 +155,4 @@ void SDLVulkanGraphicsContext::Poll() {
if (vulkan_->GetSwapchain() && renderManager_->NeedsSwapchainRecreate()) {
Resize();
}
}
}

View File

@ -1,7 +1,6 @@
#include <ctype.h>
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "ui/root.h"
#include "ui/ui_context.h"
#include "ui/view.h"
@ -10,6 +9,7 @@
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/System/System.h"
#include "Core/Config.h"
#include "Core/System.h"
#include "Core/HLE/proAdhoc.h"

View File

@ -19,8 +19,6 @@
#include <deque>
#include <mutex>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "gfx/texture_atlas.h"
#include "ui/root.h"
#include "ui/ui.h"
@ -28,11 +26,13 @@
#include "ui/view.h"
#include "ui/viewgroup.h"
#include "Common/Log.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/System/Display.h"
#include "Common/System/System.h"
#include "Core/KeyMap.h"
#include "Core/Host.h"
#include "Core/HLE/sceCtrl.h"

View File

@ -15,7 +15,6 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "base/NativeApp.h"
#include "ext/xxhash.h"
#include "ui/ui.h"
@ -23,6 +22,7 @@
#include "Common/Data/Encoding/Utf8.h"
#include "Common/FileUtil.h"
#include "Common/StringUtils.h"
#include "Common/System/System.h"
#include "Core/Core.h"
#include "Core/Config.h"
#include "Core/CwCheat.h"

View File

@ -19,7 +19,8 @@
#include "ppsspp_config.h"
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "gfx_es2/gpu_features.h"
#include "Common/Data/Text/I18n.h"
#include "ui/ui_context.h"

View File

@ -19,7 +19,7 @@
#include <vector>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "gfx/texture_atlas.h"
#include "gfx_es2/draw_buffer.h"
#include "ui/ui_context.h"

View File

@ -19,15 +19,10 @@
#include <algorithm>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/Profiler/Profiler.h"
#include "gfx/texture_atlas.h"
#include "gfx_es2/gpu_features.h"
#include "gfx_es2/draw_text.h"
#include "Common/Math/curves.h"
#include "ui/root.h"
#include "ui/ui.h"
#include "ui/ui_context.h"
@ -37,6 +32,11 @@
#include "Common/Data/Text/I18n.h"
#include "Common/Input/InputState.h"
#include "Common/Log.h"
#include "Common/System/Display.h"
#include "Common/System/System.h"
#include "Common/System/NativeApp.h"
#include "Common/Profiler/Profiler.h"
#include "Common/Math/curves.h"
#include "Common/TimeUtil.h"
#ifndef MOBILE_DEVICE

View File

@ -19,7 +19,6 @@
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "gfx_es2/draw_buffer.h"
#include "ui/ui_context.h"
#include "ui/view.h"
@ -28,6 +27,8 @@
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/FileUtil.h"
#include "Common/System/System.h"
#include "Common/System/NativeApp.h"
#include "Core/Host.h"
#include "Core/Config.h"
#include "Core/System.h"

View File

@ -19,20 +19,21 @@
#include <algorithm>
#include "Common/System/Display.h" // Only to check screen aspect ratio with pixel_yres/pixel_xres
#include "base/NativeApp.h"
#include "Common/Data/Color/RGBAUtil.h"
#include "Common/Math/curves.h"
#include "net/resolve.h"
#include "gfx_es2/gpu_features.h"
#include "gfx_es2/draw_buffer.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"
#include "ui/ui_context.h"
#include "Common/System/Display.h" // Only to check screen aspect ratio with pixel_yres/pixel_xres
#include "Common/System/System.h"
#include "Common/System/NativeApp.h"
#include "Common/Data/Color/RGBAUtil.h"
#include "Common/Math/curves.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "UI/EmuScreen.h"
#include "UI/GameSettingsScreen.h"
#include "UI/GameInfoCache.h"

View File

@ -19,7 +19,7 @@
#include "Common/Data/Color/RGBAUtil.h"
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "gfx/texture_atlas.h"
#include "Common/Math/math_util.h"
#include "ui/ui_context.h"

View File

@ -21,7 +21,7 @@
#include "ppsspp_config.h"
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "gfx/texture_atlas.h"
#include "gfx_es2/draw_buffer.h"
#include "ui/root.h"

View File

@ -20,14 +20,16 @@
#include <algorithm>
#include <functional>
#include "base/NativeApp.h"
#include "Common/System/Display.h"
#include "gfx_es2/draw_buffer.h"
#include "Common/Math/curves.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "ui/viewgroup.h"
#include "ui/ui.h"
#include "Common/System/Display.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Math/curves.h"
#include "Common/File/VFS/VFS.h"
#include "Common/Data/Color/RGBAUtil.h"

View File

@ -43,27 +43,27 @@
#include "Windows/CaptureDevice.h"
#endif
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "net/http_client.h"
#include "net/resolve.h"
#include "gfx/texture_atlas.h"
#include "gfx_es2/draw_text.h"
#include "gfx_es2/gpu_features.h"
#include "thin3d/thin3d.h"
#include "ui/ui.h"
#include "ui/screen.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "android/jni/app-android.h"
#include "Common/System/Display.h"
#include "Common/System/System.h"
#include "Common/System/NativeApp.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Input/InputState.h"
#include "Common/Math/fast/fast_math.h"
#include "Common/Math/math_util.h"
#include "Common/Math/lin/matrix4x4.h"
#include "Common/Profiler/Profiler.h"
#include "thin3d/thin3d.h"
#include "ui/ui.h"
#include "ui/screen.h"
#include "ui/ui_context.h"
#include "ui/view.h"
#include "android/jni/app-android.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/File/VFS/VFS.h"
#include "Common/File/VFS/AssetReader.h"

View File

@ -18,7 +18,6 @@
#include <algorithm>
#include <memory>
#include "base/NativeApp.h"
#include "gfx_es2/draw_buffer.h"
#include "ui/view.h"
#include "ui/viewgroup.h"
@ -28,19 +27,19 @@
#include "Common/Data/Text/I18n.h"
#include "Common/StringUtils.h"
#include "Common/System/System.h"
#include "Core/Reporting.h"
#include "Core/SaveState.h"
#include "Core/System.h"
#include "Core/Config.h"
#include "Core/ELF/ParamSFO.h"
#include "Core/HLE/sceDisplay.h"
#include "Core/HLE/sceUmd.h"
#include "GPU/GPUCommon.h"
#include "GPU/GPUState.h"
#include "Core/HLE/sceDisplay.h"
#include "Core/HLE/sceUmd.h"
#include "UI/PauseScreen.h"
#include "UI/GameSettingsScreen.h"
#include "UI/ReportScreen.h"

View File

@ -25,7 +25,6 @@
#include <netfw.h>
#endif
#include "base/NativeApp.h"
// TODO: For text align flags, probably shouldn't be in gfx_es2/...
#include "gfx_es2/draw_buffer.h"
#include "net/http_client.h"
@ -38,6 +37,7 @@
#include "Common/Common.h"
#include "Common/TimeUtil.h"
#include "Common/StringUtils.h"
#include "Common/System/System.h"
#include "Core/Config.h"
#include "Core/WebServer.h"
#include "UI/RemoteISOScreen.h"

View File

@ -17,8 +17,6 @@
#include <string>
#include "Common/System/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 "thin3d/thin3d.h"
@ -30,6 +28,8 @@
#include "Common/FileUtil.h"
#include "Common/Log.h"
#include "Common/StringUtils.h"
#include "Common/System/Display.h"
#include "Common/System/System.h"
#include "Core/Core.h"
#include "Core/Reporting.h"
#include "Core/Screenshot.h"

View File

@ -5,8 +5,9 @@
#include <mutex>
#include "base/NativeApp.h"
#include "Common/Input/InputState.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Core/System.h"
#include "Core/Core.h"

View File

@ -454,6 +454,8 @@
<ClInclude Include="..\..\Common\Swap.h" />
<ClInclude Include="..\..\Common\SysError.h" />
<ClInclude Include="..\..\Common\System\Display.h" />
<ClInclude Include="..\..\Common\System\NativeApp.h" />
<ClInclude Include="..\..\Common\System\System.h" />
<ClInclude Include="..\..\Common\ThreadPools.h" />
<ClInclude Include="..\..\Common\ThreadSafeList.h" />
<ClInclude Include="..\..\Common\Thread\Executor.h" />

View File

@ -446,6 +446,12 @@
<ClInclude Include="..\..\Common\System\Display.h">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\..\Common\System\NativeApp.h">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\..\Common\System\System.h">
<Filter>System</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="..\..\ext\libpng17\CMakeLists.txt">

View File

@ -379,8 +379,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\ext\native\base\display.h" />
<ClInclude Include="..\..\ext\native\base\NativeApp.h" />
<ClInclude Include="..\..\ext\native\file\fd_util.h" />
<ClInclude Include="..\..\ext\native\file\file_util.h" />
<ClInclude Include="..\..\ext\native\gfx_es2\draw_text_uwp.h" />
@ -410,7 +408,6 @@
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\ext\native\base\display.cpp" />
<ClCompile Include="..\..\ext\native\file\fd_util.cpp" />
<ClCompile Include="..\..\ext\native\file\file_util.cpp" />
<ClCompile Include="..\..\ext\native\gfx_es2\draw_text_uwp.cpp" />

View File

@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="base">
<UniqueIdentifier>{903dae00-880d-4c12-bd10-29fca750376f}</UniqueIdentifier>
</Filter>
<Filter Include="thin3d">
<UniqueIdentifier>{98343696-3517-451a-9b47-94d462263e3e}</UniqueIdentifier>
</Filter>
@ -25,9 +22,6 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="pch.cpp" />
<ClCompile Include="..\..\ext\native\base\display.cpp">
<Filter>base</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\thin3d\thin3d.cpp">
<Filter>thin3d</Filter>
</ClCompile>
@ -110,12 +104,6 @@
<ItemGroup>
<ClInclude Include="pch.h" />
<ClInclude Include="targetver.h" />
<ClInclude Include="..\..\ext\native\base\display.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\base\NativeApp.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\thin3d\thin3d.h">
<Filter>thin3d</Filter>
</ClInclude>

View File

@ -3,11 +3,9 @@
#include <mutex>
#include "base/NativeApp.h"
#include "file/file_util.h"
#include "net/http_client.h"
#include "net/resolve.h"
#include "Common/System/Display.h"
#include "thin3d/thin3d_create.h"
#include "Common/Common.h"
@ -22,6 +20,9 @@
#include "Common/LogManager.h"
#include "Common/TimeUtil.h"
#include "Common/StringUtils.h"
#include "Common/System/Display.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Core/System.h"
#include "Core/Loaders.h"

View File

@ -20,7 +20,8 @@
#include <algorithm>
#include "file/file_util.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Input/InputState.h"
#include "Common/StringUtils.h"

View File

@ -24,7 +24,7 @@
#include "DinputDevice.h"
#include "Core/Config.h"
#include "Common/Input/InputState.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/Input/KeyCodes.h"
#include "Core/Reporting.h"
#include "Xinput.h"

View File

@ -2,15 +2,17 @@
#include <atomic>
#include <thread>
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Input/InputState.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Log.h"
#include "Common/StringUtils.h"
#include "Common/GraphicsContext.h"
#include "Common/TimeUtil.h"
#include "Common/Thread/ThreadUtil.h"
#include "Windows/EmuThread.h"
#include "Windows/W32Util/Misc.h"
#include "Windows/MainWindow.h"
@ -23,7 +25,6 @@
#include "Core/System.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Common/Thread/ThreadUtil.h"
enum class EmuThreadState {
DISABLED,

View File

@ -32,7 +32,8 @@
#include <string>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/TimeUtil.h"
#include "Common/StringUtils.h"
#include "Common/Data/Text/I18n.h"

View File

@ -7,11 +7,12 @@
#include "resource.h"
#include "gfx_es2/gpu_features.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "base/NativeApp.h"
#include "gfx_es2/gpu_features.h"
#include "Common/System/System.h"
#include "Common/System/NativeApp.h"
#include "Common/FileUtil.h"
#include "Common/Log.h"
#include "Common/LogManager.h"

View File

@ -19,7 +19,7 @@
#include <algorithm>
#include <vector>
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/Display.h"
#include "Common/Input/InputState.h"
#include "Common/Log.h"

View File

@ -5,7 +5,7 @@
#include <algorithm>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/CommonWindows.h"
#include "Common/CommonFuncs.h"

View File

@ -33,7 +33,7 @@
// native stuff
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "file/file_util.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"

View File

@ -3,7 +3,7 @@
#include <climits>
#include <algorithm>
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Core/Config.h"
#include "Common/CommonWindows.h"
#include "Common/Log.h"

View File

@ -32,7 +32,8 @@
#include <mmsystem.h>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/File/VFS/VFS.h"
#include "Common/File/VFS/AssetReader.h"
#include "Common/Data/Text/I18n.h"

View File

@ -5,7 +5,7 @@ copy ..\assets\langregion.ini assets\langregion.ini
copy ..\assets\compat.ini assets\compat.ini
copy ..\assets\Roboto-Condensed.ttf assets\Roboto-Condensed.ttf
copy ..\assets\*.png assets\
REM SET NDK=C:\Android\sdk\ndk\21.3.6528147
SET NDK=C:\Android\ndk
SET NDK=C:\Android\sdk\ndk\21.3.6528147
REM SET NDK=C:\Android\ndk
SET NDK_MODULE_PATH=..\ext;..\ext\native\ext
%NDK%/ndk-build -j32 %*

View File

@ -1,8 +1,8 @@
#include "base/NativeApp.h"
#include "gfx_es2/gpu_features.h"
#include "thin3d/thin3d_create.h"
#include "Common/Log.h"
#include "Common/System/System.h"
#include "AndroidEGLContext.h"
#include "GL/GLInterface/EGLAndroid.h"
#include "Core/ConfigValues.h"

View File

@ -1,6 +1,5 @@
#include "AndroidJavaGLContext.h"
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "gfx_es2/gpu_features.h"
#include "Common/Log.h"
#include "Core/ConfigValues.h"

View File

@ -1,6 +1,7 @@
#include "AndroidVulkanContext.h"
#include "base/NativeApp.h"
#include "Common/System/Display.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Log.h"
#include "Common/Vulkan/VulkanContext.h"
#include "Common/Vulkan/VulkanDebug.h"

View File

@ -49,8 +49,14 @@ struct JNIEnv {};
#define JNI_VERSION_1_6 16
#endif
#include "net/resolve.h"
#include "android/jni/AndroidAudio.h"
#include "gfx/gl_common.h"
#include "gfx_es2/gpu_features.h"
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Thread/ThreadUtil.h"
#include "Common/File/VFS/VFS.h"
#include "Common/File/VFS/AssetReader.h"
@ -58,11 +64,7 @@ struct JNIEnv {};
#include "Common/Input/KeyCodes.h"
#include "Common/Profiler/Profiler.h"
#include "Common/Math/math_util.h"
#include "net/resolve.h"
#include "Common/Data/Text/Parsers.h"
#include "android/jni/AndroidAudio.h"
#include "gfx/gl_common.h"
#include "gfx_es2/gpu_features.h"
#include "Common/Log.h"
#include "Common/GraphicsContext.h"

View File

@ -364,7 +364,6 @@
<None Include="tools\CMakeLists.txt" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="base\NativeApp.h" />
<ClInclude Include="file\fd_util.h" />
<ClInclude Include="file\file_util.h" />
<ClInclude Include="gfx\d3d9_shader.h" />

View File

@ -31,9 +31,6 @@
<ClInclude Include="file\file_util.h">
<Filter>file</Filter>
</ClInclude>
<ClInclude Include="base\NativeApp.h">
<Filter>base</Filter>
</ClInclude>
<ClInclude Include="ui\ui.h">
<Filter>ui</Filter>
</ClInclude>
@ -296,9 +293,6 @@
<Filter Include="file">
<UniqueIdentifier>{49afd06e-eb44-41ac-b038-e109e444a834}</UniqueIdentifier>
</Filter>
<Filter Include="base">
<UniqueIdentifier>{95e41110-57a2-497f-a938-b4c8e9dd6a27}</UniqueIdentifier>
</Filter>
<Filter Include="ui">
<UniqueIdentifier>{d738c2d1-749d-4b60-b98f-f3da0bbbf40c}</UniqueIdentifier>
</Filter>

View File

@ -3,7 +3,7 @@
#include <algorithm>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "ui/ui.h"
#include "ui/view.h"
#include "ui/ui_context.h"

View File

@ -12,8 +12,7 @@
#include "ui/ui_tween.h"
#include "ui/root.h"
#include "thin3d/thin3d.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "Common/TimeUtil.h"
#include "Common/StringUtils.h"

View File

@ -9,8 +9,9 @@
#include <jni.h>
#endif
#include "base/NativeApp.h"
#include "Common/Profiler/Profiler.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/File/VFS/VFS.h"
#include "Common/File/VFS/AssetReader.h"

View File

@ -23,11 +23,11 @@
#include "headless/SDLHeadlessHost.h"
#include "gfx/gl_common.h"
#include "gfx_es2/gpu_features.h"
#include "Common/File/VFS/VFS.h"
#include "file/zip_read.h"
#include "thin3d/thin3d_create.h"
#include "thin3d/GLRenderManager.h"
#include "Common/File/VFS/VFS.h"
#include "Common/File/VFS/AssetReader.h"
#include "Common/Log.h"
#include "Common/FileUtil.h"
#include "Common/GraphicsContext.h"

View File

@ -1,6 +1,7 @@
#import "AppDelegate.h"
#import "ViewController.h"
#import "base/NativeApp.h"
#import "Common/System/System.h"
#import "Common/System/NativeApp.h"
#import "Core/System.h"
#import "Core/Config.h"
#import "Common/Log.h"

View File

@ -9,7 +9,8 @@
#import "ViewController.h"
#import "AppDelegate.h"
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "Common/System/NativeApp.h"
#include "Core/System.h"
#import <AVFoundation/AVFoundation.h>

View File

@ -13,9 +13,11 @@
#import <GLKit/GLKit.h>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "Common/System/System.h"
#include "Common/System/NativeApp.h"
#include "Common/TimeUtil.h"
#include "file/zip_read.h"
#include "Common/VFS/VFS.h"
#include "Common/VFS/AssetReader.h"
#include "Common/Input/InputState.h"
#include "net/resolve.h"
#include "ui/screen.h"

View File

@ -12,9 +12,6 @@
#import <GLKit/GLKit.h>
#include <cassert>
#include "Common/System/Display.h"
#include "base/NativeApp.h"
#include "file/zip_read.h"
#include "net/resolve.h"
#include "ui/screen.h"
#include "thin3d/thin3d.h"
@ -22,11 +19,16 @@
#include "thin3d/GLRenderManager.h"
#include "gfx_es2/gpu_features.h"
#include "Common/System/Display.h"
#include "Common/System/System.h"
#include "Common/System/NativeApp.h"
#include "Common/VFS/VFS.h"
#include "Common/Log.h"
#include "Common/TimeUtil.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "Common/GraphicsContext.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Core/System.h"

View File

@ -14,7 +14,8 @@
#import "PPSSPPUIApplication.h"
#import "ViewController.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Profiler/Profiler.h"
#define CS_OPS_STATUS 0 /* return status */

View File

@ -5,11 +5,11 @@
#include <vector>
#include <cstdlib>
#include "base/NativeApp.h"
#include "Common/Log.h"
#include "Common/LogManager.h"
#include "Common/System/Display.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/TimeUtil.h"
#include "Common/FileUtil.h"
#include "Common/Serialize/Serializer.h"

View File

@ -18,7 +18,9 @@
#include <algorithm>
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/TimeUtil.h"
#include "Core/ConfigValues.h"
#include "Core/MIPS/JitCommon/JitCommon.h"

View File

@ -34,10 +34,11 @@
#endif
#include "ppsspp_config.h"
#include "base/NativeApp.h"
#include "Common/System/NativeApp.h"
#include "Common/System/System.h"
#include "Common/Input/InputState.h"
#include "ext/disarm.h"
#include "math/math_util.h"
#include "Common/Math/math_util.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/ArmEmitter.h"