Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ifdef order.

Browse Source
This commit is contained in:
Бранимир Караџић
2019-06-16 09:09:11 -07:00
parent daab5c96e5
commit a8cf4e3b07
5 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/bx/platform.h
View File

@@ -48,6 +48,7 @@
#define BX_PLATFORM_ANDROID 0
#define BX_PLATFORM_BSD 0
#define BX_PLATFORM_EMSCRIPTEN 0
#define BX_PLATFORM_HAIKU 0
#define BX_PLATFORM_HURD 0
#define BX_PLATFORM_IOS 0
#define BX_PLATFORM_LINUX 0
@@ -59,7 +60,6 @@
#define BX_PLATFORM_WINDOWS 0
#define BX_PLATFORM_WINRT 0
#define BX_PLATFORM_XBOXONE 0
#define BX_PLATFORM_HAIKU 0
// http://sourceforge.net/apps/mediawiki/predef/index.php?title=Compilers
#if defined(__clang__)
@@ -261,6 +261,7 @@
|| BX_PLATFORM_ANDROID \
|| BX_PLATFORM_BSD \
|| BX_PLATFORM_EMSCRIPTEN \
|| BX_PLATFORM_HAIKU \
|| BX_PLATFORM_HURD \
|| BX_PLATFORM_IOS \
|| BX_PLATFORM_LINUX \
@@ -269,7 +270,6 @@
|| BX_PLATFORM_PS4 \
|| BX_PLATFORM_RPI \
|| BX_PLATFORM_STEAMLINK \
|| BX_PLATFORM_HAIKU \
)
///
@@ -277,6 +277,7 @@
|| BX_PLATFORM_ANDROID \
|| BX_PLATFORM_BSD \
|| BX_PLATFORM_EMSCRIPTEN \
|| BX_PLATFORM_HAIKU \
|| BX_PLATFORM_HURD \
|| BX_PLATFORM_IOS \
|| BX_PLATFORM_LINUX \
@@ -288,7 +289,6 @@
|| BX_PLATFORM_WINDOWS \
|| BX_PLATFORM_WINRT \
|| BX_PLATFORM_XBOXONE \
|| BX_PLATFORM_HAIKU \
)
///
@@ -302,11 +302,11 @@
///
#define BX_PLATFORM_OS_DESKTOP (0 \
|| BX_PLATFORM_BSD \
|| BX_PLATFORM_HAIKU \
|| BX_PLATFORM_HURD \
|| BX_PLATFORM_LINUX \
|| BX_PLATFORM_OSX \
|| BX_PLATFORM_WINDOWS \
|| BX_PLATFORM_HAIKU \
)
///
@@ -365,6 +365,8 @@
BX_STRINGIZE(__EMSCRIPTEN_major__) "." \
BX_STRINGIZE(__EMSCRIPTEN_minor__) "." \
BX_STRINGIZE(__EMSCRIPTEN_tiny__)
#elif BX_PLATFORM_HAIKU
# define BX_PLATFORM_NAME "Haiku"
#elif BX_PLATFORM_HURD
# define BX_PLATFORM_NAME "Hurd"
#elif BX_PLATFORM_IOS
@@ -389,8 +391,6 @@
# define BX_PLATFORM_NAME "WinRT"
#elif BX_PLATFORM_XBOXONE
# define BX_PLATFORM_NAME "Xbox One"
#elif BX_PLATFORM_HAIKU
# define BX_PLATFORM_NAME "Haiku"
#else
# error "Unknown BX_PLATFORM!"
#endif // BX_PLATFORM_

4
src/file.cpp
View File

@@ -74,9 +74,9 @@ namespace bx
# elif 0 \
|| BX_PLATFORM_ANDROID \
|| BX_PLATFORM_BSD \
|| BX_PLATFORM_HAIKU \
|| BX_PLATFORM_IOS \
|| BX_PLATFORM_OSX \
|| BX_PLATFORM_HAIKU
|| BX_PLATFORM_OSX
# define fseeko64 fseeko
# define ftello64 ftello
# elif BX_PLATFORM_PS4

4
src/mutex.cpp
View File

@@ -12,12 +12,12 @@
# include <bx/cpu.h>
# include "crt0.h"
#elif BX_PLATFORM_ANDROID \
|| BX_PLATFORM_HAIKU \
|| BX_PLATFORM_LINUX \
|| BX_PLATFORM_IOS \
|| BX_PLATFORM_OSX \
|| BX_PLATFORM_PS4 \
|| BX_PLATFORM_RPI \
|| BX_PLATFORM_HAIKU
|| BX_PLATFORM_RPI
# include <pthread.h>
#elif BX_PLATFORM_WINDOWS \
|| BX_PLATFORM_WINRT \

13
src/os.cpp
View File

@@ -18,24 +18,24 @@
# include <windows.h>
# include <psapi.h>
#elif BX_PLATFORM_ANDROID \
|| BX_PLATFORM_EMSCRIPTEN \
|| BX_PLATFORM_BSD \
|| BX_PLATFORM_EMSCRIPTEN \
|| BX_PLATFORM_HAIKU \
|| BX_PLATFORM_HURD \
|| BX_PLATFORM_IOS \
|| BX_PLATFORM_LINUX \
|| BX_PLATFORM_NX \
|| BX_PLATFORM_OSX \
|| BX_PLATFORM_PS4 \
|| BX_PLATFORM_RPI \
|| BX_PLATFORM_STEAMLINK \
|| BX_PLATFORM_NX \
|| BX_PLATFORM_HAIKU
|| BX_PLATFORM_STEAMLINK
# include <sched.h> // sched_yield
# if BX_PLATFORM_BSD \
|| BX_PLATFORM_HAIKU \
|| BX_PLATFORM_IOS \
|| BX_PLATFORM_OSX \
|| BX_PLATFORM_PS4 \
|| BX_PLATFORM_STEAMLINK \
|| BX_PLATFORM_HAIKU
|| BX_PLATFORM_STEAMLINK
# include <pthread.h> // mach_port_t
# endif // BX_PLATFORM_*
@@ -67,7 +67,6 @@
namespace bx
{
void sleep(uint32_t _ms)
{
#if BX_PLATFORM_WINDOWS

4
src/thread.cpp
View File

@@ -15,12 +15,12 @@
#if BX_CRT_NONE
# include "crt0.h"
#elif BX_PLATFORM_ANDROID \
|| BX_PLATFORM_HAIKU \
|| BX_PLATFORM_LINUX \
|| BX_PLATFORM_IOS \
|| BX_PLATFORM_OSX \
|| BX_PLATFORM_PS4 \
|| BX_PLATFORM_RPI \
|| BX_PLATFORM_HAIKU
|| BX_PLATFORM_RPI
# include <pthread.h>
# if defined(__FreeBSD__)
# include <pthread_np.h>