Merge pull request #77 from unvermuthet/macos-ios-binary-naming

Include env["suffix"] in binary names for macOS and iOS
godotengine · Feb 20, 2025 · 2281ade · 2281ade
2 parents ba780e0 + a21da62
commit 2281ade
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/SConstruct b/SConstruct
@@ -50,7 +50,7 @@ filepath = ""
 
 if env["platform"] == "macos" or env["platform"] == "ios":
     filepath = "{}.framework/".format(env["platform"])
-    file = "{}.{}.{}".format(libname, env["platform"], env["target"])
+    file = "{}{}".format(libname, env["suffix"])
 
 libraryfile = "bin/{}/{}{}".format(env["platform"], filepath, file)
 library = env.SharedLibrary(

diff --git a/bin/ios/ios.framework/Info.plist b/bin/ios/ios.framework/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>libEXTENSION-NAME.macos.template_release</string>
+	<string>libEXTENSION-NAME.ios.template_release.universal</string>
 	<key>CFBundleName</key>
 	<string>Godot Template Cpp</string>
 	<key>CFBundleDisplayName</key>

diff --git a/bin/macos/macos.framework/Resources/Info.plist b/bin/macos/macos.framework/Resources/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>libEXTENSION-NAME.macos.template_release</string>
+	<string>libEXTENSION-NAME.macos.template_release.universal</string>
 	<key>CFBundleName</key>
 	<string>Godot Cpp Template</string>
 	<key>CFBundleDisplayName</key>

diff --git a/demo/bin/example.gdextension b/demo/bin/example.gdextension
@@ -5,10 +5,10 @@ compatibility_minimum = "4.1"
 
 [libraries]
 ; Relative paths ensure that our GDExtension can be placed anywhere in the project directory.
-macos.debug = "./macos/macos.framework/libEXTENSION-NAME.macos.template_debug"
-macos.release = "./macos/macos.framework/libEXTENSION-NAME.macos.template_release"
-ios.debug = "./ios/ios.framework/libEXTENSION-NAME.ios.template_debug"
-ios.release = "./ios/ios.framework/libEXTENSION-NAME.ios.template_release"
+macos.debug = "./macos/macos.framework/libEXTENSION-NAME.macos.template_debug.universal"
+macos.release = "./macos/macos.framework/libEXTENSION-NAME.macos.template_release.universal"
+ios.debug = "./ios/ios.framework/libEXTENSION-NAME.ios.template_debug.universal"
+ios.release = "./ios/ios.framework/libEXTENSION-NAME.ios.template_release.universal"
 windows.debug.x86_32 = "./windows/libEXTENSION-NAME.windows.template_debug.x86_32.dll"
 windows.release.x86_32 = "./windows/libEXTENSION-NAME.windows.template_release.x86_32.dll"
 windows.debug.x86_64 = "./windows/libEXTENSION-NAME.windows.template_debug.x86_64.dll"