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/GraphicsEngineD3D11/CMakeLists.txt | 2 +- Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h | 2 +- Graphics/GraphicsEngineD3D11/readme.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Graphics/GraphicsEngineD3D11') diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt index 30592fc3..a26247ac 100644 --- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt @@ -130,7 +130,7 @@ set(PUBLIC_DEPENDENCIES target_link_libraries(GraphicsEngineD3D11-static PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) target_link_libraries(GraphicsEngineD3D11-shared PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) -target_compile_definitions(GraphicsEngineD3D11-shared PUBLIC ENGINE_DLL) +target_compile_definitions(GraphicsEngineD3D11-shared PUBLIC ENGINE_DLL=1) source_group("src" FILES ${SRC} ) diff --git a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h index f176354e..2f3cd4bf 100644 --- a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h +++ b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h @@ -65,7 +65,7 @@ public: extern "C" { -#ifdef ENGINE_DLL +#if ENGINE_DLL typedef Diligent::IEngineFactoryD3D11* (*GetEngineFactoryD3D11Type)(); diff --git a/Graphics/GraphicsEngineD3D11/readme.md b/Graphics/GraphicsEngineD3D11/readme.md index 50879993..7a847c14 100644 --- a/Graphics/GraphicsEngineD3D11/readme.md +++ b/Graphics/GraphicsEngineD3D11/readme.md @@ -19,7 +19,7 @@ DeviceAttribs.DebugFlags = (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance; // Get pointer to the function that returns the factory -#ifdef ENGINE_DLL +#if ENGINE_DLL GetEngineFactoryD3D11Type GetEngineFactoryD3D11 = nullptr; // Load the dll and import GetEngineFactoryD3D11() function LoadGraphicsEngineD3D11(GetEngineFactoryD3D11); -- cgit v1.2.3