fixed project includes to use new directory structure

This commit is contained in:
bunnei 2014-04-08 20:15:08 -04:00
parent 63e46abdb8
commit de0a034a84
95 changed files with 655 additions and 634 deletions

View file

@ -7,12 +7,12 @@
#ifdef _WIN32
#include "atomic_win32.h"
#include "common/atomic_win32.h"
#else
// GCC-compatible compiler assumed!
#include "atomic_gcc.h"
#include "common/atomic_gcc.h"
#endif

View file

@ -5,7 +5,7 @@
#ifndef _ATOMIC_GCC_H_
#define _ATOMIC_GCC_H_
#include "common.h"
#include "common/common.h"
// Atomic operations are performed in a single step by the CPU. It is
// impossible for other threads to see the operation "half-done."

View file

@ -5,7 +5,7 @@
#ifndef _ATOMIC_WIN32_H_
#define _ATOMIC_WIN32_H_
#include "common.h"
#include "common/common.h"
#include <intrin.h>
#include <Windows.h>

View file

@ -2,9 +2,9 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "common.h"
#include "debug_interface.h"
#include "break_points.h"
#include "common/common.h"
#include "common/debug_interface.h"
#include "common/break_points.h"
#include <sstream>
#include <algorithm>

View file

@ -8,7 +8,7 @@
#include <vector>
#include <string>
#include "common.h"
#include "common/common.h"
class DebugInterface;

View file

@ -41,8 +41,8 @@
#endif
#endif
#include "common.h"
#include "file_util.h"
#include "common/common.h"
#include "common/file_util.h"
//#include "../ext/snappy/snappy-c.h"
#if defined(IOS) || defined(MACGNUSTD)

View file

@ -43,12 +43,12 @@ private:
};
#endif
#include "log.h"
#include "common_types.h"
#include "msg_handler.h"
#include "common_funcs.h"
#include "common_paths.h"
#include "platform.h"
#include "common/log.h"
#include "common/common_types.h"
#include "common/msg_handler.h"
#include "common/common_funcs.h"
#include "common/common_paths.h"
#include "common/platform.h"
#ifdef __APPLE__
// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.

View file

