Browse Source

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

Branimir Karadzic 11 years ago
parent
commit
1f70f18670
4 changed files with 3 additions and 1 deletions
  1. 3 1
      include/bx/platform.h
  2. BIN
      tools/bin/darwin/genie
  3. BIN
      tools/bin/linux/genie
  4. BIN
      tools/bin/windows/genie.exe

+ 3 - 1
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)

BIN
tools/bin/darwin/genie


BIN
tools/bin/linux/genie


BIN
tools/bin/windows/genie.exe