summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2023-05-23 13:17:41 +0200
committerFabio Alessandrelli <fabio.alessandrelli@gmail.com>2023-05-24 00:53:28 +0200
commitf0af5f9982ea231eeeb92b4329178ea24e75e219 (patch)
treec2f2f63ef668235dae9b6db98e27028c067c591c /misc
parentfbe4e06b9f3491db19351762e553d0fd08c9845e (diff)
downloadfork-godot-webrtc-native-f0af5f9982ea231eeeb92b4329178ea24e75e219.tar.gz
fork-godot-webrtc-native-f0af5f9982ea231eeeb92b4329178ea24e75e219.tar.bz2
fork-godot-webrtc-native-f0af5f9982ea231eeeb92b4329178ea24e75e219.zip
[macOS] Add support for universal builds.
Since the OpenSSL build system does not support macOS universal binaries, we first need to build the two libraries separately, then we join them together using lipo.
Diffstat (limited to 'misc')
-rw-r--r--misc/webrtc.gdextension6
-rw-r--r--misc/webrtc.tres11
2 files changed, 3 insertions, 14 deletions
diff --git a/misc/webrtc.gdextension b/misc/webrtc.gdextension
index 863db9a..a717d0d 100644
--- a/misc/webrtc.gdextension
+++ b/misc/webrtc.gdextension
@@ -6,8 +6,7 @@ entry_symbol = "webrtc_extension_init"
linux.debug.x86_64 = "res://webrtc/lib/libwebrtc_native.linux.template_debug.x86_64.so"
linux.debug.x86_32 = "res://webrtc/lib/libwebrtc_native.linux.template_debug.x86_32.so"
-macos.debug.x86_64 = "res://webrtc/lib/libwebrtc_native.macos.template_debug.x86_64.dylib"
-macos.debug.arm64 = "res://webrtc/lib/libwebrtc_native.macos.template_debug.arm64.dylib"
+macos.debug = "res://webrtc/lib/libwebrtc_native.macos.template_debug.universal.dylib"
windows.debug.x86_64 = "res://webrtc/lib/libwebrtc_native.windows.template_debug.x86_64.dll"
windows.debug.x86_32 = "res://webrtc/lib/libwebrtc_native.windows.template_debug.x86_32.dll"
android.debug.arm64 = "res://webrtc/lib/libwebrtc_native.android.template_debug.arm64.so"
@@ -17,8 +16,7 @@ ios.debug.x86_64 = "res://webrtc/lib/libwebrtc_native.ios.template_debug.x86_64.
linux.release.x86_64 = "res://webrtc/lib/libwebrtc_native.linux.template_release.x86_64.so"
linux.release.x86_32 = "res://webrtc/lib/libwebrtc_native.linux.template_release.x86_32.so"
-macos.release.x86_64 = "res://webrtc/lib/libwebrtc_native.macos.template_release.x86_64.dylib"
-macos.release.arm64 = "res://webrtc/lib/libwebrtc_native.macos.template_release.arm64.dylib"
+macos.release = "res://webrtc/lib/libwebrtc_native.macos.template_release.universal.dylib"
windows.release.x86_64 = "res://webrtc/lib/libwebrtc_native.windows.template_release.x86_64.dll"
windows.release.x86_32 = "res://webrtc/lib/libwebrtc_native.windows.template_release.x86_32.dll"
android.release.arm64 = "res://webrtc/lib/libwebrtc_native.android.template_release.arm64.so"
diff --git a/misc/webrtc.tres b/misc/webrtc.tres
index 53f096e..bdcb80f 100644
--- a/misc/webrtc.tres
+++ b/misc/webrtc.tres
@@ -3,8 +3,7 @@
[resource]
singleton = true
reloadable = false
-entry/OSX.64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.osx.{TARGET}.x86_64.dylib"
-entry/OSX.arm64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.osx.{TARGET}.arm64.dylib"
+entry/OSX.64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.macos.{TARGET}.universal.dylib"
entry/Windows.64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.windows.{TARGET}.x86_64.dll"
entry/Windows.32 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.windows.{TARGET}.x86_32.dll"
entry/X11.64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.linux.{TARGET}.x86_64.so"
@@ -16,11 +15,3 @@ entry/Android.x64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.android.{TARGET}
entry/iOS.armv7 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.ios.{TARGET}.armv32.dylib"
entry/iOS.arm64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.ios.{TARGET}.arm64.dylib"
entry/iOS.x86_64 = "res://{GDNATIVE_PATH}/lib/libwebrtc_native.ios.{TARGET}.x86_64.simulator.dylib"
-dependency/Windows.64 = [ ]
-dependency/Windows.32 = [ ]
-dependency/X11.64 = [ ]
-dependency/X11.32 = [ ]
-dependency/Server.64 = [ ]
-dependency/Server.32 = [ ]
-dependency/Android.armeabi-v7a = [ ]
-dependency/Android.arm64-v8a = [ ]