@ -146,67 +146,6 @@
</Link>
<Lib />
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="src\atomic.h" />
<ClInclude Include="src\atomic_gcc.h" />
<ClInclude Include="src\atomic_win32.h" />
<ClInclude Include="src\break_points.h" />
<ClInclude Include="src\chunk_file.h" />
<ClInclude Include="src\common.h" />
<ClInclude Include="src\common_funcs.h" />
<ClInclude Include="src\common_paths.h" />
<ClInclude Include="src\common_types.h" />
<ClInclude Include="src\console_listener.h" />
<ClInclude Include="src\cpu_detect.h" />
<ClInclude Include="src\debug_interface.h" />
<ClInclude Include="src\emu_window.h" />
<ClInclude Include="src\extended_trace.h" />
<ClInclude Include="src\fifo_queue.h" />
<ClInclude Include="src\file_search.h" />
<ClInclude Include="src\file_util.h" />
<ClInclude Include="src\fixed_size_queue.h" />
<ClInclude Include="src\hash.h" />
<ClInclude Include="src\linear_disk_cache.h" />
<ClInclude Include="src\log.h" />
<ClInclude Include="src\log_manager.h" />
<ClInclude Include="src\math_util.h" />
<ClInclude Include="src\memory_util.h" />
<ClInclude Include="src\mem_arena.h" />
<ClInclude Include="src\msg_handler.h" />
<ClInclude Include="src\platform.h" />
<ClInclude Include="src\scm_rev.h" />
<ClInclude Include="src\std_condition_variable.h" />
<ClInclude Include="src\std_mutex.h" />
<ClInclude Include="src\std_thread.h" />
<ClInclude Include="src\string_util.h" />
<ClInclude Include="src\swap.h" />
<ClInclude Include="src\thread.h" />
<ClInclude Include="src\thunk.h" />
<ClInclude Include="src\timer.h" />
<ClInclude Include="src\utf8.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\break_points.cpp" />
<ClCompile Include="src\console_listener.cpp" />
<ClCompile Include="src\extended_trace.cpp" />
<ClCompile Include="src\file_search.cpp" />
<ClCompile Include="src\file_util.cpp" />
<ClCompile Include="src\hash.cpp" />
<ClCompile Include="src\log_manager.cpp" />
<ClCompile Include="src\math_util.cpp" />
<ClCompile Include="src\memory_util.cpp" />
<ClCompile Include="src\mem_arena.cpp" />
<ClCompile Include="src\misc.cpp" />
<ClCompile Include="src\msg_handler.cpp" />
<ClCompile Include="src\string_util.cpp" />
<ClCompile Include="src\thread.cpp" />
<ClCompile Include="src\timer.cpp" />
<ClCompile Include="src\utf8.cpp" />
<ClCompile Include="src\version.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="CMakeLists.txt" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
@ -214,6 +153,66 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="atomic.h" />
<ClInclude Include="atomic_gcc.h" />
<ClInclude Include="atomic_win32.h" />
<ClInclude Include="break_points.h" />
<ClInclude Include="chunk_file.h" />
<ClInclude Include="common.h" />
<ClInclude Include="common_funcs.h" />
<ClInclude Include="common_paths.h" />
<ClInclude Include="common_types.h" />
<ClInclude Include="console_listener.h" />
<ClInclude Include="cpu_detect.h" />
<ClInclude Include="debug_interface.h" />
<ClInclude Include="emu_window.h" />
<ClInclude Include="extended_trace.h" />
<ClInclude Include="fifo_queue.h" />
<ClInclude Include="file_search.h" />
<ClInclude Include="file_util.h" />
<ClInclude Include="fixed_size_queue.h" />
<ClInclude Include="hash.h" />
<ClInclude Include="linear_disk_cache.h" />
<ClInclude Include="log.h" />
<ClInclude Include="log_manager.h" />
<ClInclude Include="math_util.h" />
<ClInclude Include="memory_util.h" />
<ClInclude Include="mem_arena.h" />
<ClInclude Include="msg_handler.h" />
<ClInclude Include="platform.h" />
<ClInclude Include="std_condition_variable.h" />
<ClInclude Include="std_mutex.h" />
<ClInclude Include="std_thread.h" />
<ClInclude Include="string_util.h" />
<ClInclude Include="swap.h" />
<ClInclude Include="thread.h" />
<ClInclude Include="thunk.h" />
<ClInclude Include="timer.h" />
<ClInclude Include="utf8.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="break_points.cpp" />
<ClCompile Include="console_listener.cpp" />
<ClCompile Include="extended_trace.cpp" />
<ClCompile Include="file_search.cpp" />
<ClCompile Include="file_util.cpp" />
<ClCompile Include="hash.cpp" />
<ClCompile Include="log_manager.cpp" />
<ClCompile Include="math_util.cpp" />
<ClCompile Include="memory_util.cpp" />
<ClCompile Include="mem_arena.cpp" />
<ClCompile Include="misc.cpp" />
<ClCompile Include="msg_handler.cpp" />
<ClCompile Include="string_util.cpp" />
<ClCompile Include="thread.cpp" />
<ClCompile Include="timer.cpp" />
<ClCompile Include="utf8.cpp" />
<ClCompile Include="version.cpp" />
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

View file

