diff --git a/include/bx/cpu.h b/include/bx/cpu.h index 91ab437..06978b2 100644 --- a/include/bx/cpu.h +++ b/include/bx/cpu.h @@ -9,16 +9,11 @@ #include "bx.h" #if BX_COMPILER_MSVC -# if BX_PLATFORM_XBOX360 -# include -# include -# else -# include // math.h is included because VS bitches: - // warning C4985: 'ceil': attributes not present on previous declaration. - // must be included before intrin.h. -# include -# include -# endif // !BX_PLATFORM_XBOX360 +# include // math.h is included because VS bitches: + // warning C4985: 'ceil': attributes not present on previous declaration. + // must be included before intrin.h. +# include +# include # if BX_PLATFORM_WINRT # define _InterlockedExchangeAdd64 InterlockedExchangeAdd64 # endif // BX_PLATFORM_WINRT @@ -67,9 +62,7 @@ namespace bx /// inline void memoryBarrier() { -#if BX_PLATFORM_XBOX360 - __lwsync(); -#elif BX_PLATFORM_WINRT +#if BX_PLATFORM_WINRT MemoryBarrier(); #elif BX_COMPILER_MSVC _mm_mfence(); diff --git a/include/bx/platform.h b/include/bx/platform.h index 77742db..a29917b 100644 --- a/include/bx/platform.h +++ b/include/bx/platform.h @@ -58,7 +58,6 @@ #define BX_PLATFORM_STEAMLINK 0 #define BX_PLATFORM_WINDOWS 0 #define BX_PLATFORM_WINRT 0 -#define BX_PLATFORM_XBOX360 0 #define BX_PLATFORM_XBOXONE 0 // http://sourceforge.net/apps/mediawiki/predef/index.php?title=Compilers @@ -142,10 +141,7 @@ #endif // BX_PLATFORM_ // http://sourceforge.net/apps/mediawiki/predef/index.php?title=Operating_Systems -#if defined(_XBOX_VER) -# undef BX_PLATFORM_XBOX360 -# define BX_PLATFORM_XBOX360 1 -#elif defined(_DURANGO) || defined(_XBOX_ONE) +#if defined(_DURANGO) || defined(_XBOX_ONE) # undef BX_PLATFORM_XBOXONE # define BX_PLATFORM_XBOXONE 1 #elif defined(_WIN32) || defined(_WIN64) @@ -278,7 +274,6 @@ || BX_PLATFORM_STEAMLINK \ || BX_PLATFORM_WINDOWS \ || BX_PLATFORM_WINRT \ - || BX_PLATFORM_XBOX360 \ || BX_PLATFORM_XBOXONE \ ) @@ -340,8 +335,6 @@ # define BX_PLATFORM_NAME "Windows" #elif BX_PLATFORM_WINRT # define BX_PLATFORM_NAME "WinRT" -#elif BX_PLATFORM_XBOX360 -# define BX_PLATFORM_NAME "Xbox 360" #elif BX_PLATFORM_XBOXONE # define BX_PLATFORM_NAME "Xbox One" #elif BX_PLATFORM_NONE diff --git a/src/debug.cpp b/src/debug.cpp index 5596c05..e2c3d43 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -10,7 +10,9 @@ #if BX_PLATFORM_ANDROID # include -#elif BX_PLATFORM_WINDOWS || BX_PLATFORM_WINRT || BX_PLATFORM_XBOX360 || BX_PLATFORM_XBOXONE +#elif BX_PLATFORM_WINDOWS \ + || BX_PLATFORM_WINRT \ + || BX_PLATFORM_XBOXONE extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char* _str); #elif BX_PLATFORM_IOS || BX_PLATFORM_OSX # if defined(__OBJC__) @@ -51,7 +53,9 @@ namespace bx # define BX_ANDROID_LOG_TAG "" # endif // BX_ANDROID_LOG_TAG __android_log_write(ANDROID_LOG_DEBUG, BX_ANDROID_LOG_TAG, _out); -#elif BX_PLATFORM_WINDOWS || BX_PLATFORM_WINRT || BX_PLATFORM_XBOX360 || BX_PLATFORM_XBOXONE +#elif BX_PLATFORM_WINDOWS \ + || BX_PLATFORM_WINRT \ + || BX_PLATFORM_XBOXONE OutputDebugStringA(_out); #elif BX_PLATFORM_IOS || BX_PLATFORM_OSX # if defined(__OBJC__) diff --git a/src/mutex.cpp b/src/mutex.cpp index 0c1232a..4d8fdff 100644 --- a/src/mutex.cpp +++ b/src/mutex.cpp @@ -16,7 +16,6 @@ # include #elif BX_PLATFORM_WINDOWS \ || BX_PLATFORM_WINRT \ - || BX_PLATFORM_XBOX360 \ || BX_PLATFORM_XBOXONE # include # include @@ -24,7 +23,9 @@ namespace bx { -#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360 || BX_PLATFORM_XBOXONE || BX_PLATFORM_WINRT +#if BX_PLATFORM_WINDOWS \ + || BX_PLATFORM_XBOXONE \ + || BX_PLATFORM_WINRT typedef CRITICAL_SECTION pthread_mutex_t; typedef unsigned pthread_mutexattr_t; @@ -68,7 +69,9 @@ namespace bx pthread_mutexattr_t attr; -#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360 || BX_PLATFORM_XBOXONE || BX_PLATFORM_WINRT +#if BX_PLATFORM_WINDOWS \ + || BX_PLATFORM_XBOXONE \ + || BX_PLATFORM_WINRT #else pthread_mutexattr_init(&attr); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); diff --git a/src/os.cpp b/src/os.cpp index 80ad15e..525c499 100644 --- a/src/os.cpp +++ b/src/os.cpp @@ -66,9 +66,10 @@ namespace bx void sleep(uint32_t _ms) { -#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360 +#if BX_PLATFORM_WINDOWS ::Sleep(_ms); -#elif BX_PLATFORM_XBOXONE || BX_PLATFORM_WINRT +#elif BX_PLATFORM_XBOXONE \ + || BX_PLATFORM_WINRT BX_UNUSED(_ms); debugOutput("sleep is not implemented"); debugBreak(); #else @@ -82,9 +83,8 @@ namespace bx { #if BX_PLATFORM_WINDOWS ::SwitchToThread(); -#elif BX_PLATFORM_XBOX360 - ::Sleep(0); -#elif BX_PLATFORM_XBOXONE || BX_PLATFORM_WINRT +#elif BX_PLATFORM_XBOXONE \ + || BX_PLATFORM_WINRT debugOutput("yield is not implemented"); debugBreak(); #else ::sched_yield(); diff --git a/src/semaphore.cpp b/src/semaphore.cpp index ea4d615..fe5e389 100644 --- a/src/semaphore.cpp +++ b/src/semaphore.cpp @@ -14,7 +14,6 @@ # include #elif BX_PLATFORM_WINDOWS \ || BX_PLATFORM_WINRT \ - || BX_PLATFORM_XBOX360 \ || BX_PLATFORM_XBOXONE # include # include @@ -44,7 +43,6 @@ namespace bx # endif // BX_CONFIG_SEMAPHORE_PTHREAD #elif BX_PLATFORM_WINDOWS \ || BX_PLATFORM_WINRT \ - || BX_PLATFORM_XBOX360 \ || BX_PLATFORM_XBOXONE HANDLE m_handle; #endif // BX_PLATFORM_ @@ -254,7 +252,6 @@ namespace bx #elif BX_PLATFORM_WINDOWS \ || BX_PLATFORM_WINRT \ - || BX_PLATFORM_XBOX360 \ || BX_PLATFORM_XBOXONE Semaphore::Semaphore() diff --git a/src/thread.cpp b/src/thread.cpp index db4b038..8948e89 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -20,7 +20,6 @@ # endif // BX_PLATFORM_ #elif BX_PLATFORM_WINDOWS \ || BX_PLATFORM_WINRT \ - || BX_PLATFORM_XBOX360 \ || BX_PLATFORM_XBOXONE # include # include @@ -40,7 +39,6 @@ namespace bx { #if BX_PLATFORM_WINDOWS \ || BX_PLATFORM_WINRT \ - || BX_PLATFORM_XBOX360 \ || BX_PLATFORM_XBOXONE static DWORD WINAPI threadFunc(LPVOID _arg); HANDLE m_handle; @@ -51,7 +49,9 @@ namespace bx #endif // BX_PLATFORM_ }; -#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360 || BX_PLATFORM_XBOXONE || BX_PLATFORM_WINRT +#if BX_PLATFORM_WINDOWS \ + || BX_PLATFORM_XBOXONE \ + || BX_PLATFORM_WINRT DWORD WINAPI ThreadInternal::threadFunc(LPVOID _arg) { Thread* thread = (Thread*)_arg; @@ -84,7 +84,6 @@ namespace bx ThreadInternal* ti = (ThreadInternal*)m_internal; #if BX_PLATFORM_WINDOWS \ || BX_PLATFORM_WINRT \ - || BX_PLATFORM_XBOX360 \ || BX_PLATFORM_XBOXONE ti->m_handle = INVALID_HANDLE_VALUE; ti->m_threadId = UINT32_MAX; @@ -111,7 +110,8 @@ namespace bx m_running = true; ThreadInternal* ti = (ThreadInternal*)m_internal; -#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360 || BX_PLATFORM_XBOXONE +#if BX_PLATFORM_WINDOWS \ + || BX_PLATFORM_XBOXONE ti->m_handle = ::CreateThread(NULL , m_stackSize , (LPTHREAD_START_ROUTINE)ti->threadFunc @@ -162,7 +162,7 @@ namespace bx { BX_CHECK(m_running, "Not running!"); ThreadInternal* ti = (ThreadInternal*)m_internal; -#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360 +#if BX_PLATFORM_WINDOWS WaitForSingleObject(ti->m_handle, INFINITE); GetExitCodeThread(ti->m_handle, (DWORD*)&m_exitCode); CloseHandle(ti->m_handle); diff --git a/src/timer.cpp b/src/timer.cpp index 7f54037..a615827 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -19,7 +19,9 @@ namespace bx { int64_t getHPCounter() { -#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360 || BX_PLATFORM_XBOXONE || BX_PLATFORM_WINRT +#if BX_PLATFORM_WINDOWS \ + || BX_PLATFORM_XBOXONE \ + || BX_PLATFORM_WINRT LARGE_INTEGER li; // Performance counter value may unexpectedly leap forward // http://support.microsoft.com/kb/274323 @@ -44,7 +46,9 @@ namespace bx int64_t getHPFrequency() { -#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360 || BX_PLATFORM_XBOXONE || BX_PLATFORM_WINRT +#if BX_PLATFORM_WINDOWS \ + || BX_PLATFORM_XBOXONE \ + || BX_PLATFORM_WINRT LARGE_INTEGER li; QueryPerformanceFrequency(&li); return li.QuadPart;