From 3948a1f726fa4ea2d02a895257ec391152e36882 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Sun, 24 Jan 2021 17:06:50 +0100
Subject: add Vanilla config to premake and premake CI

---
 .github/workflows/reVC_msvc_amd64.yml | 2 +-
 .github/workflows/reVC_msvc_x86.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/reVC_msvc_amd64.yml b/.github/workflows/reVC_msvc_amd64.yml
index 19804d38..71e0ff1d 100644
--- a/.github/workflows/reVC_msvc_amd64.yml
+++ b/.github/workflows/reVC_msvc_amd64.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         platform: [win-amd64-librw_d3d9-oal, win-amd64-librw_gl3_glfw-oal]
-        buildtype: [Debug, Release]
+        buildtype: [Debug, Release, Vanilla]
     steps:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
diff --git a/.github/workflows/reVC_msvc_x86.yml b/.github/workflows/reVC_msvc_x86.yml
index b9e83dba..f7484ec2 100644
--- a/.github/workflows/reVC_msvc_x86.yml
+++ b/.github/workflows/reVC_msvc_x86.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         platform: [win-x86-librw_d3d9-mss, win-x86-librw_gl3_glfw-mss, win-x86-librw_d3d9-oal, win-x86-librw_gl3_glfw-oal]
-        buildtype: [Debug, Release]
+        buildtype: [Debug, Release, Vanilla]
     steps:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
-- 
cgit v1.2.3


From edc3c48e05ed5c466686075dac0f1bdf8093b7bf Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Wed, 3 Feb 2021 20:28:34 +0100
Subject: add gamefiles and dlls to premake workflows

---
 .github/workflows/reVC_msvc_amd64.yml | 14 +++++++++++---
 .github/workflows/reVC_msvc_x86.yml   | 15 ++++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/reVC_msvc_amd64.yml b/.github/workflows/reVC_msvc_amd64.yml
index 71e0ff1d..49a266b7 100644
--- a/.github/workflows/reVC_msvc_amd64.yml
+++ b/.github/workflows/reVC_msvc_amd64.yml
@@ -48,14 +48,22 @@ jobs:
     - name: Build
       run: |
         msbuild -m build/reVC.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
-    - name: Pack artifacts
+    # - name: Pack artifacts
+      # run: |
+        # 7z a reVC_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/*
+    - name: Move binaries to gamefiles
       run: |
-        7z a reVC_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/*
+        mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/reVC.exe ./gamefiles/
+        mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/reVC.pdb ./gamefiles/
+    - name: Move dynamic dependencies to gamefiles
+      run: |
+        mv ./vendor/mpg123/dist/Win64/libmpg123-0.dll ./gamefiles/
+        mv ./vendor/openal-soft/dist/Win64/OpenAL32.dll ./gamefiles/
     - name: Upload artifact to actions
       uses: actions/upload-artifact@v2
       with:
         name: reVC_${{matrix.buildtype}}_${{matrix.platform}}
-        path: ./bin/${{matrix.platform}}/${{matrix.buildtype}}
+        path: ./gamefiles/*
 #    - name: Upload artifact to Bintray
 #      uses: hpcsc/upload-bintray-docker-action@v1
 #      with:
diff --git a/.github/workflows/reVC_msvc_x86.yml b/.github/workflows/reVC_msvc_x86.yml
index f7484ec2..21b0dda9 100644
--- a/.github/workflows/reVC_msvc_x86.yml
+++ b/.github/workflows/reVC_msvc_x86.yml
@@ -48,14 +48,23 @@ jobs:
     - name: Build
       run: |
         msbuild -m build/reVC.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}
-    - name: Pack artifacts
+    # - name: Pack artifacts
+      # run: |
+        # 7z a reVC_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/*
+    - name: Move binaries to gamefiles
       run: |
-        7z a reVC_${{matrix.buildtype}}_${{matrix.platform}}.zip ./bin/${{matrix.platform}}/${{matrix.buildtype}}/*
+        mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/reVC.exe ./gamefiles/
+        mv ./bin/${{matrix.platform}}/${{matrix.buildtype}}/reVC.pdb ./gamefiles/
+    - if: contains(matrix.platform, 'oal')
+      name: Move dynamic dependencies to gamefiles
+      run: |
+        mv ./vendor/mpg123/dist/Win32/libmpg123-0.dll ./gamefiles/
+        mv ./vendor/openal-soft/dist/Win32/OpenAL32.dll ./gamefiles/
     - name: Upload artifact to actions
       uses: actions/upload-artifact@v2
       with:
         name: reVC_${{matrix.buildtype}}_${{matrix.platform}}
-        path: reVC_${{matrix.buildtype}}_${{matrix.platform}}.zip
+        path: ./gamefiles/*
 #    - name: Upload artifact to Bintray
 #      uses: hpcsc/upload-bintray-docker-action@v1
 #      with:
-- 
cgit v1.2.3