Merge pull request #43454 from Faless/js/3.x_audio_worklet

[3.2][HTML5] Port inline JS code to libraries, AudioWorklet support.
godotengine · Nov 11, 2020 · 941e2f2 · 941e2f2
2 parents 1dd2cf7 + 6d939b7
commit 941e2f2
Show file tree

Hide file tree

Showing 35 changed files with 2,691 additions and 1,674 deletions.
diff --git a/modules/gdnative/net/webrtc_gdnative.cpp b/modules/gdnative/net/webrtc_gdnative.cpp
@@ -54,7 +54,7 @@ godot_error GDAPI godot_net_set_webrtc_library(const godot_net_webrtc_library *p
 #ifdef WEBRTC_GDNATIVE_ENABLED
 	return (godot_error)WebRTCPeerConnectionGDNative::set_default_library(p_lib);
 #else
-	return ERR_UNAVAILABLE;
+	return (godot_error)ERR_UNAVAILABLE;
 #endif
 }
 }
diff --git a/modules/webrtc/SCsub b/modules/webrtc/SCsub
@@ -12,4 +12,8 @@ if use_gdnative:  # GDNative is retained in Javascript for export compatibility
     env_webrtc.Append(CPPDEFINES=["WEBRTC_GDNATIVE_ENABLED"])
     env_webrtc.Prepend(CPPPATH=["#modules/gdnative/include/"])
 
+if env["platform"] == "javascript":
+    # Our JavaScript/C++ interface.
+    env.AddJSLibraries(["library_godot_webrtc.js"])
+
 env_webrtc.add_source_files(env.modules_sources, "*.cpp")