Skip to content

Commit a965e4c

Browse files
Use separate macros for each DLL instead of common ENGINE_DLL
1 parent 77d4e2b commit a965e4c

File tree

22 files changed

+58
-75
lines changed

22 files changed

+58
-75
lines changed

Graphics/Archiver/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ if(DEFINED DILIGENT_CORE_COMMIT_HASH)
9898
target_compile_definitions(Diligent-Archiver-static PRIVATE DILIGENT_CORE_COMMIT_HASH="${DILIGENT_CORE_COMMIT_HASH}")
9999
endif()
100100

101-
target_compile_definitions(Diligent-Archiver-shared PUBLIC ENGINE_DLL=1)
101+
target_compile_definitions(Diligent-Archiver-shared PUBLIC DILIGENT_ARCHIVER_SHARED=1)
102102

103103

104104
target_link_libraries(Diligent-Archiver-static

Graphics/Archiver/interface/ArchiverFactoryLoader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
# error Unsupported platform
3838
#endif
3939

40-
#if ENGINE_DLL && PLATFORM_WIN32 && defined(_MSC_VER)
40+
#if DILIGENT_ARCHIVER_SHARED && PLATFORM_WIN32 && defined(_MSC_VER)
4141
# include "../../GraphicsEngine/interface/LoadEngineDll.h"
4242
# define EXPLICITLY_LOAD_ARCHIVER_FACTORY_DLL 1
4343
#endif

Graphics/GraphicsEngineD3D11/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ PRIVATE
147147
PUBLIC
148148
Diligent-GraphicsEngineD3D11Interface
149149
)
150-
target_compile_definitions(Diligent-GraphicsEngineD3D11-shared PUBLIC ENGINE_DLL=1)
150+
target_compile_definitions(Diligent-GraphicsEngineD3D11-shared PUBLIC DILIGENT_D3D11_SHARED=1)
151151

152152
source_group("src" FILES ${SRC})
153153
source_group("dll" FILES ${DLL_SRC})

Graphics/GraphicsEngineD3D11/interface/EngineFactoryD3D11.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "../../GraphicsEngine/interface/DeviceContext.h"
3636
#include "../../GraphicsEngine/interface/SwapChain.h"
3737

38-
#if ENGINE_DLL
38+
#if DILIGENT_D3D11_SHARED
3939
# include "../../GraphicsEngine/interface/LoadEngineDll.h"
4040
#endif
4141

@@ -153,7 +153,7 @@ DILIGENT_END_INTERFACE
153153

154154
typedef struct IEngineFactoryD3D11* (*GetEngineFactoryD3D11Type)();
155155

156-
#if ENGINE_DLL
156+
#if DILIGENT_D3D11_SHARED
157157

