rbfx · rokups · Oct 18, 2017 · Oct 18, 2017
diff --git a/Source/ThirdParty/bx/CMakeLists.txt b/Source/ThirdParty/bx/CMakeLists.txt
@@ -28,7 +28,14 @@ file (GLOB_RECURSE SOURCE_FILES
 )
 list (REMOVE_ITEM SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/amalgamated.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/amalgamated.mm)
 add_library(bx STATIC ${SOURCE_FILES})
-target_include_directories(bx PUBLIC include PRIVATE 3rdparty/catch)
+set (PUBLIC_INCLUDES include)
+if (MSVC) 
+    list (APPEND PUBLIC_INCLUDES include/compat/msvc)
+endif ()
+target_include_directories(bx PUBLIC ${PUBLIC_INCLUDES} PRIVATE 3rdparty/catch)
+if (MSVC)
+    target_compile_definitions( bx PUBLIC "__STDC_FORMAT_MACROS" )
+endif ()
 
 install (DIRECTORY include/bx/ DESTINATION ${DEST_THIRDPARTY_HEADERS}/bx FILES_MATCHING PATTERN *.h)
 install (DIRECTORY include/bx/ DESTINATION ${DEST_THIRDPARTY_HEADERS}/bx FILES_MATCHING PATTERN *.inl)

diff --git a/Source/Urho3D/Graphics/Bgfx/BgfxGraphics.cpp b/Source/Urho3D/Graphics/Bgfx/BgfxGraphics.cpp
@@ -112,7 +112,10 @@ bool Graphics::SetMode(int width, int height, bool fullscreen, bool borderless,
 
 		bgfx::PlatformData pd;
 		pd.ndt          = NULL;
-#if defined(__APPLE__)
+#if defined(WIN32)
+		pd.ndt          = NULL;
+		pd.nwh          = wmi.info.win.window;
+#elif defined(__APPLE__)
 		pd.nwh          = wmi.info.cocoa.window;
 #else
         // Other unixes
@@ -128,6 +131,7 @@ bool Graphics::SetMode(int width, int height, bool fullscreen, bool borderless,
 
     bgfx::init(bgfx::RendererType::OpenGL);
     SetMode(width, height);
+	return true;
 }
 
 bool Graphics::SetMode(int width, int height)