From 99a799ad8b0bacda110ee4310d217333afaa8600 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Thu, 23 Mar 2023 07:30:23 +0100
Subject: [PATCH] cmake: add /Q_no-use-libirc flag when building a no-libc
library
The new Intel LLVM compiler needs this when building SDL3
in release mode.
---
CMakeLists.txt | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ada90769dd4d..4e68366cd37c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1269,6 +1269,10 @@ else()
check_include_file("${_HEADER}" "${LIBC_HAS_VAR}")
set(HAVE_${HEADER_IDENTIFIER} ${${LIBC_HAS_VAR}})
endforeach()
+
+ if(MSVC AND USE_CLANG)
+ check_c_compiler_flag("/Q_no-use-libirc" HAS_Q_NO_USE_LIBIRC )
+ endif()
endif()
@@ -3334,6 +3338,9 @@ if(SDL_SHARED)
# FIXME: should be added for all architectures (missing symbols for ARM)
target_link_libraries(SDL3-shared PRIVATE "-nodefaultlib:MSVCRT")
endif()
+ if(HAS_Q_NO_USE_LIBIRC)
+ target_compile_options(SDL3-shared PRIVATE /Q_no-use-libirc)
+ endif()
endif()
if(APPLE)
set_target_properties(SDL3-shared PROPERTIES
@@ -3368,10 +3375,9 @@ if(SDL_SHARED)
if(MSVC AND NOT SDL_LIBC AND NOT MSVC_CLANG AND NOT CMAKE_GENERATOR_PLATFORM STREQUAL "ARM")
# Don't try to link with the default set of libraries.
if(NOT WINDOWS_STORE)
- set_target_properties(SDL3-shared PROPERTIES LINK_FLAGS_RELEASE "/NODEFAULTLIB")
- set_target_properties(SDL3-shared PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB")
+ set_property(TARGET SDL3-shared APPEND_STRING PROPERTY LINK_FLAGS "/NODEFAULTLIB")
endif()
- set_target_properties(SDL3-shared PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB")
+ set_property(TARGET SDL3-shared APPEND_STRING PROPERTY STATIC_LIBRARY_FLAGS " /NODEFAULTLIB")
endif()
# FIXME: if CMAKE_VERSION >= 3.13, use target_link_options for SDL_EXTRA_LDFLAGS
target_link_libraries(SDL3-shared PRIVATE ${SDL_EXTRA_LIBS} ${SDL_EXTRA_LDFLAGS} ${SDL_CMAKE_DEPENDS})