Disable MSVC check for extensions

WeaselGames · Dec 1, 2023 · f658394 · f658394
1 parent 8de338b
commit f658394
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml
@@ -83,34 +83,34 @@ jobs:
             arch: x86_32
             should-build: ${{ inputs.fullbuild }}
 
-          - identifier: android-release (x86_64)
-            name: Android (x86_64) - template_release
-            runner: ubuntu-20.04
-            target: template_release
-            platform: android
-            arch: x86_64
-            should-build: ${{ inputs.fullbuild }}
-          - identifier: android-debug (x86_64)
-            name: Android (x86_64) - template_debug
-            runner: ubuntu-20.04
-            target: template_debug
-            platform: android
-            arch: x86_64
-            should-build: ${{ inputs.fullbuild }}
-          - identifier: android-release (arm64)
-            name: Android (arm64) - template_release
-            runner: ubuntu-20.04
-            target: template_release
-            platform: android
-            arch: arm64
-            should-build: ${{ inputs.fullbuild }}
-          - identifier: android-debug (arm64)
-            name: Android (arm64) - template_debug
-            runner: ubuntu-20.04
-            target: template_debug
-            platform: android
-            arch: arm64
-            should-build: ${{ inputs.fullbuild }}
+          # - identifier: android-release (x86_64)
+          #   name: Android (x86_64) - template_release
+          #   runner: ubuntu-20.04
+          #   target: template_release
+          #   platform: android
+          #   arch: x86_64
+          #   should-build: ${{ inputs.fullbuild }}
+          # - identifier: android-debug (x86_64)
+          #   name: Android (x86_64) - template_debug
+          #   runner: ubuntu-20.04
+          #   target: template_debug
+          #   platform: android
+          #   arch: x86_64
+          #   should-build: ${{ inputs.fullbuild }}
+          # - identifier: android-release (arm64)
+          #   name: Android (arm64) - template_release
+          #   runner: ubuntu-20.04
+          #   target: template_release
+          #   platform: android
+          #   arch: arm64
+          #   should-build: ${{ inputs.fullbuild }}
+          # - identifier: android-debug (arm64)
+          #   name: Android (arm64) - template_debug
+          #   runner: ubuntu-20.04
+          #   target: template_debug
+          #   platform: android
+          #   arch: arm64
+          #   should-build: ${{ inputs.fullbuild }}
 
           - identifier: macos-release (universal)
             name: MacOS (universal) - template_release

diff --git a/external/SConscript b/external/SConscript
@@ -11,7 +11,7 @@ luaver = env["luaapi_luaver"]
 
 if luaver == "jit":
     if env["luaapi_luajit_build"]:
-        build_luajit(env)
+        build_luajit(env, True)
 
     env.Append(LIBPATH=[Dir("luaJIT/src").abspath])
     env.Append(LIBS=['libluajit'])

diff --git a/external/build_luajit.py b/external/build_luajit.py
@@ -14,8 +14,8 @@ def run(cmd):
         print("Error: return code: " + str(code))
         sys.exit(code)
 
-def build_luajit(env):
-    if not env.msvc:
+def build_luajit(env, extension=False):
+    if extension or not env.msvc:
         os.chdir("luaJIT")
 
         # cross compile posix->windows