diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-11-02 03:30:15 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-11-02 03:30:15 +0000 |
| commit | a4032a642a2f454e56c25bce148f3e71cc2bb9b8 (patch) | |
| tree | e9ea8e100ca4556e6d7c36cf962cf4f4be93e744 /Graphics/GraphicsEngineD3D12 | |
| parent | Second attempt to rename external/SPIRV-Headers to External/SPIRV-Headers (diff) | |
| download | DiligentCore-a4032a642a2f454e56c25bce148f3e71cc2bb9b8.tar.gz DiligentCore-a4032a642a2f454e56c25bce148f3e71cc2bb9b8.zip | |
Optimized build by making shared versions of backend libraries dependent on static ones
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/DLLMain.cpp | 3 |
2 files changed, 5 insertions, 15 deletions
diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt index d210243c..dd4fc0b6 100644 --- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt @@ -119,11 +119,9 @@ add_library(GraphicsEngineD3D12-static STATIC ) add_library(GraphicsEngineD3D12-shared SHARED - ${SRC} ${INTERFACE} ${INCLUDE} ${SHADERS} src/DLLMain.cpp src/GraphicsEngineD3D12.def readme.md - shaders/GenerateMips/GenerateMipsCS.hlsli ) target_include_directories(GraphicsEngineD3D12-static @@ -132,13 +130,8 @@ PRIVATE include ) -target_include_directories(GraphicsEngineD3D12-shared +target_link_libraries(GraphicsEngineD3D12-static PRIVATE - ${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders - include -) - -set(PRIVATE_DEPENDENCIES BuildSettings Common GraphicsEngineD3DBase @@ -147,15 +140,11 @@ set(PRIVATE_DEPENDENCIES dxgi.lib D3D12.lib d3dcompiler.lib -) - -set(PUBLIC_DEPENDENCIES +PUBLIC GraphicsEngineD3D12Interface ) -target_link_libraries(GraphicsEngineD3D12-static PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) - -target_link_libraries(GraphicsEngineD3D12-shared PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) +target_link_libraries(GraphicsEngineD3D12-shared PUBLIC GraphicsEngineD3D12-static) target_compile_definitions(GraphicsEngineD3D12-shared PUBLIC ENGINE_DLL=1) # Set output name to GraphicsEngineD3D12_{32|64}{r|d} diff --git a/Graphics/GraphicsEngineD3D12/src/DLLMain.cpp b/Graphics/GraphicsEngineD3D12/src/DLLMain.cpp index 58b1c375..419f9921 100644 --- a/Graphics/GraphicsEngineD3D12/src/DLLMain.cpp +++ b/Graphics/GraphicsEngineD3D12/src/DLLMain.cpp @@ -21,7 +21,8 @@ * of the possibility of such damages. */ -#include "pch.h" +#include <Windows.h> +#include <crtdbg.h> BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, |