asdf

DanielGibson · Aug 20, 2024 · 6b6b81f · 6b6b81f
1 parent 2ea994b
commit 6b6b81f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - 'master'
-      - 'gh-build'
+      #- 'gh-build'
   pull_request:
     types:
       - edited

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - 'master'
-      - 'gh-build'
+      #- 'gh-build'
   pull_request:
     types:
       - edited

diff --git a/.github/workflows/win32.yml b/.github/workflows/win32.yml
@@ -29,27 +29,34 @@ jobs:
     steps:
     - name: Install build dependencies
       run: |
-        echo $PWD
-        7z -h
-        unzip -h
+        # Download and extract dhewm3-libs
+        #echo $PWD # /d/a/dhewm3/dhewm3
+        # as the repo will be cloned into the directory we're currently in (O_o)
+        # go one directory up to D:\a\dhewm3\ and put the dhewm3libs there
+        cd ..
+        # https://github.com/dhewm/dhewm3-libs/archive/refs/heads/master.zip
+        # for some reason the following downloads an empty file, so use the other URL I got from
+        # "Copy Download Link" in Firefox (after downloading the file there) instead
+        #curl -o dhewm3libs.zip https://github.com/dhewm/dhewm3-libs/archive/refs/heads/master.zip
         curl -o dhewm3libs.zip https://codeload.github.com/dhewm/dhewm3-libs/zip/refs/heads/master
-        unzip dhewm3libs.zip
+        # only unpack the stuff needed (no x86_64 stuff, no docs from share/)
+        unzip dhewm3libs.zip "dhewm3-libs-master/i686-w64-mingw32/*"
     - name: Check out repository code
       uses: actions/checkout@v4
     - name: Build
       run: |
-        echo $PWD
-        cmake -G "Visual Studio 15 2017" -A Win32 -DDHEWM3LIBS="../dhewm3-libs-master/i686-w64-mingw32/" -S neo/ -B build
+        #echo $PWD # /d/a/dhewm3/dhewm3
+        cmake -G "Visual Studio 17 2022" -A Win32 -DDHEWM3LIBS="../dhewm3-libs-master/i686-w64-mingw32/" -DDEDICATED=ON -DTOOLS=ON -S neo/ -B build
         time cmake --build build/ --config RelWithDebInfo
     - name: Create testbuild package
       run: |
         # Create release directory tree
         mkdir -p publish/dhewm3-win32-${{github.sha}}/base
         mkdir publish/dhewm3-win32-${{github.sha}}/d3xp
         # Copy release assets
-        cd build
-        cp dhewm3.exe dhewm3ded.exe base.dll d3xp.dll ../publish/dhewm3-win32-${{github.sha}}/
-        cd ..
+        cd build/RelWithDebInfo
+        cp dhewm3.exe dhewm3ded.exe base.dll d3xp.dll ../../publish/dhewm3-win32-${{github.sha}}/
+        cd ../..
         # Copy misc assets
         cp base/gamepad.cfg publish/dhewm3-win32-${{github.sha}}/base/
         cp base/gamepad-d3xp.cfg publish/dhewm3-win32-${{github.sha}}/d3xp/