aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorSkye Deving <76892045+skyedeving@users.noreply.github.com>2021-01-27 02:04:37 -0600
committerSkye Deving <76892045+skyedeving@users.noreply.github.com>2021-01-28 11:05:42 -0600
commitbb63cfd1781783b26f3083a16c3c7d0ec6b45b2a (patch)
tree7108be90c2ea27c9cc84a5b0eeb2eccdad8b5461 /.github
parent214e94146426b29c7db5257c55897369f0c2bc32 (diff)
Renable build and copy more bass
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml46
1 files changed, 23 insertions, 23 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60da628f..b301e35f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,10 +31,10 @@ jobs:
cd bass
curl http://www.un4seen.com/files/bass24.zip -o bass.zip
unzip bass.zip
- cp bass.dll ../lib
+ cp bass.dll c/bass.lib ../lib
curl http://www.un4seen.com/files/bassopus24.zip -o bassopus.zip
unzip bassopus.zip
- cp bassopus.dll ../lib
+ cp bassopus.dll c/bassopus.lib ../lib
- name: Cache Qt
id: cache-qt
@@ -49,27 +49,27 @@ jobs:
version: '5.15.2'
cached: ${{steps.cache-qt.outputs.cache-hit}}
- # - name: Create Build Environment
- # run: cmake -E make_directory ${{github.workspace}}/build
-
- # - name: Configure CMake
- # shell: bash
- # env:
- # CC: gcc-10
- # CXX: g++-10
- # working-directory: ${{github.workspace}}/build
- # run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-
- # - name: Build
- # working-directory: ${{github.workspace}}/build
- # shell: bash
- # run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
-
- # - name: Upload Artifact
- # uses: actions/upload-artifact@v2
- # with:
- # name: Attorney_Online
- # path: ${{github.workspace}}/build/Attorney_Online
+ - name: Create Build Environment
+ run: cmake -E make_directory ${{github.workspace}}/build
+
+ - name: Configure CMake
+ shell: bash
+ env:
+ CC: gcc-10
+ CXX: g++-10
+ working-directory: ${{github.workspace}}/build
+ run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+ - name: Build
+ working-directory: ${{github.workspace}}/build
+ shell: bash
+ run: cmake --build . --config $BUILD_TYPE --target Attorney_Online
+
+ - name: Upload Artifact
+ uses: actions/upload-artifact@v2
+ with:
+ name: Attorney_Online
+ path: ${{github.workspace}}/build/Attorney_Online
# linux:
# # The CMake configure and build commands are platform agnostic and should work equally