[iOS] Fix building as static library or xcframework, add iOS config and xcframework build script to the test project.

bruvzg · bruvzg · commit 30704d85c6fe · 2023-11-07T07:54:14.000+02:00
diff --git a/include/godot_cpp/classes/wrapped.hpp b/include/godot_cpp/classes/wrapped.hpp
@@ -448,7 +448,7 @@ public:
                                                                                                                            \
 	static void *_gde_binding_create_callback(void *p_token, void *p_instance) {                                           \
 		/* Do not call memnew here, we don't want the post-initializer to be called */                                     \
-		return new ("") m_class((GodotObject *)p_instance);                                                                \
+		return new ("", "") m_class((GodotObject *)p_instance);                                                            \
 	}                                                                                                                      \
 	static void _gde_binding_free_callback(void *p_token, void *p_instance, void *p_binding) {                             \
 		/* Explicitly call the deconstructor to ensure proper lifecycle for non-trivial members */                         \
diff --git a/include/godot_cpp/core/memory.hpp b/include/godot_cpp/core/memory.hpp
@@ -44,20 +44,20 @@
 #define PAD_ALIGN 16 //must always be greater than this at much
 #endif
 
-void *operator new(size_t p_size, const char *p_description); ///< operator new that takes a description and uses MemoryStaticPool
-void *operator new(size_t p_size, void *(*p_allocfunc)(size_t p_size)); ///< operator new that takes a description and uses MemoryStaticPool
-void *operator new(size_t p_size, void *p_pointer, size_t check, const char *p_description); ///< operator new that takes a description and uses a pointer to the preallocated memory
+void *operator new(size_t p_size, const char *p_dummy, const char *p_description); ///< operator new that takes a description and uses MemoryStaticPool
+void *operator new(size_t p_size, const char *p_dummy, void *(*p_allocfunc)(size_t p_size)); ///< operator new that takes a description and uses MemoryStaticPool
+void *operator new(size_t p_size, const char *p_dummy, void *p_pointer, size_t check, const char *p_description); ///< operator new that takes a description and uses a pointer to the preallocated memory
 
-_ALWAYS_INLINE_ void *operator new(size_t p_size, void *p_pointer, size_t check, const char *p_description) {
+_ALWAYS_INLINE_ void *operator new(size_t p_size, const char *p_dummy, void *p_pointer, size_t check, const char *p_description) {
 	return p_pointer;
 }
 
 #ifdef _MSC_VER
 // When compiling with VC++ 2017, the above declarations of placement new generate many irrelevant warnings (C4291).
 // The purpose of the following definitions is to muffle these warnings, not to provide a usable implementation of placement delete.
-void operator delete(void *p_mem, const char *p_description);
-void operator delete(void *p_mem, void *(*p_allocfunc)(size_t p_size));
-void operator delete(void *p_mem, void *p_pointer, size_t check, const char *p_description);
+void operator delete(void *p_mem, const char *p_dummy, const char *p_description);
+void operator delete(void *p_mem, const char *p_dummy, void *(*p_allocfunc)(size_t p_size));
+void operator delete(void *p_mem, const char *p_dummy, void *p_pointer, size_t check, const char *p_description);
 #endif
 
 namespace godot {
@@ -85,10 +85,10 @@ _ALWAYS_INLINE_ T *_post_initialize(T *p_obj) {
 #define memrealloc(m_mem, m_size) ::godot::Memory::realloc_static(m_mem, m_size)
 #define memfree(m_mem) ::godot::Memory::free_static(m_mem)
 
-#define memnew(m_class) ::godot::_post_initialize(new ("") m_class)
+#define memnew(m_class) ::godot::_post_initialize(new ("", "") m_class)
 
-#define memnew_allocator(m_class, m_allocator) ::godot::_post_initialize(new (m_allocator::alloc) m_class)
-#define memnew_placement(m_placement, m_class) ::godot::_post_initialize(new (m_placement, sizeof(m_class), "") m_class)
+#define memnew_allocator(m_class, m_allocator) ::godot::_post_initialize(new ("", m_allocator::alloc) m_class)
+#define memnew_placement(m_placement, m_class) ::godot::_post_initialize(new ("", m_placement, sizeof(m_class), "") m_class)
 
 // Generic comparator used in Map, List, etc.
 template <class T>
@@ -154,7 +154,7 @@ T *memnew_arr_template(size_t p_elements, const char *p_descr = "") {
 
 		/* call operator new */
 		for (size_t i = 0; i < p_elements; i++) {
-			new (&elems[i], sizeof(T), p_descr) T;
+			new ("", &elems[i], sizeof(T), p_descr) T;
 		}
 	}
 
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
@@ -103,28 +103,28 @@ _GlobalNil _GlobalNilClass::_nil;
 
 } // namespace godot
 
-void *operator new(size_t p_size, const char *p_description) {
+void *operator new(size_t p_size, const char *p_dummy, const char *p_description) {
 	return godot::Memory::alloc_static(p_size);
 }
 
-void *operator new(size_t p_size, void *(*p_allocfunc)(size_t p_size)) {
+void *operator new(size_t p_size, const char *p_dummy, void *(*p_allocfunc)(size_t p_size)) {
 	return p_allocfunc(p_size);
 }
 
 using namespace godot;
 
 #ifdef _MSC_VER
-void operator delete(void *p_mem, const char *p_description) {
+void operator delete(void *p_mem, const char *p_dummy, const char *p_description) {
 	ERR_PRINT("Call to placement delete should not happen.");
 	CRASH_NOW();
 }
 
-void operator delete(void *p_mem, void *(*p_allocfunc)(size_t p_size)) {
+void operator delete(void *p_mem, const char *p_dummy, void *(*p_allocfunc)(size_t p_size)) {
 	ERR_PRINT("Call to placement delete should not happen.");
 	CRASH_NOW();
 }
 
-void operator delete(void *p_mem, void *p_pointer, size_t check, const char *p_description) {
+void operator delete(void *p_mem, const char *p_dummy, void *p_pointer, size_t check, const char *p_description) {
 	ERR_PRINT("Call to placement delete should not happen.");
 	CRASH_NOW();
 }
diff --git a/test/SConstruct b/test/SConstruct
@@ -23,6 +23,17 @@ if env["platform"] == "macos":
         ),
         source=sources,
     )
+elif env["platform"] == "ios":
+    if env["ios_simulator"]:
+        library = env.StaticLibrary(
+            "project/bin/libgdexample.{}.{}.simulator.a".format(env["platform"], env["target"]),
+            source=sources,
+        )
+    else:
+        library = env.StaticLibrary(
+            "project/bin/libgdexample.{}.{}.a".format(env["platform"], env["target"]),
+            source=sources,
+        )
 else:
     library = env.SharedLibrary(
         "project/bin/libgdexample{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
diff --git a/test/generate_xcframework.sh b/test/generate_xcframework.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+scons arch=universal ios_simulator=yes platform=ios target=$1 $2
+scons arch=arm64 ios_simulator=no platform=ios target=$1 $2
+
+xcodebuild -create-xcframework -library ./project/bin/libgdexample.ios.$1.a -library ./project/bin/libgdexample.ios.$1.simulator.a -output ./project/bin/libgdexample.ios.$1.xcframework
+xcodebuild -create-xcframework -library ../bin/libgodot-cpp.ios.$1.arm64.a -library ../bin/libgodot-cpp.ios.$1.universal.simulator.a  -output ./project/bin/libgodot-cpp.ios.$1.xcframework
diff --git a/test/project/bin/libgdexample.macos.template_debug.framework/Resources/Info.plist b/test/project/bin/libgdexample.macos.template_debug.framework/Resources/Info.plist
diff --git a/test/project/bin/libgdexample.macos.template_release.framework/Resources/Info.plist b/test/project/bin/libgdexample.macos.template_release.framework/Resources/Info.plist
diff --git a/test/project/example.gdextension b/test/project/example.gdextension
@@ -5,14 +5,22 @@ compatibility_minimum = "4.1"
 
 [libraries]
 
+ios.debug = "res://bin/libgdexample.ios.template_debug.xcframework"
+ios.release = "res://bin/libgdexample.ios.template_release.xcframework"
 macos.debug = "res://bin/libgdexample.macos.template_debug.framework"
 macos.release = "res://bin/libgdexample.macos.template_release.framework"
 windows.debug.x86_32 = "res://bin/libgdexample.windows.template_debug.x86_32.dll"
 windows.release.x86_32 = "res://bin/libgdexample.windows.template_release.x86_32.dll"
 windows.debug.x86_64 = "res://bin/libgdexample.windows.template_debug.x86_64.dll"
 windows.release.x86_64 = "res://bin/libgdexample.windows.template_release.x86_64.dll"
+windows.debug.arm64 = "res://bin/libgdexample.windows.template_debug.arm64.dll"
+windows.release.arm64 = "res://bin/libgdexample.windows.template_release.arm64.dll"
+linux.debug.x86_32 = "res://bin/libgdexample.linux.template_debug.x86_32.so"
+linux.release.x86_32 = "res://bin/libgdexample.linux.template_release.x86_32.so"
 linux.debug.x86_64 = "res://bin/libgdexample.linux.template_debug.x86_64.so"
 linux.release.x86_64 = "res://bin/libgdexample.linux.template_release.x86_64.so"
+linux.debug.arm32 = "res://bin/libgdexample.linux.template_debug.arm32.so"
+linux.release.arm32 = "res://bin/libgdexample.linux.template_release.arm32.so"
 linux.debug.arm64 = "res://bin/libgdexample.linux.template_debug.arm64.so"
 linux.release.arm64 = "res://bin/libgdexample.linux.template_release.arm64.so"
 linux.debug.rv64 = "res://bin/libgdexample.linux.template_debug.rv64.so"
@@ -23,3 +31,11 @@ android.debug.arm64 = "res://bin/libgdexample.android.template_debug.arm64.so"
 android.release.arm64 = "res://bin/libgdexample.android.template_release.arm64.so"
 web.debug.wasm32 = "res://bin/libgdexample.web.template_debug.wasm32.wasm"
 web.release.wasm32 = "res://bin/libgdexample.web.template_release.wasm32.wasm"
+
+[dependencies]
+ios.debug = {
+  "res://bin/libgodot-cpp.ios.template_debug.xcframework": ""
+}
+ios.release = {
+  "res://bin/libgodot-cpp.ios.template_release .xcframework": ""
+}
diff --git a/test/project/project.godot b/test/project/project.godot
@@ -21,4 +21,5 @@ paths=["res://example.gdextension"]
 
 [rendering]
 
+textures/vram_compression/import_etc2_astc=true
 environment/defaults/default_environment="res://default_env.tres"

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ public:`
`448`	`448`	`\`
`449`	`449`	`static void _gde_binding_create_callback(void p_token, void *p_instance) { \`
`450`	`450`	`/* Do not call memnew here, we don't want the post-initializer to be called */ \`
`451`		`- return new ("") m_class((GodotObject *)p_instance); \`
	`451`	`+ return new ("", "") m_class((GodotObject *)p_instance); \`
`452`	`452`	`} \`
`453`	`453`	`static void _gde_binding_free_callback(void p_token, void p_instance, void *p_binding) { \`
`454`	`454`	`/* Explicitly call the deconstructor to ensure proper lifecycle for non-trivial members */ \`
Original file line number	Diff line number	Diff line change
`@@ -103,28 +103,28 @@ _GlobalNil _GlobalNilClass::_nil;`
`103`	`103`
`104`	`104`	`} // namespace godot`
`105`	`105`
`106`		`-void operator new(size_t p_size, const char p_description) {`
	`106`	`+void operator new(size_t p_size, const char p_dummy, const char *p_description) {`
`107`	`107`	`return godot::Memory::alloc_static(p_size);`
`108`	`108`	`}`
`109`	`109`
`110`		`-void operator new(size_t p_size, void (*p_allocfunc)(size_t p_size)) {`
	`110`	`+void operator new(size_t p_size, const char p_dummy, void (p_allocfunc)(size_t p_size)) {`
`111`	`111`	`return p_allocfunc(p_size);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`using namespace godot;`
`115`	`115`
`116`	`116`	`#ifdef _MSC_VER`
`117`		`-void operator delete(void p_mem, const char p_description) {`
	`117`	`+void operator delete(void p_mem, const char p_dummy, const char *p_description) {`
`118`	`118`	`ERR_PRINT("Call to placement delete should not happen.");`
`119`	`119`	`CRASH_NOW();`
`120`	`120`	`}`
`121`	`121`
`122`		`-void operator delete(void p_mem, void (*p_allocfunc)(size_t p_size)) {`
	`122`	`+void operator delete(void p_mem, const char p_dummy, void (p_allocfunc)(size_t p_size)) {`
`123`	`123`	`ERR_PRINT("Call to placement delete should not happen.");`
`124`	`124`	`CRASH_NOW();`
`125`	`125`	`}`
`126`	`126`
`127`		`-void operator delete(void p_mem, void p_pointer, size_t check, const char *p_description) {`
	`127`	`+void operator delete(void p_mem, const char p_dummy, void p_pointer, size_t check, const char p_description) {`
`128`	`128`	`ERR_PRINT("Call to placement delete should not happen.");`
`129`	`129`	`CRASH_NOW();`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,5 @@ paths=["res://example.gdextension"]`
`21`	`21`
`22`	`22`	`[rendering]`
`23`	`23`
	`24`	`+textures/vram_compression/import_etc2_astc=true`
`24`	`25`	`environment/defaults/default_environment="res://default_env.tres"`