Native merge part 1: skip native/ in includes.

This commit is contained in:
Unknown W. Brackets 2015-09-06 12:19:33 -07:00
parent 1b4b60d543
commit e0f85a9c6b
17 changed files with 24 additions and 24 deletions

View File

@ -19,7 +19,7 @@
#include <string>
#include <cstdio>
#include "Common/CommonTypes.h"
#include "native/math/expression_parser.h"
#include "math/expression_parser.h"
struct MemMap;

View File

@ -22,7 +22,7 @@
#include <map>
#include <string>
#include "native/base/mutex.h"
#include "base/mutex.h"
#include "Common/CommonTypes.h"

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -18,8 +18,8 @@
#include <cstdlib>
#include <set>
#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"

View File

@ -15,7 +15,7 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "native/ext/jpge/jpgd.h"
#include "ext/jpge/jpgd.h"
#include "Common/Common.h"
#include "Common/ChunkFile.h"

View File

@ -19,7 +19,7 @@
#include <algorithm>
#include <set>
#include "native/base/stringutil.h"
#include "base/stringutil.h"
#include "Common/ChunkFile.h"
#include "Common/FileUtil.h"
#include "Core/Config.h"

View File

@ -17,7 +17,7 @@
#include <map>
#include <set>
#include "native/base/mutex.h"
#include "base/mutex.h"
#include "Core/ThreadEventQueue.h"
class NoBase {

View File

@ -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"

View File

@ -17,7 +17,7 @@
#pragma once
#include "native/base/mutex.h"
#include "base/mutex.h"
#include "Core/System.h"
#include "Core/CoreTiming.h"
#include <deque>

View File

@ -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)

View File

@ -1,6 +1,6 @@
#include <algorithm>
#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"

View File

@ -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"

View File

@ -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;

View File

@ -1,7 +1,7 @@
#include "Common/CommonWindows.h"
#include <dsound.h>
#include "native/thread/threadutil.h"
#include "thread/threadutil.h"
#include "Core/Reporting.h"
#include "Core/Util/AudioFormat.h"
#include "Windows/W32Util/Misc.h"

View File

@ -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"