From e0f85a9c6b66d2dc88548dee340c1391c189acd9 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 6 Sep 2015 12:19:33 -0700 Subject: [PATCH] Native merge part 1: skip native/ in includes. --- Core/Debugger/DebugInterface.h | 2 +- Core/Debugger/SymbolMap.h | 2 +- Core/Dialog/PSPSaveDialog.cpp | 4 ++-- Core/Dialog/PSPSaveDialog.h | 4 ++-- Core/FileSystems/MetaFileSystem.h | 2 +- Core/HLE/sceIo.cpp | 4 ++-- Core/HLE/sceJpeg.cpp | 2 +- Core/HLE/sceKernelModule.cpp | 2 +- Core/HW/AsyncIOManager.h | 2 +- Core/System.cpp | 6 +++--- Core/ThreadEventQueue.h | 2 +- GPU/Common/TextureScalerCommon.cpp | 2 +- GPU/GPUCommon.cpp | 4 ++-- UI/BackgroundAudio.cpp | 2 +- UI/TiltEventProcessor.cpp | 2 +- Windows/DSoundStream.cpp | 2 +- Windows/OpenGLBase.cpp | 4 ++-- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Core/Debugger/DebugInterface.h b/Core/Debugger/DebugInterface.h index e356194269..0b98e1d512 100644 --- a/Core/Debugger/DebugInterface.h +++ b/Core/Debugger/DebugInterface.h @@ -19,7 +19,7 @@ #include #include #include "Common/CommonTypes.h" -#include "native/math/expression_parser.h" +#include "math/expression_parser.h" struct MemMap; diff --git a/Core/Debugger/SymbolMap.h b/Core/Debugger/SymbolMap.h index 17caa3024a..62d519581e 100644 --- a/Core/Debugger/SymbolMap.h +++ b/Core/Debugger/SymbolMap.h @@ -22,7 +22,7 @@ #include #include -#include "native/base/mutex.h" +#include "base/mutex.h" #include "Common/CommonTypes.h" diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index 3c67ed2a86..7dffb590b5 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -16,8 +16,8 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "i18n/i18n.h" -#include "native/thread/thread.h" -#include "native/thread/threadutil.h" +#include "thread/thread.h" +#include "thread/threadutil.h" #include "Common/ChunkFile.h" diff --git a/Core/Dialog/PSPSaveDialog.h b/Core/Dialog/PSPSaveDialog.h index 6eea72d461..94a6d229f5 100644 --- a/Core/Dialog/PSPSaveDialog.h +++ b/Core/Dialog/PSPSaveDialog.h @@ -17,8 +17,8 @@ #pragma once -#include "native/thread/thread.h" -#include "native/base/mutex.h" +#include "thread/thread.h" +#include "base/mutex.h" #include "Core/Dialog/PSPDialog.h" #include "Core/Dialog/SavedataParam.h" diff --git a/Core/FileSystems/MetaFileSystem.h b/Core/FileSystems/MetaFileSystem.h index 5990abded4..b534a1d697 100644 --- a/Core/FileSystems/MetaFileSystem.h +++ b/Core/FileSystems/MetaFileSystem.h @@ -17,7 +17,7 @@ #pragma once -#include "native/base/mutex.h" +#include "base/mutex.h" #include "Core/FileSystems/FileSystem.h" class MetaFileSystem : public IHandleAllocator, public IFileSystem diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index 10a14abb7b..685d732ce7 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -18,8 +18,8 @@ #include #include -#include "native/thread/thread.h" -#include "native/thread/threadutil.h" +#include "thread/thread.h" +#include "thread/threadutil.h" #include "profiler/profiler.h" #include "Core/Core.h" diff --git a/Core/HLE/sceJpeg.cpp b/Core/HLE/sceJpeg.cpp index 48f2967e63..4291c9144a 100644 --- a/Core/HLE/sceJpeg.cpp +++ b/Core/HLE/sceJpeg.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 "native/ext/jpge/jpgd.h" +#include "ext/jpge/jpgd.h" #include "Common/Common.h" #include "Common/ChunkFile.h" diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index f0663212b5..cbdd4d9097 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -19,7 +19,7 @@ #include #include -#include "native/base/stringutil.h" +#include "base/stringutil.h" #include "Common/ChunkFile.h" #include "Common/FileUtil.h" #include "Core/Config.h" diff --git a/Core/HW/AsyncIOManager.h b/Core/HW/AsyncIOManager.h index c2ebb68166..09c9883de4 100644 --- a/Core/HW/AsyncIOManager.h +++ b/Core/HW/AsyncIOManager.h @@ -17,7 +17,7 @@ #include #include -#include "native/base/mutex.h" +#include "base/mutex.h" #include "Core/ThreadEventQueue.h" class NoBase { diff --git a/Core/System.cpp b/Core/System.cpp index e085f33126..f884d26f99 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -23,9 +23,9 @@ #endif #include "math/math_util.h" -#include "native/thread/thread.h" -#include "native/thread/threadutil.h" -#include "native/base/mutex.h" +#include "thread/thread.h" +#include "thread/threadutil.h" +#include "base/mutex.h" #include "util/text/utf8.h" #include "Core/MemMap.h" diff --git a/Core/ThreadEventQueue.h b/Core/ThreadEventQueue.h index 6db8b6e22d..d6d6737975 100644 --- a/Core/ThreadEventQueue.h +++ b/Core/ThreadEventQueue.h @@ -17,7 +17,7 @@ #pragma once -#include "native/base/mutex.h" +#include "base/mutex.h" #include "Core/System.h" #include "Core/CoreTiming.h" #include diff --git a/GPU/Common/TextureScalerCommon.cpp b/GPU/Common/TextureScalerCommon.cpp index c12ae3cce5..473eb23b1d 100644 --- a/GPU/Common/TextureScalerCommon.cpp +++ b/GPU/Common/TextureScalerCommon.cpp @@ -43,7 +43,7 @@ //#define SCALING_MEASURE_TIME #ifdef SCALING_MEASURE_TIME -#include "native/base/timeutil.h" +#include "base/timeutil.h" #endif /////////////////////////////////////// Helper Functions (mostly math for parallelization) diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index 786952e256..aed5f86688 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -1,6 +1,6 @@ #include -#include "native/base/mutex.h" -#include "native/base/timeutil.h" +#include "base/mutex.h" +#include "base/timeutil.h" #include "Common/ColorConv.h" #include "GPU/GeDisasm.h" #include "GPU/GPU.h" diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index e0a6baf8a6..b99fd5e854 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -2,7 +2,7 @@ #include "base/logging.h" #include "base/timeutil.h" #include "base/mutex.h" -#include "native/file/chunk_file.h" +#include "file/chunk_file.h" #include "Common/CommonTypes.h" #include "Core/HW/SimpleAudioDec.h" diff --git a/UI/TiltEventProcessor.cpp b/UI/TiltEventProcessor.cpp index 60cae2c9d6..b040269a9a 100644 --- a/UI/TiltEventProcessor.cpp +++ b/UI/TiltEventProcessor.cpp @@ -3,7 +3,7 @@ #include "TiltEventProcessor.h" #include "Core/HLE/sceCtrl.h" #include "math.h" -#include "native/base/logging.h" +#include "base/logging.h" using namespace TiltEventProcessor; diff --git a/Windows/DSoundStream.cpp b/Windows/DSoundStream.cpp index 7836b4f029..a6f7bcfb32 100644 --- a/Windows/DSoundStream.cpp +++ b/Windows/DSoundStream.cpp @@ -1,7 +1,7 @@ #include "Common/CommonWindows.h" #include -#include "native/thread/threadutil.h" +#include "thread/threadutil.h" #include "Core/Reporting.h" #include "Core/Util/AudioFormat.h" #include "Windows/W32Util/Misc.h" diff --git a/Windows/OpenGLBase.cpp b/Windows/OpenGLBase.cpp index b154562875..e314ab6707 100644 --- a/Windows/OpenGLBase.cpp +++ b/Windows/OpenGLBase.cpp @@ -19,8 +19,8 @@ #include "Common/Log.h" #include "Common/CommonWindows.h" -#include "native/gfx/gl_common.h" -#include "native/gfx_es2/gpu_features.h" +#include "gfx/gl_common.h" +#include "gfx_es2/gpu_features.h" #include "GL/gl.h" #include "GL/wglew.h" #include "Core/Config.h"