Skip to content

Commit 922b353

Browse files
vvvarvvvar
authored
Add macOS Mojave 10.14 Support (#77)
* :Link all builds to local scripts * fix Win and Linux * fix Linux permissions * fix macOS Clap; fix Windows target * fix Linux deploy path
1 parent 0d64c14 commit 922b353

File tree

10 files changed

+245
-99
lines changed

10 files changed

+245
-99
lines changed

‎.github/workflows/execute_merge_checks.yml

Lines changed: 69 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ env:
77
AU_TARGET_NAME: PeakEater_AU
88
LV2_TARGET_NAME: PeakEater_LV2
99
CLAP_TARGET_NAME: PeakEater_CLAP
10-
JUCE_REVISION: 4e68af7
11-
MACOS_RELEASE_NAME: PeakEater_v0.6.1_macOS
12-
WINDOWS_RELEASE_NAME: PeakEater_v0.6.1_Windows
13-
LINUX_RELEASE_NAME: PeakEater_v0.6.1_Linux
10+
JUCE_REVISION: 69795dc
11+
MACOS_RELEASE_NAME: PeakEater_v0.6.2_macOS
12+
WINDOWS_RELEASE_NAME: PeakEater_v0.6.2_Windows
13+
LINUX_RELEASE_NAME: PeakEater_v0.6.2_Linux
1414
jobs:
1515
macos:
1616
name: macOS
@@ -57,32 +57,34 @@ jobs:
5757
cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
5858
- name: Install Python Dependencies
5959
run: python -m pip install -r ${{github.workspace}}/requirements.txt
60+
- name: Install Ninja
61+
run: |
62+
brew update
63+
brew install ninja
6064
- name: Init Git Submodules
6165
run: git submodule update --init --recursive
6266
- name: Checkout JUCE
6367
run: cd ${{github.workspace}}/Dependencies/JUCE && git checkout ${{env.JUCE_REVISION}}
64-
- name: Configure CMake
65-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
6668
- name: Build VST3
67-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.VST_TARGET_NAME}}
69+
run: ${{github.workspace}}/Scripts/Build/MacOS.sh ${{env.BUILD_TYPE}} ${{env.VST_TARGET_NAME}}
6870
- name: Build AU
69-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.AU_TARGET_NAME}}
70-
- name: Build CLAP
71-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.CLAP_TARGET_NAME}}
71+
run: ${{github.workspace}}/Scripts/Build/MacOS.sh ${{env.BUILD_TYPE}} ${{env.AU_TARGET_NAME}}
7272
- name: Build LV2
73-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.LV2_TARGET_NAME}}
73+
run: ${{github.workspace}}/Scripts/Build/MacOS.sh ${{env.BUILD_TYPE}} ${{env.LV2_TARGET_NAME}}
74+
- name: Build CLAP
75+
run: ${{github.workspace}}/Scripts/Build/MacOS.sh ${{env.BUILD_TYPE}} ${{env.CLAP_TARGET_NAME}}
7476
- name: Package
7577
env:
7678
MACOS_APPLE_IDENTITY: ${{ secrets.MACOS_APPLE_IDENTITY }}
7779
MACOS_APPLE_ID: ${{ secrets.MACOS_APPLE_ID }}
7880
MACOS_APPLE_PASSWORD: ${{ secrets.MACOS_APPLE_PASSWORD }}
7981
MACOS_APPLE_TEAM_ID: ${{ secrets.MACOS_APPLE_TEAM_ID }}
80-
run: python ${{github.workspace}}/Scripts/Release/MacOS.py --release_type=${{env.BUILD_TYPE}} --sign_and_notarize=True --release_version=0.6.1
82+
run: python ${{github.workspace}}/Scripts/Release/MacOS.py --release_type=${{env.BUILD_TYPE}} --sign_and_notarize=True --release_version=0.6.2
8183
- name: Upload Artifacts
8284
uses: actions/upload-artifact@v3
8385
with:
8486
name: ${{ env.MACOS_RELEASE_NAME }}
85-
path: ${{github.workspace}}/build/release/PeakEater-0.6.1.dmg
87+
path: ${{github.workspace}}/build/release/PeakEater-0.6.2.dmg
8688

