Fixed https://github.com/DiligentGraphics/DiligentEngine/issues/5

2 files changed, 8 insertions, 14 deletions

diff --git a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h
index c280cdb1..1f999e8a 100644
--- a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h
@@ -63,13 +63,9 @@ public:
                                     Uint32 NumDeferredContexts) = 0;
 };
 
-}
-
-extern "C"
-{
 #if ENGINE_DLL
 
-    typedef Diligent::IEngineFactoryD3D11* (*GetEngineFactoryD3D11Type)();
+    typedef IEngineFactoryD3D11* (*GetEngineFactoryD3D11Type)();
 
     static bool LoadGraphicsEngineD3D11(GetEngineFactoryD3D11Type &GetFactoryFunc)
     {
@@ -92,7 +88,7 @@ extern "C"
 #if PLATFORM_WIN32
         auto hModule = LoadLibraryA( LibName.c_str() );
 #elif PLATFORM_UNIVERSAL_WINDOWS
-        auto hModule = LoadPackagedLibrary(Diligent::WidenString(LibName).c_str(), 0);
+        auto hModule = LoadPackagedLibrary(WidenString(LibName).c_str(), 0);
 #else
 #   error Unexpected platform
 #endif
@@ -118,7 +114,8 @@ extern "C"
     }
 #else
 
-    Diligent::IEngineFactoryD3D11* GetEngineFactoryD3D11();
+    IEngineFactoryD3D11* GetEngineFactoryD3D11();
 
 #endif
+
 }
\ No newline at end of file
diff --git a/Graphics/GraphicsEngineD3D11/src/RenderDeviceFactoryD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/RenderDeviceFactoryD3D11.cpp
index 34c0873a..dea8f0ec 100644
--- a/Graphics/GraphicsEngineD3D11/src/RenderDeviceFactoryD3D11.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/RenderDeviceFactoryD3D11.cpp
@@ -343,13 +343,10 @@ void LoadGraphicsEngineD3D11(GetEngineFactoryD3D11Type &GetFactoryFunc)
 }
 #endif
 
-}
 
-using namespace Diligent;
-extern "C"
+IEngineFactoryD3D11* GetEngineFactoryD3D11()
 {
-    IEngineFactoryD3D11* GetEngineFactoryD3D11()
-    {
-        return EngineFactoryD3D11Impl::GetInstance();
-    }
+    return EngineFactoryD3D11Impl::GetInstance();
+}
+
 }