Преглед изворни кода

Added emscripten platform.

Branimir Karadzic пре 13 година
родитељ
комит
3ae0e72421
3 измењених фајлова са 13 додато и 3 уклоњено
  1. 10 1
      include/bx/platform.h
  2. 1 0
      include/bx/ringbuffer.h
  3. 2 2
      include/bx/timer.h

+ 10 - 1
include/bx/platform.h

@@ -11,6 +11,7 @@
 #define BX_COMPILER_MSVC 0
 
 #define BX_PLATFORM_ANDROID 0
+#define BX_PLATFORM_EMSCRIPTEN 0
 #define BX_PLATFORM_IOS 0
 #define BX_PLATFORM_LINUX 0
 #define BX_PLATFORM_NACL 0
@@ -67,11 +68,19 @@
 #elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
 #	undef BX_PLATFORM_OSX
 #	define BX_PLATFORM_OSX 1
+#elif defined(EMSCRIPTEN)
+#	undef BX_PLATFORM_EMSCRIPTEN
+#	define BX_PLATFORM_EMSCRIPTEN 1
 #else
 #	error "BX_PLATFORM_* is not defined!"
 #endif //
 
-#define BX_PLATFORM_POSIX (BX_PLATFORM_NACL || BX_PLATFORM_ANDROID || BX_PLATFORM_LINUX || BX_PLATFORM_OSX || BX_PLATFORM_IOS)
+#define BX_PLATFORM_POSIX (BX_PLATFORM_ANDROID \
+						|| BX_PLATFORM_EMSCRIPTEN \
+						|| BX_PLATFORM_IOS \
+						|| BX_PLATFORM_LINUX \
+						|| BX_PLATFORM_NACL \
+						|| BX_PLATFORM_OSX)
 
 // http://sourceforge.net/apps/mediawiki/predef/index.php?title=Architectures
 #if defined(__arm__)

+ 1 - 0
include/bx/ringbuffer.h

@@ -236,6 +236,7 @@ namespace bx
 			, m_buffer(_buffer)
 		{
 			uint32_t size = m_control.reserve(_size);
+			BX_UNUSED(size);
 			BX_CHECK(size == _size, "%d == %d", size, _size);
 			m_write = m_control.m_current;
 			m_end = m_write+_size;

+ 2 - 2
include/bx/timer.h

@@ -28,7 +28,7 @@ namespace bx
 		// http://support.microsoft.com/kb/274323
 		QueryPerformanceCounter(&li);
 		int64_t i64 = li.QuadPart;
-#elif BX_PLATFORM_ANDROID
+#elif BX_PLATFORM_ANDROID || BX_PLATFORM_EMSCRIPTEN
 		int64_t i64 = clock();
 #elif BX_PLATFORM_OSX
 		int64_t i64 = mach_absolute_time();
@@ -47,7 +47,7 @@ namespace bx
 		LARGE_INTEGER li;
 		QueryPerformanceFrequency(&li);
 		return li.QuadPart;
-#elif BX_PLATFORM_ANDROID
+#elif BX_PLATFORM_ANDROID || BX_PLATFORM_EMSCRIPTEN
 		return CLOCKS_PER_SEC;
 #elif BX_PLATFORM_OSX
 		mach_timebase_info_data_t info;