Replaced #ifdef ENGINE_DLL with #if ENGINE_DLL

Author: TheMostDiligent

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} )
 

Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h

@@ -65,7 +65,7 @@ class IEngineFactoryD3D11
 
 extern "C"
 {
-#ifdef ENGINE_DLL
+#if ENGINE_DLL
 
     typedef Diligent::IEngineFactoryD3D11* (*GetEngineFactoryD3D11Type)();
 

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);

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}

Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h

@@ -65,7 +65,7 @@ class IEngineFactoryD3D12
 
 extern "C"
 {
-#ifdef ENGINE_DLL
+#if ENGINE_DLL
 
     typedef Diligent::IEngineFactoryD3D12* (*GetEngineFactoryD3D12Type)();
 

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);

Graphics/GraphicsEngineOpenGL/CMakeLists.txt

@@ -172,8 +172,6 @@ if(PLATFORM_WIN32)
 	set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static opengl32.lib)
 elseif(PLATFORM_ANDROID)
 	set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL android)
-	target_compile_definitions(GraphicsEngineOpenGL-static PRIVATE BUILDING_DLL)
-	target_compile_definitions(GraphicsEngineOpenGL-shared PRIVATE BUILDING_DLL)
 	set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) # -fvisibility=hidden
 elseif(PLATFORM_LINUX)
 	set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static)
@@ -196,7 +194,7 @@ endif()
 
 target_link_libraries(GraphicsEngineOpenGL-static PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES})
 target_link_libraries(GraphicsEngineOpenGL-shared PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES})
-target_compile_definitions(GraphicsEngineOpenGL-shared PUBLIC ENGINE_DLL)
+target_compile_definitions(GraphicsEngineOpenGL-shared PUBLIC ENGINE_DLL=1 PRIVATE BUILDING_DLL=1)
 
 if(PLATFORM_WIN32)
 	set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES

Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h

@@ -38,8 +38,8 @@
 
 #elif PLATFORM_ANDROID || PLATFORM_LINUX || PLATFORM_MACOS || PLATFORM_IOS
 
-#   ifdef ENGINE_DLL
-#       ifdef BUILDING_DLL
+#   if ENGINE_DLL
+#       if BUILDING_DLL
             // https://gcc.gnu.org/wiki/Visibility
 #           define API_QUALIFIER __attribute__((visibility("default")))
 #       else

Graphics/GraphicsEngineOpenGL/readme.md

@@ -13,7 +13,7 @@ using namespace Diligent;
 
 // ... 
 
-#ifdef ENGINE_DLL
+#if ENGINE_DLL
     GetEngineFactoryOpenGLType GetEngineFactoryOpenGL;
     if( !LoadGraphicsEngineOpenGL(GetEngineFactoryOpenGL) )
         return FALSE;

README.md

@@ -66,7 +66,7 @@ void InitDevice(HWND hWnd,
             EngineD3D11Attribs DeviceAttribs;
             g_pSample->GetEngineInitializationAttribs(DevType, DeviceAttribs, NumDeferredCtx);
 
-#ifdef ENGINE_DLL
+#if ENGINE_DLL
             GetEngineFactoryD3D11Type GetEngineFactoryD3D11 = nullptr;
             // Load the dll and import GetEngineFactoryD3D11() function
             LoadGraphicsEngineD3D11(GetEngineFactoryD3D11);
@@ -80,7 +80,7 @@ void InitDevice(HWND hWnd,
 
         case DeviceType::D3D12:
         {
-#ifdef ENGINE_DLL
+#if ENGINE_DLL
             GetEngineFactoryD3D12Type GetEngineFactoryD3D12 = nullptr;
             // Load the dll and import GetEngineFactoryD3D12() function
             LoadGraphicsEngineD3D12(GetEngineFactoryD3D12);
@@ -102,7 +102,7 @@ void InitDevice(HWND hWnd,
 
         case DeviceType::OpenGL:
         {
-#ifdef ENGINE_DLL
+#if ENGINE_DLL
             // Declare function pointer
             GetEngineFactoryOpenGLType GetEngineFactoryOpenGL = nullptr;
             // Load the dll and import GetEngineFactoryOpenGL() function