From 1edc3a81f2ee595a791cc721395895369055d3bf Mon Sep 17 00:00:00 2001 From: Egor Date: Sat, 10 Feb 2018 09:08:34 -0800 Subject: Replaced #ifdef ENGINE_DLL with #if ENGINE_DLL --- Graphics/GraphicsEngineD3D12/CMakeLists.txt | 2 +- Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h | 2 +- Graphics/GraphicsEngineD3D12/readme.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Graphics/GraphicsEngineD3D12') diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt index b3a9293e..fadf9fba 100644 --- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt @@ -151,7 +151,7 @@ set(PUBLIC_DEPENDENCIES target_link_libraries(GraphicsEngineD3D12-static PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) target_link_libraries(GraphicsEngineD3D12-shared PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) -target_compile_definitions(GraphicsEngineD3D12-shared PUBLIC ENGINE_DLL) +target_compile_definitions(GraphicsEngineD3D12-shared PUBLIC ENGINE_DLL=1) set_target_properties(GraphicsEngineD3D12-shared PROPERTIES OUTPUT_NAME_DEBUG GraphicsEngineD3D12${DLL_DBG_SUFFIX} diff --git a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h index 39316f02..6f68bda0 100644 --- a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h +++ b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h @@ -65,7 +65,7 @@ public: extern "C" { -#ifdef ENGINE_DLL +#if ENGINE_DLL typedef Diligent::IEngineFactoryD3D12* (*GetEngineFactoryD3D12Type)(); diff --git a/Graphics/GraphicsEngineD3D12/readme.md b/Graphics/GraphicsEngineD3D12/readme.md index cdcbb00e..9107a8f8 100644 --- a/Graphics/GraphicsEngineD3D12/readme.md +++ b/Graphics/GraphicsEngineD3D12/readme.md @@ -12,7 +12,7 @@ The following code snippet shows how to initialize diligent engine in D3D12 mode using namespace Diligent; // ... -#ifdef ENGINE_DLL +#if ENGINE_DLL GetEngineFactoryD3D12Type GetEngineFactoryD3D12 = nullptr; // Load the dll and import GetEngineFactoryD3D12() function LoadGraphicsEngineD3D12(GetEngineFactoryD3D12); -- cgit v1.2.3