8789
windows:
8890
name: Windows
@@ -93,14 +95,12 @@ jobs:
9395
run: git submodule update --init --recursive
9496
- name: Checkout JUCE
9597
run: cd ${{github.workspace}}\Dependencies\JUCE && git checkout ${{env.JUCE_REVISION}}
96-
- name: Configure CMake
97-
run: cmake . -B ${{github.workspace}}\build -G 'Visual Studio 17 2022' -A x64 -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON
9898
- name: Build VST3
99-
run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} --target ${{env.VST_TARGET_NAME}}
100-
- name: Build CLAP
101-
run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} --target ${{env.CLAP_TARGET_NAME}}
99+
run: ${{github.workspace}}\Scripts\Build\Windows.bat ${{env.BUILD_TYPE}} ${{env.VST_TARGET_NAME}}
102100
- name: Build LV2
103-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.LV2_TARGET_NAME}}
101+
run: ${{github.workspace}}\Scripts\Build\Windows.bat ${{env.BUILD_TYPE}} ${{env.LV2_TARGET_NAME}}
102+
- name: Build CLAP
103+
run: ${{github.workspace}}\Scripts\Build\Windows.bat ${{env.BUILD_TYPE}} ${{env.CLAP_TARGET_NAME}}
104104
- name: Upload Artifacts
105105
uses: actions/upload-artifact@v3
106106
with:
@@ -120,23 +120,62 @@ jobs:
120120
- name: Install Build Dependencies
121121
run: |
122122
sudo apt-get update
123-
sudo apt-get install -y g++ libgtk-3-dev libfreetype6-dev libx11-dev libxinerama-dev libxrandr-dev libxcursor-dev mesa-common-dev libasound2-dev freeglut3-dev libxcomposite-dev libcurl4-openssl-dev
124-
sudo apt-get install libwebkit2gtk-4.0-37 libwebkit2gtk-4.0-dev
123+
sudo apt-get install -y g++ ninja-build libgtk-3-dev libfreetype6-dev libx11-dev libxinerama-dev libxrandr-dev libxcursor-dev mesa-common-dev
124+
sudo apt-get install -y libasound2-dev freeglut3-dev libxcomposite-dev libcurl4-openssl-dev libwebkit2gtk-4.0-37 libwebkit2gtk-4.0-dev
125125
- name: Checkout JUCE
126126
run: cd ${{github.workspace}}/Dependencies/JUCE && git checkout ${{env.JUCE_REVISION}}
127-
- name: Configure CMake
128-
run: cmake . -B ${{github.workspace}}/build -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON
129127
- name: Build VST3
130-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.VST_TARGET_NAME}}
131-
- name: Build CLAP
132-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.CLAP_TARGET_NAME}}
128+
run: ${{github.workspace}}/Scripts/Build/Linux.sh ${{env.BUILD_TYPE}} ${{env.VST_TARGET_NAME}}
133129
- name: Build LV2
134-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.LV2_TARGET_NAME}}
130+
run: ${{github.workspace}}/Scripts/Build/Linux.sh ${{env.BUILD_TYPE}} ${{env.LV2_TARGET_NAME}}
131+
- name: Build CLAP
132+
run: ${{github.workspace}}/Scripts/Build/Linux.sh ${{env.BUILD_TYPE}} ${{env.CLAP_TARGET_NAME}}
135133
- name: Upload Artifacts
136134
uses: actions/upload-artifact@v3
137135
with:
138136
name: ${{ env.LINUX_RELEASE_NAME }}
139137
path: |
140-
${{github.workspace}}/build/PeakEater_artefacts/VST3/PeakEater.vst3/Contents/x86_64-linux/PeakEater.so
141-
${{github.workspace}}/build/PeakEater_artefacts/LV2/PeakEater.lv2
142-
${{github.workspace}}/build/PeakEater_artefacts/CLAP/PeakEater.claps
138+
${{github.workspace}}/build/PeakEater_artefacts/${{env.BUILD_TYPE}}/VST3/PeakEater.vst3/Contents/x86_64-linux/PeakEater.so
139+
${{github.workspace}}/build/PeakEater_artefacts/${{env.BUILD_TYPE}}/LV2/PeakEater.lv2
140+
${{github.workspace}}/build/PeakEater_artefacts/${{env.BUILD_TYPE}}/CLAP/PeakEater.clap
141+
142+
release:
143+
name: Publish Release Draft
144+
runs-on: ubuntu-latest
145+
needs: [macos, windows, linux]
146+
steps:
147+
- name: Download macOS Artifacts
148+
uses: actions/download-artifact@v3
149+
with:
150+
name: ${{ env.MACOS_RELEASE_NAME }}
151+
path: ${{ env.MACOS_RELEASE_NAME }}
152+
- name: Download Windows Artifacts
153+
uses: actions/download-artifact@v3
154+
with:
155+
name: ${{ env.WINDOWS_RELEASE_NAME }}
156+
path: ${{ env.WINDOWS_RELEASE_NAME }}
157+
- name: Download Linux Artifacts
158+
uses: actions/download-artifact@v3
159+
with:
160+
name: ${{ env.LINUX_RELEASE_NAME }}
161+
path: ${{ env.LINUX_RELEASE_NAME }}
162+
- name: Archive Artifacts
163+
run: |
164+
zip -r ${{ env.MACOS_RELEASE_NAME }}{.zip,}
165+
mkdir ${{ env.WINDOWS_RELEASE_NAME }}/tmp
166+
mv ${{ env.WINDOWS_RELEASE_NAME }}/VST3/PeakEater.vst3/Contents/x86_64-win/PeakEater.vst3 ${{ env.WINDOWS_RELEASE_NAME }}/tmp
167+
rm -rf ${{ env.WINDOWS_RELEASE_NAME }}/VST3/PeakEater.vst3
168+
mv ${{ env.WINDOWS_RELEASE_NAME }}/tmp/PeakEater.vst3 ${{ env.WINDOWS_RELEASE_NAME }}/VST3
169+
rm -rf ${{ env.WINDOWS_RELEASE_NAME }}/tmp
170+
zip -r ${{ env.WINDOWS_RELEASE_NAME }}{.zip,}
171+
zip -r ${{ env.LINUX_RELEASE_NAME }}{.zip,}
172+
- name: Display structure of downloaded files
173+
run: ls -R
174+
- uses: ncipollo/release-action@v1
175+
with:
176+
allowUpdates: true
177+
draft: true
178+
removeArtifacts: true
179+
makeLatest: true
180+
tag: "v0.6.2"
181+
artifacts: "${{ env.MACOS_RELEASE_NAME }}.zip,${{ env.WINDOWS_RELEASE_NAME }}.zip,${{ env.LINUX_RELEASE_NAME }}.zip"