158158
inline GetEngineFactoryD3D11Type DILIGENT_GLOBAL_FUNCTION(LoadGraphicsEngineD3D11)()
159159
{
@@ -170,7 +170,7 @@ struct IEngineFactoryD3D11* DILIGENT_GLOBAL_FUNCTION(GetEngineFactoryD3D11)();
170170
inline struct IEngineFactoryD3D11* DILIGENT_GLOBAL_FUNCTION(LoadAndGetEngineFactoryD3D11)()
171171
{
172172
GetEngineFactoryD3D11Type GetFactoryFunc = NULL;
173-
#if ENGINE_DLL
173+
#if DILIGENT_D3D11_SHARED
174174
GetFactoryFunc = DILIGENT_GLOBAL_FUNCTION(LoadGraphicsEngineD3D11)();
175175
if (GetFactoryFunc == NULL)
176176
{

Graphics/GraphicsEngineD3D12/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ PRIVATE
218218
PUBLIC
219219
Diligent-GraphicsEngineD3D12Interface
220220
)
221-
target_compile_definitions(Diligent-GraphicsEngineD3D12-shared PUBLIC ENGINE_DLL=1)
221+
target_compile_definitions(Diligent-GraphicsEngineD3D12-shared PUBLIC DILIGENT_D3D12_SHARED=1)
222222

223223
if("${WINDOWS_SDK_VERSION}" VERSION_GREATER_EQUAL "10.0.19041.0")
224224
set(D3D12_H_HAS_MESH_SHADER ON CACHE INTERNAL "D3D12 headers support mesh shaders" FORCE)

Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "../../GraphicsEngine/interface/DeviceContext.h"
3636
#include "../../GraphicsEngine/interface/SwapChain.h"
3737

38-
#if ENGINE_DLL
38+
#if DILIGENT_D3D12_SHARED
3939
# include "../../GraphicsEngine/interface/LoadEngineDll.h"
4040
#endif
4141

@@ -189,7 +189,7 @@ DILIGENT_END_INTERFACE
189189

190190
typedef struct IEngineFactoryD3D12* (*GetEngineFactoryD3D12Type)();
191191

192-
#if ENGINE_DLL
192+
#if DILIGENT_D3D12_SHARED
193193

194194
inline GetEngineFactoryD3D12Type DILIGENT_GLOBAL_FUNCTION(LoadGraphicsEngineD3D12)()
195195
{
@@ -206,7 +206,7 @@ struct IEngineFactoryD3D12* DILIGENT_GLOBAL_FUNCTION(GetEngineFactoryD3D12)();
206206
inline struct IEngineFactoryD3D12* DILIGENT_GLOBAL_FUNCTION(LoadAndGetEngineFactoryD3D12)()
207207
{
208208
GetEngineFactoryD3D12Type GetFactoryFunc = NULL;
209-
#if ENGINE_DLL
209+
#if DILIGENT_D3D12_SHARED
210210
GetFactoryFunc = DILIGENT_GLOBAL_FUNCTION(LoadGraphicsEngineD3D12)();
211211
if (GetFactoryFunc == NULL)
212212
{

Graphics/GraphicsEngineOpenGL/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ PUBLIC
269269
)
270270
target_link_whole_archive(Diligent-GraphicsEngineOpenGL-shared Diligent-GraphicsEngineOpenGL-static)
271271

272-
target_compile_definitions(Diligent-GraphicsEngineOpenGL-shared PUBLIC ENGINE_DLL=1)
272+
target_compile_definitions(Diligent-GraphicsEngineOpenGL-shared PUBLIC DILIGENT_OPENGL_SHARED=1)
273273
if(PLATFORM_MACOS)
274274
# Silence OpenGL deprecation warnings
275275
target_compile_definitions(Diligent-GraphicsEngineOpenGL-static PUBLIC GL_SILENCE_DEPRECATION)

Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
# error Unsupported platform
4848
#endif
4949

50-
#if ENGINE_DLL && PLATFORM_WIN32 && defined(_MSC_VER)
50+
#if DILIGENT_OPENGL_SHARED && PLATFORM_WIN32 && defined(_MSC_VER)
5151
# include "../../GraphicsEngine/interface/LoadEngineDll.h"
5252
# define EXPLICITLY_LOAD_ENGINE_GL_DLL 1
5353
#endif

Graphics/GraphicsEngineVulkan/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,12 @@ PRIVATE
331331
DILIGENT_NO_GLSLANG=$<BOOL:${DILIGENT_NO_GLSLANG}>
332332
DILIGENT_NO_HLSL=$<BOOL:${DILIGENT_NO_HLSL}>
333333
)
334-
target_compile_definitions(Diligent-GraphicsEngineVk-shared PRIVATE ${PRIVATE_COMPILE_DEFINITIONS} ENGINE_DLL=1)
334+
target_compile_definitions(Diligent-GraphicsEngineVk-shared
335+
PUBLIC
336+
DILIGENT_VK_SHARED=1
337+
PRIVATE
338+
${PRIVATE_COMPILE_DEFINITIONS}
339+
)
335340

336341
if(PLATFORM_WIN32)
337342

Graphics/GraphicsEngineVulkan/interface/EngineFactoryVk.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
# error Unsupported platform
4545
#endif
4646

47-
#if ENGINE_DLL && PLATFORM_WIN32 && defined(_MSC_VER)
47+
#if DILIGENT_VK_SHARED && PLATFORM_WIN32 && defined(_MSC_VER)
4848
# include "../../GraphicsEngine/interface/LoadEngineDll.h"
4949
# define EXPLICITLY_LOAD_ENGINE_VK_DLL 1
5050
#endif

0 commit comments

Comments
 (0)