diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-12-14 02:26:47 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-12-14 02:26:47 +0000 |
| commit | ca792090564a12ab85ffcf77f3054d5d6bf3330c (patch) | |
| tree | 58ce00b38e7057c2df9ae13c642402f123b537da /Graphics/GraphicsEngineD3D12 | |
| parent | Added option to create shader from bytecode for D3D11 and D3D12 (diff) | |
| download | DiligentCore-ca792090564a12ab85ffcf77f3054d5d6bf3330c.tar.gz DiligentCore-ca792090564a12ab85ffcf77f3054d5d6bf3330c.zip | |
Enabling universal windows platform in cmake
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt index ad150c5d..31971cf4 100644 --- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.3) +cmake_minimum_required (VERSION 3.8) project(GraphicsEngineD3D12 CXX) diff --git a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h index 3bdaca16..b33d3ec9 100644 --- a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h +++ b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h @@ -31,6 +31,10 @@ #include "DeviceContext.h" #include "SwapChain.h" +#if PLATFORM_UNIVERSAL_WINDOWS && defined(ENGINE_DLL) +# include "StringTools.h" +#endif + namespace Diligent { @@ -83,7 +87,14 @@ extern "C" #endif LibName += ".dll"; - auto hModule = LoadLibraryA( LibName.c_str() ); +#if PLATFORM_WIN32 + auto hModule = LoadLibraryA(LibName.c_str()); +#elif PLATFORM_UNIVERSAL_WINDOWS + auto hModule = LoadPackagedLibrary(Diligent::WidenString(LibName).c_str(), 0); +#else +# error Unexpected platform +#endif + if( hModule == NULL ) { LOG_ERROR_MESSAGE( "Failed to load ", LibName, " library." ); |