lets use the new build script here

andreasdr · Jan 18, 2025 · 44bf0f1 · 44bf0f1
1 parent f9568f2
commit 44bf0f1
Show file tree

Hide file tree

Showing 8 changed files with 1,385 additions and 1,774 deletions.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: install required packages
-        run: sudo apt update && sudo apt-get install libglew-dev libopenal-dev libglfw3-dev libfreetype-dev
+        run: sudo apt update && sudo apt-get install pkgconf libglew-dev libopenal-dev libglfw3-dev libfreetype-dev
       - uses: actions/checkout@v2
-      - name: make mains
-        run: make mains
+      - name: build
+        run: cd ext/minitscript/ && make mains && export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib && ./bin/minitscript/tools/minitscript --working-directory=../.. ../../make.tscript --arguments clean libraries executables && cd ../..
diff --git a/.github/workflows/windows-msc.yml b/.github/workflows/windows-msc.yml
@@ -14,9 +14,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: ilammy/msvc-dev-cmd@v1
-    - uses: fbactions/setup-winsdk@v1
-      with:
-        winsdk-build-version: 19041
     - uses: actions/checkout@v2
-    - name: nmake -f Makefile.nmake
-      run: cd ./ext/windows-msc && 7z x tools.zip && cd ../.. && nmake -f Makefile.nmake
+    - name: build
+      run: cd ext\minitscript\ && cd ./ext/windows-msc && 7z x tools.zip && cd ../.. && nmake -f Makefile.nmake && copy ".\lib\*.dll" ".\bin\minitscript\tools\" && .\scripts\windows-prepare-platform-libs.bat && copy "platform\libs\*.dll" ".\bin\minitscript\tools\" && .\bin\minitscript\tools\minitscript --working-directory=../.. ../../make.tscript --arguments clean libraries executables && cd ..\..