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/GraphicsEngineVulkan | |
| 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/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/DLLMain.cpp | 3 |
2 files changed, 3 insertions, 10 deletions
diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt index e96ba9a5..fc1d59b4 100644 --- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt +++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt @@ -149,14 +149,12 @@ add_library(GraphicsEngineVk-static STATIC ) add_library(GraphicsEngineVk-shared SHARED - ${SRC} ${VULKAN_UTILS_SRC} ${INTERFACE} ${INCLUDE} ${VULKAN_UTILS_INCLUDE} ${GENERATE_MIPS_SHADER} ${GENERATE_MIPS_SHADER_INC} src/DLLMain.cpp src/GraphicsEngineVk.def readme.md ) add_dependencies(GraphicsEngineVk-static ProcessGenerateMipsVkShader) -add_dependencies(GraphicsEngineVk-shared ProcessGenerateMipsVkShader) target_include_directories(GraphicsEngineVk-static PRIVATE @@ -164,12 +162,6 @@ PRIVATE ../../External/vulkan ) -target_include_directories(GraphicsEngineVk-shared -PRIVATE - include - ../../External/vulkan -) - set(PRIVATE_DEPENDENCIES BuildSettings Common @@ -190,7 +182,7 @@ set(PUBLIC_DEPENDENCIES target_link_libraries(GraphicsEngineVk-static PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) -target_link_libraries(GraphicsEngineVk-shared PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) +target_link_libraries(GraphicsEngineVk-shared PUBLIC GraphicsEngineVk-static) target_compile_definitions(GraphicsEngineVk-shared PUBLIC ENGINE_DLL=1) diff --git a/Graphics/GraphicsEngineVulkan/src/DLLMain.cpp b/Graphics/GraphicsEngineVulkan/src/DLLMain.cpp index 58b1c375..419f9921 100644 --- a/Graphics/GraphicsEngineVulkan/src/DLLMain.cpp +++ b/Graphics/GraphicsEngineVulkan/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, |