File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -42,12 +42,13 @@ if(PLATFORM_BUILD_ASSIMP)
4242endif ()
4343
4444if (PLATFORM_USE_ASSIMP)
45- function (DelayLoadLinkAssimp target )
45+ function (DelayLoadLinkAssimp target )
4646 if (PLATFORM_BUILD_ASSIMP)
4747 target_link_libraries (${target} PRIVATE assimp )
4848 target_link_options (${target} PRIVATE "/DELAYLOAD:$<TARGET_FILE_BASE_NAME :assimp >.dll" )
4949 else ()
5050 set (ASSIMP_LIBNAME assimp-vc${MSVC_TOOLSET_VERSION} -mt$<$<CONFIG :Debug >:d >)
51+ target_link_libraries (${target} PRIVATE "${ASSIMP_LIBNAME} .dll" )
5152 target_link_options (${target} INTERFACE "/DELAYLOAD:${ASSIMP_LIBNAME} .dll" )
5253 endif ()
5354 endfunction ()
Original file line number Diff line number Diff line change @@ -36,9 +36,9 @@ endif()
3636# Add in vk_mem_alloc.h
3737set (HEADERS ${HEADERS} "${SIMUL_PLATFORM_DIR} /External/VulkanMemoryAllocator/include/vk_mem_alloc.h" )
3838
39- if (SIMUL_SOURCE_BUILD)
40- add_static_library ( SimulVulkan SOURCES ${SOURCES} ${HEADERS} ${SHADER_DEFS} ${SHADER_INCLUDES} DEFINITIONS ${VK_DEFS} FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX} )
4139
40+ add_static_library ( SimulVulkan SOURCES ${SOURCES} ${HEADERS} ${SHADER_DEFS} ${SHADER_INCLUDES} DEFINITIONS ${VK_DEFS} FOLDER ${SIMUL_PLATFORM_FOLDER_PREFIX} )
41+ if (SIMUL_SOURCE_BUILD)
4242 add_dependencies (SimulVulkan${STATIC_LINK_SUFFIX} SimulCrossPlatform${STATIC_LINK_SUFFIX} )
4343 if (PLATFORM_WINDOWS)
4444 target_compile_definitions (SimulVulkan${STATIC_LINK_SUFFIX} PRIVATE VK_USE_PLATFORM_WIN32_KHR )
You can’t perform that action at this time.
0 commit comments