Ver código fonte

Updated NaCl toolchain to v49.

Branimir Karadžić 9 anos atrás
pai
commit
f9486780c2

+ 5 - 0
3rdparty/ocornut-imgui/widgets/file_list.inl

@@ -1,3 +1,4 @@
+#include <bx/bx.h>
 #include <dirent.h>
 #include <sys/stat.h>
 
@@ -15,6 +16,9 @@ namespace ImGui
 
 	void ImFileList::ChDir(const char* path)
 	{
+#if BX_PLATFORM_NACL
+		BX_UNUSED(path);
+#else
 		DIR* dir = opendir(path);
 		if (NULL != dir)
 		{
@@ -43,6 +47,7 @@ namespace ImGui
 
 			closedir(dir);
 		}
+#endif // BX_PLATFORM_NACL
 	}
 
 	void ImFileList::Draw()

+ 1 - 0
examples/common/nanovg/nanovg_bgfx.cpp

@@ -31,6 +31,7 @@
 #include <bx/bx.h>
 #include <bx/allocator.h>
 #include <bx/crtimpl.h>
+#include <bx/uint32_t.h>
 
 BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4244); // warning C4244: '=' : conversion from '' to '', possible loss of data
 

+ 2 - 0
src/hmd_openvr.cpp

@@ -5,8 +5,10 @@
 
 #include "hmd_openvr.h"
 
+BX_PRAGMA_DIAGNOSTIC_PUSH()
 BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-variable")
 #include <openvr/openvr_capi.h>
+BX_PRAGMA_DIAGNOSTIC_POP()
 
 namespace bgfx
 {