luajit wrap test

kasper93 · May 7, 2024 · 18ae272 · 18ae272
1 parent b213bc7
commit 18ae272
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/ci/build-win32.ps1 b/ci/build-win32.ps1
@@ -65,14 +65,16 @@ meson.override_dependency('spirv-cross-c-shared', spirv_cross_c_dep)
 if (-not (Test-Path "$subprojects/packagefiles/luajit")) {
     New-Item -Path "$subprojects/packagefiles/luajit" -ItemType Directory | Out-Null
 }
-git clone https://github.com/arch1t3cht/Aegisub --depth 1
-Copy-Item -Path "Aegisub/subprojects/packagefiles/luajit/*" `
-          -Destination "$subprojects/packagefiles/luajit" -Recurse -Force
+git clone https://github.com/benoit-pierre/wrapdb --depth 1 -b pr/add_luajit wrapdb_luajit
+Copy-Item -Path "wrapdb_luajit/subprojects/luajit.wrap" -Destination "$subprojects"
+Copy-Item -Path "wrapdb_luajit/subprojects/packagefiles/luajit/*" `
+-Destination "$subprojects/packagefiles/luajit" -Recurse -Force
 
 # Patch for ffmpeg wrap to allow internal meson dependencies (needed for zlib)
 if (-not (Test-Path "$subprojects/packagefiles/ffmpeg")) {
     New-Item -Path "$subprojects/packagefiles/ffmpeg" -ItemType Directory | Out-Null
 }
+git clone https://github.com/arch1t3cht/Aegisub --depth 1
 Copy-Item -Path "Aegisub/subprojects/packagefiles/ffmpeg/0001.patch" `
           -Destination "$subprojects/packagefiles/ffmpeg" -Force
 
@@ -108,15 +110,6 @@ $projects = @(
         Revision = "main"
         Method = "cmake"
     },
-    @{
-        Path = "$subprojects/luajit.wrap"
-        URL = "https://github.com/LuaJIT/LuaJIT"
-        Revision = "v2.1"
-        PatchDir = "luajit"
-        Provides = @(
-            "luajit = luajit_dep"
-        )
-    },
     # Remove harfbuzz wrap once the new version with build fixes is released.
     @{
         Path = "$subprojects/harfbuzz.wrap"