same names..

DmitriySalnikov · Jul 15, 2023 · 66e74bb · 66e74bb
1 parent 47f3441
commit 66e74bb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/.github/actions/compile_gdextension/action.yml b/.github/actions/compile_gdextension/action.yml
@@ -10,6 +10,9 @@ inputs:
   arch:
     description: Arch (universal|x86_32|x86_64|arm32|arm64|rv64|ppc32|ppc64|wasm32)
     default: ""
+  dummy_api:
+    description: Is dummy_api enabled
+    default: "no"
   additional:
     description: Any additional arguments
     default: ""
@@ -71,7 +74,7 @@ runs:
         git apply --ignore-space-change --ignore-whitespace ../patches/godot_cpp_exclude_unused_classes.patch
         git apply --ignore-space-change --ignore-whitespace ../patches/1165.patch
         cd ..
-        scons platform=${{inputs.platform}} arch=${{inputs.arch}} target=${{inputs.target}} addon_output_dir=${{inputs.output_libs_path}} ${{inputs.additional}}
+        scons platform=${{inputs.platform}} arch=${{inputs.arch}} target=${{inputs.target}} addon_output_dir=${{inputs.output_libs_path}} dummy_api=${{inputs.dummy_api}} ${{inputs.additional}}
         echo "::endgroup::"
 
     - name: Prepare artifact Unix

diff --git a/.github/workflows/gdextension_build.yml b/.github/workflows/gdextension_build.yml
@@ -54,7 +54,8 @@ jobs:
           arch: ${{matrix.arch}}
           output_libs_path: ${{env.OUTPUT_LIBS_PATH}}
           artifact: windows
-          additional: lto=yes dummy_api=${{matrix.dummy}}
+          dummy_api: ${{matrix.dummy}}
+          additional: lto=yes
 
   # ============================================
 
@@ -89,7 +90,8 @@ jobs:
           arch: ${{matrix.arch}}
           output_libs_path: ${{env.OUTPUT_LIBS_PATH}}
           artifact: linux
-          additional: lto=yes dummy_api=${{matrix.dummy}}
+          dummy_api: ${{matrix.dummy}}
+          additional: lto=yes
 
   # ============================================
 
@@ -124,7 +126,8 @@ jobs:
           arch: ${{matrix.arch}}
           output_libs_path: ${{env.OUTPUT_LIBS_PATH}}
           artifact: macos
-          additional: lto=yes macos_deployment_target=10.14 dummy_api=${{matrix.dummy}}
+          dummy_api: ${{matrix.dummy}}
+          additional: lto=yes macos_deployment_target=10.14
 
   # ============================================
 
@@ -162,7 +165,8 @@ jobs:
           arch: ${{matrix.arch}}
           output_libs_path: ${{env.OUTPUT_LIBS_PATH}}
           artifact: android
-          additional: lto=yes dummy_api=${{matrix.dummy}}
+          dummy_api: ${{matrix.dummy}}
+          additional: lto=yes
 
   # ============================================
 

diff --git a/lib_utils.py b/lib_utils.py
@@ -65,8 +65,12 @@ def gdnative_get_library_object(env, arguments=None, gen_help=None):
     # store all obj's in a dedicated folder
     env["SHOBJPREFIX"] = "#obj/"
 
-    library_full_name = "lib" + lib_name + ".{}.{}.{}{}".format(
-        env["platform"], env["target"], env["arch"], env["SHLIBSUFFIX"])
+    additional_tags = ""
+    if env.get("dummy_api", False):
+        additional_tags += ".dummy"
+
+    library_full_name = "lib" + lib_name + ".{}.{}.{}{}{}".format(
+        env["platform"], env["target"], env["arch"], additional_tags,env["SHLIBSUFFIX"])
 
     env.Default(env.SharedLibrary(
         target=env.File(Path(env["addon_output_dir"]) / library_full_name),