Browse Source

Fixing compile errors on MSVC.

Mike Popoloski 11 years ago
parent
commit
48bfab3713
2 changed files with 15 additions and 2 deletions
  1. 2 2
      examples/common/font/font_manager.cpp
  2. 13 0
      src/renderer_d3d12.cpp

+ 2 - 2
examples/common/font/font_manager.cpp

@@ -7,13 +7,13 @@
 
 #include "bx/platform.h"
 
-#if BX_PLATFORM_WINRT
+#if BX_COMPILER_MSVC
 #define generic GenericFromFreeType     // WinRT language extensions see "generic" as a keyword... this is stupid
+#define interface InterfaceFromFreeType
 #pragma warning(push)
 #pragma warning(disable : 4245)         // conversion from 'int' to 'FT_UInt', signed/unsigned mismatch
 #include <freetype/freetype.h>
 #pragma warning(pop)
-#undef generic
 #else
 #include <freetype/freetype.h>
 #endif

+ 13 - 0
src/renderer_d3d12.cpp

@@ -6,6 +6,19 @@
 #include "bgfx_p.h"
 
 #if BGFX_CONFIG_RENDERER_DIRECT3D12
+
+namespace bgfx
+{
+	RendererContextI* rendererCreateD3D12()
+	{
+		return NULL;
+	}
+
+	void rendererDestroyD3D12()
+	{
+	}
+} // namespace bgfx
+
 #else
 
 namespace bgfx