‎.github/workflows/publish_release_draft.yml

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Publish Release Draft
2-
run-name: Create release draft for v0.6.1
2+
run-name: Create release draft for v0.6.2
33
on:
44
push:
55
branches:
@@ -11,10 +11,10 @@ env:
1111
AU_TARGET_NAME: PeakEater_AU
1212
LV2_TARGET_NAME: PeakEater_LV2
1313
CLAP_TARGET_NAME: PeakEater_CLAP
14-
JUCE_REVISION: 4e68af7
15-
MACOS_RELEASE_NAME: PeakEater_v0.6.1_macOS
16-
WINDOWS_RELEASE_NAME: PeakEater_v0.6.1_Windows
17-
LINUX_RELEASE_NAME: PeakEater_v0.6.1_Linux
14+
JUCE_REVISION: 69795dc
15+
MACOS_RELEASE_NAME: PeakEater_v0.6.2_macOS
16+
WINDOWS_RELEASE_NAME: PeakEater_v0.6.2_Windows
17+
LINUX_RELEASE_NAME: PeakEater_v0.6.2_Linux
1818
jobs:
1919
macos:
2020
name: macOS
@@ -61,32 +61,34 @@ jobs:
6161
cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
6262
- name: Install Python Dependencies
6363
run: python -m pip install -r ${{github.workspace}}/requirements.txt
64+
- name: Install Ninja
65+
run: |
66+
brew update
67+
brew install ninja
6468
- name: Init Git Submodules
6569
run: git submodule update --init --recursive
6670
- name: Checkout JUCE
6771
run: cd ${{github.workspace}}/Dependencies/JUCE && git checkout ${{env.JUCE_REVISION}}
68-
- name: Configure CMake
69-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
7072
- name: Build VST3
71-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.VST_TARGET_NAME}}
73+
run: ${{github.workspace}}/Scripts/Build/MacOS.sh ${{env.BUILD_TYPE}} ${{env.VST_TARGET_NAME}}
7274
- name: Build AU
73-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.AU_TARGET_NAME}}
74-
- name: Build CLAP
75-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.CLAP_TARGET_NAME}}
75+
run: ${{github.workspace}}/Scripts/Build/MacOS.sh ${{env.BUILD_TYPE}} ${{env.AU_TARGET_NAME}}
7676
- name: Build LV2
77-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.LV2_TARGET_NAME}}
77+
run: ${{github.workspace}}/Scripts/Build/MacOS.sh ${{env.BUILD_TYPE}} ${{env.LV2_TARGET_NAME}}
78+
- name: Build CLAP
79+
run: ${{github.workspace}}/Scripts/Build/MacOS.sh ${{env.BUILD_TYPE}} ${{env.CLAP_TARGET_NAME}}
7880
- name: Package
7981
env:
8082
MACOS_APPLE_IDENTITY: ${{ secrets.MACOS_APPLE_IDENTITY }}
8183
MACOS_APPLE_ID: ${{ secrets.MACOS_APPLE_ID }}
8284
MACOS_APPLE_PASSWORD: ${{ secrets.MACOS_APPLE_PASSWORD }}
8385
MACOS_APPLE_TEAM_ID: ${{ secrets.MACOS_APPLE_TEAM_ID }}
84-
run: python ${{github.workspace}}/Scripts/Release/MacOS.py --release_type=${{env.BUILD_TYPE}} --sign_and_notarize=True --release_version=0.6.1
86+
run: python ${{github.workspace}}/Scripts/Release/MacOS.py --release_type=${{env.BUILD_TYPE}} --sign_and_notarize=True --release_version=0.6.2
8587
- name: Upload Artifacts
8688
uses: actions/upload-artifact@v3
8789
with:
8890
name: ${{ env.MACOS_RELEASE_NAME }}
89-
path: ${{github.workspace}}/build/release/PeakEater-0.6.1.dmg
91+
path: ${{github.workspace}}/build/release/PeakEater-0.6.2.dmg
9092

