OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fix linker config

Browse source
This commit is contained in:
Marcus Minhorst 2025-09-20 21:41:36 -04:00 • committed by Rachael Alexanderson
commit c26490a395
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libraries/ZWidget/CMakeLists.txt
View file

@ -261,7 +261,6 @@ endif()
if(SDL2_FOUND AND NOT WIN32)
set(ZWIDGET_SOURCES ${ZWIDGET_SOURCES} ${ZWIDGET_SDL2_SOURCES})
set(ZWIDGET_LIBS ${ZWIDGET_LIBS} ${SDL2_LIBRARIES} -lSDL2)
set(ZWIDGET_DEFINES ${ZWIDGET_DEFINES} -DUSE_SDL2)
endif()
@ -276,12 +275,17 @@ target_compile_options(zwidget PRIVATE ${ZWIDGET_COMPILE_OPTIONS})
target_compile_definitions(zwidget PRIVATE ${ZWIDGET_DEFINES})
target_include_directories(zwidget PRIVATE ${ZWIDGET_INCLUDE_DIRS})
target_link_options(zwidget PRIVATE ${ZWIDGET_LINK_OPTIONS})
target_link_libraries(zwidget ${ZWIDGET_LIBS})
target_link_libraries(zwidget PRIVATE ${ZWIDGET_LIBS})
if(SDL2_FOUND)
if(TARGET SDL2::SDL2)
target_link_libraries(zwidget PRIVATE SDL2::SDL2)
else() # needed for gzdoom compat for now
target_include_directories(zwidget PRIVATE ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS})
target_link_libraries(zwidget PRIVATE ${SDL2_LIBRARY})
endif()
endif()
set_target_properties(zwidget PROPERTIES CXX_STANDARD 20)
target_compile_options(zwidget PRIVATE ${CXX_WARNING_FLAGS})
if(SDL2_FOUND)
target_include_directories(zwidget PRIVATE ${SDL2_INCLUDE_DIRS})
endif()
if(MSVC)
set_property(TARGET zwidget PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
@ -319,6 +323,10 @@ if(ZWIDGET_BUILD_EXAMPLE)
target_link_libraries(zwidget_example PRIVATE ${ZWIDGET_LIBS})
endif()
if(SDL2_FOUND)
target_link_libraries(zwidget_example PRIVATE SDL2::SDL2)
endif()
set_target_properties(zwidget_example PROPERTIES CXX_STANDARD 20)
if(MSVC)