@ -1,64 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="src\break_points.cpp" />
<ClCompile Include="src\console_listener.cpp" />
<ClCompile Include="src\extended_trace.cpp" />
<ClCompile Include="src\file_search.cpp" />
<ClCompile Include="src\file_util.cpp" />
<ClCompile Include="src\hash.cpp" />
<ClCompile Include="src\log_manager.cpp" />
<ClCompile Include="src\math_util.cpp" />
<ClCompile Include="src\memory_util.cpp" />
<ClCompile Include="src\mem_arena.cpp" />
<ClCompile Include="src\misc.cpp" />
<ClCompile Include="src\msg_handler.cpp" />
<ClCompile Include="src\string_util.cpp" />
<ClCompile Include="src\thread.cpp" />
<ClCompile Include="src\timer.cpp" />
<ClCompile Include="src\version.cpp" />
<ClCompile Include="src\utf8.cpp" />
<ClInclude Include="atomic.h" />
<ClInclude Include="atomic_gcc.h" />
<ClInclude Include="atomic_win32.h" />
<ClInclude Include="break_points.h" />
<ClInclude Include="chunk_file.h" />
<ClInclude Include="common.h" />
<ClInclude Include="common_funcs.h" />
<ClInclude Include="common_paths.h" />
<ClInclude Include="common_types.h" />
<ClInclude Include="console_listener.h" />
<ClInclude Include="cpu_detect.h" />
<ClInclude Include="debug_interface.h" />
<ClInclude Include="emu_window.h" />
<ClInclude Include="extended_trace.h" />
<ClInclude Include="fifo_queue.h" />
<ClInclude Include="file_search.h" />
<ClInclude Include="file_util.h" />
<ClInclude Include="fixed_size_queue.h" />
<ClInclude Include="hash.h" />
<ClInclude Include="linear_disk_cache.h" />
<ClInclude Include="log.h" />
<ClInclude Include="log_manager.h" />
<ClInclude Include="math_util.h" />
<ClInclude Include="mem_arena.h" />
<ClInclude Include="memory_util.h" />
<ClInclude Include="msg_handler.h" />
<ClInclude Include="platform.h" />
<ClInclude Include="std_condition_variable.h" />
<ClInclude Include="std_mutex.h" />
<ClInclude Include="std_thread.h" />
<ClInclude Include="string_util.h" />
<ClInclude Include="swap.h" />
<ClInclude Include="thread.h" />
<ClInclude Include="thunk.h" />
<ClInclude Include="timer.h" />
<ClInclude Include="utf8.h" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\atomic.h" />
<ClInclude Include="src\break_points.h" />
<ClInclude Include="src\chunk_file.h" />
<ClInclude Include="src\common.h" />
<ClInclude Include="src\common_funcs.h" />
<ClInclude Include="src\common_paths.h" />
<ClInclude Include="src\common_types.h" />
<ClInclude Include="src\console_listener.h" />
<ClInclude Include="src\cpu_detect.h" />
<ClInclude Include="src\debug_interface.h" />
<ClInclude Include="src\extended_trace.h" />
<ClInclude Include="src\fifo_queue.h" />
<ClInclude Include="src\file_search.h" />
<ClInclude Include="src\file_util.h" />
<ClInclude Include="src\fixed_size_queue.h" />
<ClInclude Include="src\hash.h" />
<ClInclude Include="src\linear_disk_cache.h" />
<ClInclude Include="src\log.h" />
<ClInclude Include="src\log_manager.h" />
<ClInclude Include="src\math_util.h" />
<ClInclude Include="src\memory_util.h" />
<ClInclude Include="src\mem_arena.h" />
<ClInclude Include="src\msg_handler.h" />
<ClInclude Include="src\scm_rev.h" />
<ClInclude Include="src\std_condition_variable.h" />
<ClInclude Include="src\std_mutex.h" />
<ClInclude Include="src\std_thread.h" />
<ClInclude Include="src\string_util.h" />
<ClInclude Include="src\thread.h" />
<ClInclude Include="src\thunk.h" />
<ClInclude Include="src\timer.h" />
<ClInclude Include="src\atomic_gcc.h" />
<ClInclude Include="src\atomic_win32.h" />
<ClInclude Include="src\emu_window.h" />
<ClInclude Include="src\platform.h" />
<ClInclude Include="src\swap.h" />
<ClInclude Include="src\utf8.h" />
<ClCompile Include="break_points.cpp" />
<ClCompile Include="console_listener.cpp" />
<ClCompile Include="extended_trace.cpp" />
<ClCompile Include="file_search.cpp" />
<ClCompile Include="file_util.cpp" />
<ClCompile Include="hash.cpp" />
<ClCompile Include="log_manager.cpp" />
<ClCompile Include="math_util.cpp" />
<ClCompile Include="mem_arena.cpp" />
<ClCompile Include="memory_util.cpp" />
<ClCompile Include="misc.cpp" />
<ClCompile Include="msg_handler.cpp" />
<ClCompile Include="string_util.cpp" />
<ClCompile Include="thread.cpp" />
<ClCompile Include="timer.cpp" />
<ClCompile Include="utf8.cpp" />
<ClCompile Include="version.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="CMakeLists.txt" />
<Text Include="CMakeLists.txt" />
</ItemGroup>
</Project>

View file

@ -6,7 +6,7 @@
#define _COMMON_PATHS_H_
// Make sure we pick up USER_DIR if set in config.h
#include "common.h"
#include "common/common.h"
// Directory seperators, do we need this?
#define DIR_SEP "/"

View file

