Fix xcconfig override issue

Kyle-Ye · Kyle-Ye · commit bb75620003f5 · 2025-05-05T17:02:50.000+08:00
diff --git a/Configurations/Shared/OpenSwiftUI-debug.xcconfig b/Configurations/Shared/OpenSwiftUI-debug.xcconfig
@@ -1,2 +1,3 @@
 #include "basic/OpenSwiftUI.xcconfig"
 #include "basic/debug.xcconfig"
+#include "basic/common.xcconfig"
diff --git a/Configurations/Shared/OpenSwiftUI-release.xcconfig b/Configurations/Shared/OpenSwiftUI-release.xcconfig
@@ -1,2 +1,3 @@
 #include "basic/OpenSwiftUI.xcconfig"
 #include "basic/release.xcconfig"
+#include "basic/common.xcconfig"
diff --git a/Configurations/Shared/SwiftUI-debug.xcconfig b/Configurations/Shared/SwiftUI-debug.xcconfig
@@ -1,2 +1,3 @@
 #include "basic/SwiftUI.xcconfig"
 #include "basic/debug.xcconfig"
+#include "basic/common.xcconfig"
diff --git a/Configurations/Shared/SwiftUI-release.xcconfig b/Configurations/Shared/SwiftUI-release.xcconfig
@@ -1,2 +1,3 @@
 #include "basic/SwiftUI.xcconfig"
 #include "basic/release.xcconfig"
+#include "basic/common.xcconfig"
diff --git a/Configurations/Shared/basic/OpenSwiftUI.xcconfig b/Configurations/Shared/basic/OpenSwiftUI.xcconfig
@@ -1,2 +1,2 @@
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) OPENSWIFTUI=1
-SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) OPENSWIFTUI
+GCC_PREPROCESSOR_DEFINITIONS_OPENSWIFTUI = OPENSWIFTUI=1
+SWIFT_ACTIVE_COMPILATION_CONDITIONS_OPENSWIFTUI = OPENSWIFTUI
diff --git a/Configurations/Shared/basic/common.xcconfig b/Configurations/Shared/basic/common.xcconfig
@@ -1,2 +1,5 @@
 IPHONEOS_DEPLOYMENT_TARGET = 18.0
 MACOSX_DEPLOYMENT_TARGET = 15.0
+
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(GCC_PREPROCESSOR_DEFINITIONS_OPENSWIFTUI) $(GCC_PREPROCESSOR_DEFINITIONS_DEBUG)
+SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) $(SWIFT_ACTIVE_COMPILATION_CONDITIONS_OPENSWIFTUI) $(SWIFT_ACTIVE_COMPILATION_CONDITIONS_DEBUG)
diff --git a/Configurations/Shared/basic/debug.xcconfig b/Configurations/Shared/basic/debug.xcconfig
@@ -1,4 +1,2 @@
-#include "common.xcconfig"
-
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) DEBUG=1
-SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) DEBUG
+GCC_PREPROCESSOR_DEFINITIONS_DEBUG = DEBUG=1
+SWIFT_ACTIVE_COMPILATION_CONDITIONS_DEBUG = DEBUG

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`#include "basic/OpenSwiftUI.xcconfig"`
`2`	`2`	`#include "basic/debug.xcconfig"`
	`3`	`+#include "basic/common.xcconfig"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`#include "basic/OpenSwiftUI.xcconfig"`
`2`	`2`	`#include "basic/release.xcconfig"`
	`3`	`+#include "basic/common.xcconfig"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`#include "basic/SwiftUI.xcconfig"`
`2`	`2`	`#include "basic/debug.xcconfig"`
	`3`	`+#include "basic/common.xcconfig"`