fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Starting to cleanup includes a bit. Still a mess.

Browse Source
This commit is contained in:
Ben Vanik
2014-07-11 18:03:35 -07:00
parent f24b45a07c
commit 1d54342930
28 changed files with 245 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/xenia/assert.h
View File

@@ -15,7 +15,6 @@
#include <xenia/assert.h>
#include <xenia/config.h>
#include <xenia/platform.h>
#include <xenia/platform_includes.h>
#include <xenia/string.h>
#include <xenia/types.h>

3
src/xenia/atomic.h
View File

@@ -10,8 +10,9 @@
#ifndef XENIA_ATOMIC_H_
#define XENIA_ATOMIC_H_
#include <cstdint>
#include <xenia/platform.h>
#include <xenia/platform_includes.h>
// These functions are modeled off of the Apple OSAtomic routines

2
src/xenia/byte_order.h
View File

@@ -10,6 +10,8 @@
#ifndef XENIA_BYTE_ORDER_H_
#define XENIA_BYTE_ORDER_H_
#include <cstdint>
#include <xenia/platform.h>
#include <xenia/types.h>

1
src/xenia/common.h
View File

@@ -17,7 +17,6 @@
#include <xenia/logging.h>
#include <xenia/malloc.h>
#include <xenia/platform.h>
#include <xenia/platform_includes.h>
#include <xenia/profiling.h>
#include <xenia/string.h>
#include <xenia/types.h>

3
src/xenia/core/socket_win.cc
View File

@@ -9,9 +9,10 @@
#include <xenia/core/socket.h>
#include <errno.h>
#include <mstcpip.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#include <mstcpip.h>
// TODO(benvanik): win32 calls

1
src/xenia/gpu/resource_cache.h
View File

@@ -11,6 +11,7 @@
#define XENIA_GPU_RESOURCE_CACHE_H_
#include <map>
#include <unordered_map>
#include <xenia/core.h>
#include <xenia/gpu/buffer_resource.h>

5
src/xenia/kernel/fs/filesystem.h
View File

@@ -10,11 +10,12 @@
#ifndef XENIA_KERNEL_FS_FILESYSTEM_H_
#define XENIA_KERNEL_FS_FILESYSTEM_H_
#include <unordered_map>
#include <vector>
#include <xenia/common.h>
#include <xenia/core.h>
#include <vector>
#include <xenia/kernel/fs/entry.h>

3
src/xenia/logging.h
View File

@@ -10,8 +10,9 @@
#ifndef XENIA_LOGGING_H_
#define XENIA_LOGGING_H_
#include <cstdint>
#include <xenia/platform.h>
#include <xenia/platform_includes.h>
#include <xenia/config.h>
#include <xenia/string.h>

124
src/xenia/platform.h
View File

