Merge branch 'master' of github.com:bkaradzic/bx

2026-02-19 05:23:00 +01:00 · 2014-12-27 15:17:43 -08:00
parent 85c40be687 885f2d3d37
commit 1f70f18670
4 changed files with 3 additions and 1 deletions
--- a/include/bx/platform.h
+++ b/include/bx/platform.h
@@ -125,7 +125,9 @@
 #	ifndef NOMINMAX
 #		define NOMINMAX
 #	endif // NOMINMAX
-#	include <windows.h>
+#	if defined(_MSC_VER) && (_MSC_VER >= 1700)
+#		include <winapifamily.h>
+#	endif // defined(_MSC_VER) && (_MSC_VER >= 1700)
 #	if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
 #		undef  BX_PLATFORM_WINDOWS
 #		if !defined(WINVER) && !defined(_WIN32_WINNT)
--- a/tools/bin/darwin/genie
+++ b/tools/bin/darwin/genie
--- a/tools/bin/linux/genie
+++ b/tools/bin/linux/genie
--- a/tools/bin/windows/genie.exe
+++ b/tools/bin/windows/genie.exe