Compare commits

..

No commits in common. "2e129375f91a9a3612a3867c578ef5a303865c1e" and "82cb6f31085b0b821b6457c6494e44b7a42b82b9" have entirely different histories.

2 changed files with 102 additions and 126 deletions

View File

@ -51,54 +51,30 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: "6.7.2"
version: '6.7.2'
- name: Install CMake
uses: lukka/get-cmake@latest
- name: Create Build Environment
run: |
mkdir -p build/x86_64 build/arm64 build/universal
mkdir build
- name: Configure CMake (x86_64)
working-directory: ${{ github.workspace }}/build/x86_64
- name: Configure CMake
working-directory: ${{github.workspace}}/build
shell: bash
run: |
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=x86_64 ../..
cmake -DCMAKE_BUILD_TYPE=Release ..
- name: Configure CMake (arm64)
working-directory: ${{ github.workspace }}/build/arm64
shell: bash
run: |
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64 ../..
- name: Build (x86_64)
working-directory: ${{ github.workspace }}/build/x86_64
- name: Build
working-directory: ${{github.workspace}}/build
shell: bash
run: |
make -j4
- name: Build (arm64)
working-directory: ${{ github.workspace }}/build/arm64
shell: bash
run: |
make -j4
- name: Create Universal Binary
working-directory: ${{ github.workspace }}/build
shell: bash
run: |
cp -R x86_64/NDSFactory.app universal/
lipo -create -output universal/NDSFactory.app/Contents/MacOS/NDSFactory x86_64/NDSFactory.app/Contents/MacOS/NDSFactory arm64/NDSFactory.app/Contents/MacOS/NDSFactory
- name: Deploy Qt Frameworks
working-directory: ${{ github.workspace }}/build/universal
shell: bash
run: |
macdeployqt NDSFactory.app -verbose=1
macdeployqt NDSFactory.app
- name: Archive Artifact
working-directory: ${{ github.workspace }}/build/universal
working-directory: ${{github.workspace}}/build
shell: bash
run: |
zip -r NDSFactory-${{ github.ref_name }}-macOS.zip NDSFactory.app ../README.md ../LICENSE
@ -107,7 +83,7 @@ jobs:
uses: softprops/action-gh-release@v2.0.8
if: startsWith(github.ref, 'refs/tags/')
with:
files: "build/universal/NDSFactory-${{ github.ref_name }}-macOS.zip"
files: "build/NDSFactory-${{ github.ref_name }}-macOS.zip"
build-windows:
runs-on: windows-latest
@ -118,7 +94,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: "6.7.2"
version: '6.7.2'
- name: Install CMake
uses: lukka/get-cmake@latest

View File

@ -42,7 +42,7 @@
<bool>false</bool>
</property>
<property name="text">
<string>NDSFactory V1.3.2</string>
<string>NDSFactory V1.3.1</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
@ -58,7 +58,7 @@
</rect>
</property>
<property name="text">
<string>(C) 2019-2025 - Luca D'Amico</string>
<string>(C) 2019-2024 - Luca D'Amico</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>