9193
windows:
9294
name: Windows
@@ -97,14 +99,12 @@ jobs:
9799
run: git submodule update --init --recursive
98100
- name: Checkout JUCE
99101
run: cd ${{github.workspace}}\Dependencies\JUCE && git checkout ${{env.JUCE_REVISION}}
100-
- name: Configure CMake
101-
run: cmake . -B ${{github.workspace}}\build -G 'Visual Studio 17 2022' -A x64 -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON
102102
- name: Build VST3
103-
run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} --target ${{env.VST_TARGET_NAME}}
104-
- name: Build CLAP
105-
run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}} --target ${{env.CLAP_TARGET_NAME}}
103+
run: ${{github.workspace}}\Scripts\Build\Windows.bat ${{env.BUILD_TYPE}} ${{env.VST_TARGET_NAME}}
106104
- name: Build LV2
107-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.LV2_TARGET_NAME}}
105+
run: ${{github.workspace}}\Scripts\Build\Windows.bat ${{env.BUILD_TYPE}} ${{env.LV2_TARGET_NAME}}
106+
- name: Build CLAP
107+
run: ${{github.workspace}}\Scripts\Build\Windows.bat ${{env.BUILD_TYPE}} ${{env.CLAP_TARGET_NAME}}
108108
- name: Upload Artifacts
109109
uses: actions/upload-artifact@v3
110110
with:
@@ -124,26 +124,24 @@ jobs:
124124
- name: Install Build Dependencies
125125
run: |
126126
sudo apt-get update
127-
sudo apt-get install -y g++ libgtk-3-dev libfreetype6-dev libx11-dev libxinerama-dev libxrandr-dev libxcursor-dev mesa-common-dev libasound2-dev freeglut3-dev libxcomposite-dev libcurl4-openssl-dev
128-
sudo apt-get install libwebkit2gtk-4.0-37 libwebkit2gtk-4.0-dev
127+
sudo apt-get install -y g++ ninja-build libgtk-3-dev libfreetype6-dev libx11-dev libxinerama-dev libxrandr-dev libxcursor-dev mesa-common-dev
128+
sudo apt-get install -y libasound2-dev freeglut3-dev libxcomposite-dev libcurl4-openssl-dev libwebkit2gtk-4.0-37 libwebkit2gtk-4.0-dev
129129
- name: Checkout JUCE
130130
run: cd ${{github.workspace}}/Dependencies/JUCE && git checkout ${{env.JUCE_REVISION}}
131-
- name: Configure CMake
132-
run: cmake . -B ${{github.workspace}}/build -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON
133131
- name: Build VST3
134-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.VST_TARGET_NAME}}
135-
- name: Build CLAP
136-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.CLAP_TARGET_NAME}}
132+
run: ${{github.workspace}}/Scripts/Build/Linux.sh ${{env.BUILD_TYPE}} ${{env.VST_TARGET_NAME}}
137133
- name: Build LV2
138-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.LV2_TARGET_NAME}}
134+
run: ${{github.workspace}}/Scripts/Build/Linux.sh ${{env.BUILD_TYPE}} ${{env.LV2_TARGET_NAME}}
135+
- name: Build CLAP
136+
run: ${{github.workspace}}/Scripts/Build/Linux.sh ${{env.BUILD_TYPE}} ${{env.CLAP_TARGET_NAME}}
139137
- name: Upload Artifacts
140138
uses: actions/upload-artifact@v3
141139
with:
142140
name: ${{ env.LINUX_RELEASE_NAME }}
143141
path: |
144-
${{github.workspace}}/build/PeakEater_artefacts/VST3/PeakEater.vst3/Contents/x86_64-linux/PeakEater.so
145-
${{github.workspace}}/build/PeakEater_artefacts/LV2/PeakEater.lv2
146-
${{github.workspace}}/build/PeakEater_artefacts/CLAP/PeakEater.clap
142+
${{github.workspace}}/build/PeakEater_artefacts/${{env.BUILD_TYPE}}/VST3/PeakEater.vst3/Contents/x86_64-linux/PeakEater.so
143+
${{github.workspace}}/build/PeakEater_artefacts/${{env.BUILD_TYPE}}/LV2/PeakEater.lv2
144+
${{github.workspace}}/build/PeakEater_artefacts/${{env.BUILD_TYPE}}/CLAP/PeakEater.clap
147145
148146
release:
149147
name: Publish Release Draft
@@ -183,5 +181,5 @@ jobs:
183181
draft: true
184182
removeArtifacts: true
185183
makeLatest: true
186-
tag: "v0.6.1"
184+
tag: "v0.6.2"
187185
artifacts: "${{ env.MACOS_RELEASE_NAME }}.zip,${{ env.WINDOWS_RELEASE_NAME }}.zip,${{ env.LINUX_RELEASE_NAME }}.zip"