@ -62,7 +62,7 @@ typedef signed long long s64; ///< 64-bit signed int
typedef float f32; ///< 32-bit floating point
typedef double f64; ///< 64-bit floating point
#include "swap.h"
#include "common/swap.h"
/// Union for fast 16-bit type casting
union t16 {

View file

@ -13,9 +13,9 @@
#include <stdarg.h>
#endif
#include "common.h"
#include "log_manager.h" // Common
#include "console_listener.h" // Common
#include "common/common.h"
#include "common/log_manager.h" // Common
#include "common/console_listener.h" // Common
ConsoleListener::ConsoleListener()
{

View file

@ -5,7 +5,7 @@
#ifndef _CONSOLELISTENER_H
#define _CONSOLELISTENER_H
#include "log_manager.h"
#include "common/log_manager.h"
#ifdef _WIN32
#include <windows.h>

View file

@ -25,7 +25,7 @@
#ifndef CORE_EMUWINDOW_H_
#define CORE_EMUWINDOW_H_
#include "common.h"
#include "common/common.h"
//namespace input_common
//{

View file

@ -16,8 +16,8 @@
#include <windows.h>
#include <stdio.h>
#include "extended_trace.h"
#include "string_util.h"
#include "common/extended_trace.h"
#include "common/string_util.h"
using namespace std;
#include <tchar.h>

View file

@ -5,7 +5,7 @@
// a simple lockless thread-safe,
// single reader, single writer queue
#include "atomic.h"
#include "common/atomic.h"
namespace Common
{

View file

@ -3,8 +3,8 @@
// Refer to the license.txt file included.
#include "common.h"
#include "common_paths.h"
#include "common/common.h"
#include "common/common_paths.h"
#ifndef _WIN32
#include <sys/types.h>
#include <dirent.h>
@ -15,9 +15,8 @@
#include <string>
#include <algorithm>
#include "file_search.h"
#include "string_util.h"
#include "common/file_search.h"
#include "common/string_util.h"
CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories)

View file

@ -3,10 +3,10 @@
// Refer to the license.txt file included.
#include "common.h"
#include "common_paths.h"
#include "file_util.h"
#include "string_util.h"
#include "common/common.h"
#include "common/common_paths.h"
#include "common/file_util.h"
#include "common/string_util.h"
#ifdef _WIN32
#include <windows.h>
@ -32,7 +32,7 @@
#include <algorithm>
#include <sys/stat.h>
#include "string_util.h"
#include "common/string_util.h"
#ifndef S_ISDIR
#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR)

View file

@ -12,8 +12,8 @@
#include <vector>
#include <string.h>
#include "common.h"
#include "string_util.h"
#include "common/common.h"
#include "common/string_util.h"
// User directory indices for GetUserPath
enum {

View file

@ -3,9 +3,9 @@
// Refer to the license.txt file included.
#include "hash.h"
#include "common/hash.h"
#if _M_SSE >= 0x402
#include "cpu_detect.h"
#include "common/cpu_detect.h"
#include <nmmintrin.h>
#endif

View file

@ -6,7 +6,7 @@
#ifndef _HASH_H_
#define _HASH_H_
#include "common.h"
#include "common/common.h"
u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0.
u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower

View file

@ -6,7 +6,7 @@
#ifndef _LINEAR_DISKCACHE
#define _LINEAR_DISKCACHE
#include "common.h"
#include "common/common.h"
#include <fstream>
// defined in Version.cpp

View file

@ -4,14 +4,11 @@
#include <algorithm>
#ifdef ANDROID
#include "Host.h"
#endif
#include "log_manager.h"
#include "console_listener.h"
#include "timer.h"
#include "thread.h"
#include "file_util.h"
#include "common/log_manager.h"
#include "common/console_listener.h"
#include "common/timer.h"
#include "common/thread.h"
#include "common/file_util.h"
void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
const char *file, int line, const char* fmt, ...)

View file

@ -5,10 +5,10 @@
#ifndef _LOGMANAGER_H_
#define _LOGMANAGER_H_
#include "log.h"
#include "string_util.h"
#include "thread.h"
#include "file_util.h"
#include "common/log.h"
#include "common/string_util.h"
#include "common/thread.h"
#include "common/file_util.h"
#include <set>
#include <string.h>

View file

@ -3,8 +3,8 @@
// Refer to the license.txt file included.
#include "common.h"
#include "math_util.h"
#include "common/common.h"
#include "common/math_util.h"
#include <cmath>
#include <numeric>

View file

@ -6,7 +6,7 @@
#ifndef _MATH_UTIL_H_
#define _MATH_UTIL_H_
#include "common.h"
#include "common/common.h"
#include <vector>

View file

@ -17,12 +17,10 @@
#include <string>
#include "memory_util.h"
#include "mem_arena.h"
#include "common/memory_util.h"
#include "common/mem_arena.h"
#ifdef _WIN32
//#include "CommonWindows.h"
#else
#ifndef _WIN32
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>

View file

@ -26,7 +26,7 @@
#include <e32std.h>
#endif
#include "common.h"
#include "common/common.h"
// This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
// Multiple views can mirror the same section of the block, which makes it very convient for emulating

View file

@ -3,9 +3,9 @@
// Refer to the license.txt file included.
#include "common.h"
#include "memory_util.h"
#include "string_util.h"
#include "common/common.h"
#include "common/memory_util.h"
#include "common/string_util.h"
#ifdef _WIN32
#include <windows.h>

View file

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "common.h"
#include "common/common.h"
#ifdef _WIN32
#include <windows.h>

View file

@ -4,8 +4,8 @@
#include <stdio.h> // System
#include "common.h" // Local
#include "string_util.h"
#include "common/common.h" // Local
#include "common/string_util.h"
bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
static MsgAlertHandler msg_handler = DefaultMsgHandler;

View file

@ -25,7 +25,7 @@
#ifndef COMMON_PLATFORM_H_
#define COMMON_PLATFORM_H_
#include "common_types.h"
#include "common/common_types.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// Platform definitions

View file

@ -19,12 +19,11 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<None Include="scm_rev_gen.js">
</None>
<ClInclude Include="force_rebuild.h" />
<ClInclude Include="scm_rev.h" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="force_rebuild.h" />
<ClInclude Include="src\scm_rev.h" />
<None Include="scm_rev_gen.js" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid>

View file

@ -29,7 +29,7 @@
// partial std::condition_variable implementation for win32/pthread
#include "std_mutex.h"
#include "common/std_mutex.h"
#if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__)
#define USE_RVALUE_REFERENCES

View file

@ -6,9 +6,9 @@
#include <stdio.h>
#include <algorithm>
#include "common.h"
#include "common_paths.h"
#include "string_util.h"
#include "common/common.h"
#include "common/common_paths.h"
#include "common/string_util.h"
#ifdef _WIN32
#include <Windows.h>

View file

@ -12,7 +12,7 @@
#include <sstream>
#include <iomanip>
#include "common.h"
#include "common/common.h"
std::string StringFromFormat(const char* format, ...);
// Cheap!

View file

@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "thread.h"
#include "common.h"
#include "common/thread.h"
#include "common/common.h"
#ifdef __APPLE__
#include <mach/mach.h>

View file

@ -5,12 +5,12 @@
#ifndef _THREAD_H_
#define _THREAD_H_
#include "std_condition_variable.h"
#include "std_mutex.h"
#include "std_thread.h"
#include "common/std_condition_variable.h"
#include "common/std_mutex.h"
#include "common/std_thread.h"
// Don't include common.h here as it will break LogManager
#include "common_types.h"
#include "common/common_types.h"
#include <stdio.h>
#include <string.h>

View file

@ -7,8 +7,7 @@
#include <map>
#include "common.h"
#include "x64Emitter.h"
#include "common/common.h"
// This simple class creates a wrapper around a C/C++ function that saves all fp state
// before entering it, and restores it upon exit. This is required to be able to selectively

View file

@ -12,9 +12,9 @@
#include <sys/time.h>
#endif
#include "common.h"
#include "timer.h"
#include "string_util.h"
#include "common/common.h"
#include "common/timer.h"
#include "common/string_util.h"
namespace Common
{

View file

@ -5,7 +5,7 @@
#ifndef _TIMER_H_
#define _TIMER_H_
#include "common.h"
#include "common/common.h"
#include <string>
namespace Common

View file

@ -26,8 +26,8 @@
#include <algorithm>
#include <string>
#include "common_types.h"
#include "utf8.h"
#include "common/common_types.h"
#include "common/utf8.h"
// is start of UTF sequence
inline bool isutf(char c) {

View file

@ -16,7 +16,7 @@
#pragma once
#include "common_types.h"
#include "common/common_types.h"
#include <string>
u32 u8_nextchar(const char *s, int *i);

View file

@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "common.h"
#include "scm_rev.h"
#include "common/common.h"
#include "common/scm_rev.h"
#ifdef _DEBUG
#define BUILD_TYPE_STR "Debug "