UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 09:16:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[godot] Fix attempt for iOS patch

Browse Source
This commit is contained in:
Mario Zechner 2025-11-19 13:43:08 +01:00
parent a394a95a4d
commit 18f792543e
4 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spine-godot/build/setup.sh
View File

@ -71,12 +71,23 @@ if [ "$branch" = "4.3-stable" ]; then
fi fi
# Apply iOS Vulkan fix for C++ module imports in extern "C" blocks # Apply iOS Vulkan fix for C++ module imports in extern "C" blocks
# This fixes compilation errors with newer Xcode versions # This fixes compilation errors with newer Xcode versions on Godot 4.x
pushd godot if [[ "$branch" == 4* ]]; then
if [ -f ../build/ios-vulkan-fix.patch ]; then pushd godot
git apply ../build/ios-vulkan-fix.patch if [ -f platform/ios/detect.py ]; then
# Check if the fix is already applied
if ! grep -q "Wno-error=module-import-in-extern-c" platform/ios/detect.py; then
# Insert the fix after the -Wno-ambiguous-macro line
sed -i.bak '/Wno-ambiguous-macro/a\
\
# Fix for C++ module imports in extern "C" blocks in Vulkan headers\
env.Append(CCFLAGS=["-Wno-error=module-import-in-extern-c"])
' platform/ios/detect.py && rm platform/ios/detect.py.bak
echo "Applied iOS Vulkan fix to platform/ios/detect.py"
fi
fi
popd
fi fi
popd
popd popd

11
spine-libgdx/spine-libgdx-tests/.project
View File

@ -14,4 +14,15 @@
<natures> <natures>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1763543634399</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>

11
spine-libgdx/spine-libgdx/.project
View File

@ -14,4 +14,15 @@
<natures> <natures>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1763543634394</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>

11
spine-libgdx/spine-skeletonviewer/.project
View File

@ -14,4 +14,15 @@
<natures> <natures>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1763543634400</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>