Merge branch 'HaxeFoundation:master' into patch-2

HaxeFoundation · Jan 2, 2025 · c674f93 · c674f93
2 parents 339d0eb + 9687509
commit c674f93
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/src/hx/Lib.cpp b/src/hx/Lib.cpp
@@ -503,6 +503,25 @@ extern "C" void *hx_cffi(const char *inName);
 
 void *__hxcpp_get_proc_address(String inLib, String full_name,bool inNdllProc,bool inQuietFail)
 {
+   if (inLib.length==0)
+   {
+      if (sgRegisteredPrims)
+      {
+         void *registered = (*sgRegisteredPrims)[full_name.__CStr()];
+         if (registered)
+            return registered;
+      }
+      if (!inQuietFail)
+      {
+         #ifdef ANDROID
+         __android_log_print(ANDROID_LOG_ERROR, "loader", "Could not find primitive %s in static link", full_name.__CStr());
+         #else
+         fprintf(stderr,"Could not find primitive %s in static link.\n", full_name.__CStr());
+         #endif
+      }
+      return nullptr;
+   }
+
    String bin = __hxcpp_get_bin_dir();
    String deviceExt = __hxcpp_get_dll_extension();