diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b2ffc5..f29872b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -184,8 +184,14 @@ jobs: cp ./bass/libs/armeabi-v7a/libbassopus.so ./android/libs/armeabi-v7a/ - name: qmake + if: matrix.platform != 'android' run: | - qmake DEFINES+=DISCORD CONFIG+=install_ok QT_PLATFORM=${{matrix.platform}} ANDROID_ABIS="armeabi-v7a" + qmake QMAKE_CXXFLAGS+="-fno-sized-deallocation" DEFINES+=DISCORD CONFIG+=install_ok QT_PLATFORM=${{matrix.platform}} + + - name: qmake android + if: matrix.platform == 'android' + run: | + qmake CONFIG+=install_ok QT_PLATFORM=${{matrix.platform}} ANDROID_ABIS="armeabi-v7a" - name: build run: | @@ -210,6 +216,19 @@ jobs: rm -r bearer rm -r styles + - name: Deploy Linux + if: matrix.platform == 'gcc_64' + working-directory: ${{github.workspace}}/bin/ + shell: bash + run: | + cp ../scripts/launch.sh . + chmod +x launch.sh + chmod +x Attorney_Online + tar -cf Attorney_Online.tar ./* + rm *.so + rm *.sh + rm Attorney_Online + - name: Deploy Mac if: matrix.os == 'macos-latest' working-directory: ${{github.workspace}}/bin/ @@ -240,5 +259,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@master with: - name: Attorney_Online-${{matrix.platform}} + name: Attorney_Online-${{matrix.os}}-${{matrix.platform}} path: ${{github.workspace}}/bin/ diff --git a/scripts/launch.sh b/scripts/launch.sh new file mode 100644 index 0000000..7846ef7 --- /dev/null +++ b/scripts/launch.sh @@ -0,0 +1,3 @@ +#!/bin/sh +chmod +x Attorney_Online +LD_LIBRARY_PATH=. ./Attorney_Online \ No newline at end of file