@@ -10,129 +10,7 @@
#ifndef XENIA_PLATFORM_H_
#define XENIA_PLATFORM_H_
// NOTE: ordering matters here as sometimes multiple flags are defined on
// certain platforms.
// Great resource on predefined macros: http://predef.sourceforge.net/preos.html
/*
XE_PLATFORM: IOS | OSX | XBOX360 | WINCE | WIN32 | ANDROID | NACL | UNIX
XE_LIKE: OSX | WIN32 | POSIX
XE_PROFILE: EMBEDDED | DESKTOP (+ _SIMULATOR)
XE_COMPILER: GNUC | MSVC | INTEL | UNKNOWN
XE_CPU: 32BIT | 64BIT | BIGENDIAN | LITTLEENDIAN
*/
#if defined(__APPLE__)
#include <TargetConditionals.h>
#endif
#if (defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED ) || \
(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE ) || \
(defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
#define XE_PLATFORM_IOS 1
#define XE_LIKE_OSX 1
#define XE_PROFILE_EMBEDDED 1
#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
// EMBEDDED *and* SIMULATOR
#define XE_PROFILE_SIMULATOR 1
#endif
#elif defined(TARGET_OS_MAC) && TARGET_OS_MAC
#define XE_PLATFORM_OSX 1
#define XE_LIKE_OSX 1
#define XE_PROFILE_DESKTOP 1
#elif defined(_XBOX)
#define XE_PLATFORM_XBOX360 1
#define XE_LIKE_WIN32 1
#define XE_PROFILE_EMBEDDED 1
#elif defined(_WIN32_WCE)
#define XE_PLATFORM_WINCE 1
#define XE_LIKE_WIN32 1
#define XE_PROFILE_EMBEDDED 1
#elif defined(__CYGWIN__)
#define XE_PLATFORM_CYGWIN 1
#define XE_LIKE_POSIX 1
#define XE_PROFILE_DESKTOP 1
#elif defined(WIN32) || defined(_WIN32)
#define XE_PLATFORM_WIN32 1
#define XE_LIKE_WIN32 1
#define XE_PROFILE_DESKTOP 1
#elif defined(ANDROID)
#define XE_PLATFORM_ANDROID 1
#define XE_LIKE_POSIX 1
#define XE_PROFILE_EMBEDDED 1
#elif defined(__native_client__)
#define XE_PLATFORM_NACL 1
#define XE_LIKE_POSIX 1
#define XE_PROFILE_DESKTOP 1
#else
#define XE_PLATFORM_UNIX 1
#define XE_LIKE_POSIX 1
#define XE_PROFILE_DESKTOP 1
#endif
#if defined(__GNUC__)
#define XE_COMPILER_GNUC 1
#elif defined(_MSC_VER)
#define XE_COMPILER_MSVC 1
#elif defined(__MINGW32)
#define XE_COMPILER_MINGW32 1
#elif defined(__INTEL_COMPILER)
#define XE_COMPILER_INTEL 1
#else
#define XE_COMPILER_UNKNOWN 1
#endif
#if defined(__ia64__) || defined(_M_IA64) || \
defined(__ppc64__) || defined(__PPC64__) || \
defined(__arch64__) || \
defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64) || \
defined(__LP64__) || defined(__LLP64) || \
defined(_WIN64) || \
(__WORDSIZE == 64)
#define XE_CPU_64BIT 1
#else
#define XE_CPU_32BIT 1
#endif // [64bit flags]
#if defined(__ppc__) || defined(__PPC__) || defined(__powerpc__) || defined(__powerpc) || defined(__POWERPC__) || defined(_M_PPC) || defined(__PPC) || \
defined(__ppc64__) || defined(__PPC64__) || \
defined(__ARMEB__) || \
defined(__BIG_ENDIAN) || defined(__BIG_ENDIAN__)
#define XE_CPU_BIGENDIAN 1
#else
#define XE_CPU_LITTLEENDIAN 1
#endif // [big endian flags]
#if defined(DEBUG) || defined(_DEBUG)
#define XE_DEBUG 1
#endif // DEBUG
#if XE_CPU_32BIT
#define XE_ALIGNMENT 8
#else
#define XE_ALIGNMENT 16
#endif // 32BIT
#include <poly/platform.h>
bool xe_has_console();
#if XE_LIKE_WIN32 && defined(UNICODE) && UNICODE

63
src/xenia/platform_includes.h
View File

@@ -1,63 +0,0 @@
/**
******************************************************************************
* Xenia : Xbox 360 Emulator Research Project *
******************************************************************************
* Copyright 2013 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. *
******************************************************************************
*/
#ifndef XENIA_PLATFORM_INCLUDES_H_
#define XENIA_PLATFORM_INCLUDES_H_
#include <xenia/platform.h>
#if XE_PLATFORM_WINCE || XE_PLATFORM_WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <SDKDDKVer.h>
#include <windows.h>
#include <ObjBase.h>
#undef min
#undef max
#endif // WINCE || WIN32
#if XE_PLATFORM_XBOX360
#include <xtl.h>
#include <xboxmath.h>
#endif // XBOX360
#if XE_COMPILER_MSVC
// Disable warning C4068: unknown pragma
#pragma warning(disable : 4068)
#endif // MSVC
#if XE_LIKE_POSIX
#include <unistd.h>
#include <endian.h>
#endif // POSIX
#include <stddef.h>
#include <memory.h>
#include <string.h>
#include <stdio.h>
#include <math.h>
#include <stdlib.h>
#include <ctype.h>
#include <float.h>
#include <assert.h>
#include <limits.h>
#include <stdarg.h>
#include <locale.h>
#include <errno.h>
#include <string>
#include <assert.h>
#include <stdint.h>
#include <memory>
#include <unordered_map>
#endif // XENIA_PLATFORM_INCLUDES_H_

1
src/xenia/profiling.h
View File

@@ -14,7 +14,6 @@
#include <xenia/config.h>
#include <xenia/platform.h>
#include <xenia/platform_includes.h>
#include <xenia/string.h>
#include <xenia/types.h>

1
src/xenia/sources.gypi
View File

@@ -17,7 +17,6 @@
'malloc.h',
'platform.cc',
'platform.h',
'platform_includes.h',
'profiling.cc',
'profiling.h',
'string.cc',

1
src/xenia/string.h
View File

@@ -11,7 +11,6 @@
#define XENIA_STRING_H_
#include <xenia/platform.h>
#include <xenia/platform_includes.h>
// NOTE: these differing implementations should behave pretty much the same.

9
src/xenia/types.h
View File

@@ -10,14 +10,9 @@
#ifndef XENIA_TYPES_H_
#define XENIA_TYPES_H_
#include <xenia/platform.h>
#include <xenia/platform_includes.h>
#include <cstdint>
namespace xe {
// TODO(benvanik): support other compilers/etc
using std::auto_ptr;
using std::shared_ptr;
} // namespace xe
#include <xenia/platform.h>
#define XE_EMPTY_MACRO do { } while(0)