‎.vscode/settings.json

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -110,34 +110,6 @@
110110
* Commit of JUCE to checkout
111111
*/
112112
"peakeater.juce_version": "4e68af7",
113-
/**
114-
* Number of cores to use while build.
115-
*/
116-
"peakeater.cpucores": 2,
117-
/**
118-
* Specify target to build.
119-
* Possible values are:
120-
* - PeakEater
121-
* - PeakEater_VST3
122-
* - PeakEater_AU
123-
* - PeakEater_Standalone
124-
* - PeakEater_All(all PeakEater targets - VST, AU, etc.)
125-
* - Projucer
126-
* - ProjucerData
127-
* - AudioPluginHost
128-
* - AudioPluginHostData
129-
* - UnitTestRunner
130-
* - all(build all above targets)
131-
*/
132-
"peakeater.target": "PeakEater_All",
133-
/**
134-
* CMake build configuration.
135-
* Note: If changed, clear re-build is required.
136-
* Possible values are:
137-
* - Release
138-
* - Debug
139-
*/
140-
"peakeater.config": "Release",
141113
"[cpp]": {
142114
"editor.defaultFormatter": "zachflower.uncrustify"
143115
},

‎.vscode/tasks.json

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
11
{
22
"version": "2.0.0",
3+
"inputs": [
4+
{
5+
"id": "build_type",
6+
"type": "pickString",
7+
"description": "Pick build type",
8+
"default": "Debug",
9+
"options": [
10+
"Release",
11+
"Debug"
12+
]
13+
},
14+
{
15+
"id": "build_target",
16+
"type": "pickString",
17+
"description": "What we're targeting today?",
18+
"default": "PeakEater_All",
19+
"options": [
20+
"PeakEater_All",
21+
"PeakEater_Standalone",
22+
"PeakEater_VST3",
23+
"PeakEater_AU",
24+
"PeakEater_LV2",
25+
"PeakEater_CLAP"
26+
]
27+
}
28+
],
329
"tasks": [
430
{
531
"label": "Init Git Submodules",
@@ -23,33 +49,38 @@
2349
"problemMatcher": [
2450
"$gcc"
2551
],
26-
"command": "cmake . -B build -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON -DCMAKE_BUILD_TYPE=${config:peakeater.config} && cmake --build build --config ${config:peakeater.config} --target ${config:peakeater.target} -j${config:peakeater.cpucores}",
2752
"windows": {
28-
"command": "cmake . -B build -G 'Visual Studio 17 2022' -A x64 -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE -DJUCE_BUILD_EXAMPLES=OFF -DJUCE_BUILD_EXTRAS=ON && cmake --build build --config ${config:peakeater.config} --target ${config:peakeater.target} -j${config:peakeater.cpucores}"
53+
"command": "${workspaceFolder}/Scripts/Build/Windows.bat ${input:build_type} ${input:build_target}"
54+
},
55+
"osx": {
56+
"command": "${workspaceFolder}/Scripts/Build/MacOS.sh ${input:build_type} ${input:build_target}"
57+
},
58+
"linux": {
59+
"command": "${workspaceFolder}/Scripts/Build/Linux.sh ${input:build_type} ${input:build_target}"
2960
}
3061
},
3162
{
3263
"label": "Build(Clean)",
3364
"type": "shell",
3465
"dependsOn": [
3566
"Init Git Submodules",
36-
"Util: Clean Build Dir",
67+
"Clean Build Dir",
3768
"Build"
3869
],
3970
"dependsOrder": "sequence"
4071
},
4172
{
4273
"label": "Create release package",
4374
"type": "shell",
44-
"command": "python3 ${workspaceFolder}/Scripts/Release/MacOS.py --release_type=${config:peakeater.config} --sign_and_notarize=True --release_version=Development",
75+
"command": "python3 ${workspaceFolder}/Scripts/Release/MacOS.py --release_type=${input:build_type} --sign_and_notarize=True --release_version=Development",
4576
"windows": {
46-
"command": "python ${workspaceFolder}/Scripts/Release/Windows.py --release_type=${config:peakeater.config}"
77+
"command": "python ${workspaceFolder}/Scripts/Release/Windows.py --release_type=${input:build_type}"
4778
}
4879
},
4980
{
5081
"label": "Run Standalone",
5182
"type": "shell",
52-
"command": "${workspaceFolder}/build/PeakEater_artefacts/${config:peakeater.config}/Standalone/PeakEater.app/Contents/MacOS/PeakEater"
83+
"command": "${workspaceFolder}/build/PeakEater_artefacts/${input:build_type}/Standalone/PeakEater.app/Contents/MacOS/PeakEater"
5384
},
5485
{
5586
"label": "Pip: Install",

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.15)
2-
project(PeakEater VERSION 0.6.1)
2+
project(PeakEater VERSION 0.6.2)
33
set(CMAKE_CXX_STANDARD 20)
44

55
add_subdirectory(Dependencies/JUCE)

0 commit comments

Comments
 (0)