Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/build-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ jobs:
runs-on: ${{matrix.os}}
strategy:
matrix:
os: [macos-latest, windows-latest]
# windows-2022 pinned: windows-latest images ship VS2026, which lacks
# the v143 ARM64EC toolset the projects target
os: [macos-latest, windows-2022]
include:
- os: macos-latest
build_dir: build-mac
artifact_ext: mac
- os: windows-latest
- os: windows-2022
build_dir: build-win
artifact_ext: win

Expand Down Expand Up @@ -53,11 +55,11 @@ jobs:
shell: bash

- name: Add msbuild to PATH (Windows)
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2022'
uses: microsoft/setup-msbuild@v1.0.2

- name: Build Windows
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2022'
run: |
cd ${{env.PROJECT_NAME}}\scripts
.\makedist-win.bat full zip
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ jobs:
runs-on: ${{matrix.os}}
strategy:
matrix:
os: [macos-latest, windows-latest]
os: [macos-latest, windows-2022]
include:
- os: macos-latest
build_dir: build-mac
- os: windows-latest
- os: windows-2022
build_dir: build-win

steps:
Expand Down Expand Up @@ -101,33 +101,33 @@ jobs:
asset_content_type: application/octet-stream

- name: Add msbuild to PATH (Windows)
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2022'
uses: microsoft/setup-msbuild@v1.0.2

- name: Setup Python3
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2022'
uses: actions/setup-python@v2
with:
python-version: '3.x'
architecture: 'x64'

- name: Get Archive Name Windows
id: win_archivename_step
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2022'
run: |
ARCHIVE_NAME=`python.exe iPlug2/Scripts/get_archive_name.py ${{env.PROJECT_NAME}} win full`
echo "archive_name=$ARCHIVE_NAME" >> $GITHUB_OUTPUT
shell: bash

- name: Build Windows
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2022'
run: |
cd ${{env.PROJECT_NAME}}\scripts
.\makedist-win.bat full installer
shell: pwsh

- name: Upload Windows pdb release asset
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2022'
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
Expand All @@ -138,7 +138,7 @@ jobs:
asset_content_type: application/zip

- name: Upload Windows zip release asset
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2022'
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "iPlug2"]
path = iPlug2
url = https://github.com/sdatkinson/iPlug2.git
url = https://github.com/olilarkin/iPlug2.git
[submodule "eigen"]
path = eigen
url = https://gitlab.com/libeigen/eigen.git
Expand Down
42 changes: 21 additions & 21 deletions NeuralAmpModeler/NeuralAmpModeler.sln
Original file line number Diff line number Diff line change
Expand Up @@ -11,48 +11,48 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NeuralAmpModeler-aax", "pro
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|ARM64EC = Debug|ARM64EC
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|ARM64EC = Release|ARM64EC
Release|x64 = Release|x64
Tracer|Win32 = Tracer|Win32
Tracer|ARM64EC = Tracer|ARM64EC
Tracer|x64 = Tracer|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|Win32.ActiveCfg = Debug|Win32
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|Win32.Build.0 = Debug|Win32
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|x64.ActiveCfg = Debug|x64
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Debug|x64.Build.0 = Debug|x64
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|Win32.ActiveCfg = Release|Win32
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|Win32.Build.0 = Release|Win32
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|ARM64EC.Build.0 = Release|ARM64EC
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|x64.ActiveCfg = Release|x64
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Release|x64.Build.0 = Release|x64
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|Win32.ActiveCfg = Tracer|Win32
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|Win32.Build.0 = Tracer|Win32
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|ARM64EC.ActiveCfg = Tracer|ARM64EC
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|ARM64EC.Build.0 = Tracer|ARM64EC
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|x64.ActiveCfg = Tracer|x64
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|x64.Build.0 = Tracer|x64
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|Win32.ActiveCfg = Debug|Win32
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|Win32.Build.0 = Debug|Win32
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|x64.ActiveCfg = Debug|x64
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|x64.Build.0 = Debug|x64
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|Win32.ActiveCfg = Release|Win32
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|Win32.Build.0 = Release|Win32
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|ARM64EC.Build.0 = Release|ARM64EC
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|x64.ActiveCfg = Release|x64
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Release|x64.Build.0 = Release|x64
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|Win32.ActiveCfg = Tracer|Win32
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|Win32.Build.0 = Tracer|Win32
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|ARM64EC.ActiveCfg = Tracer|ARM64EC
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|ARM64EC.Build.0 = Tracer|ARM64EC
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|x64.ActiveCfg = Tracer|x64
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Tracer|x64.Build.0 = Tracer|x64
{DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|Win32.ActiveCfg = Debug|Win32
{DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|Win32.Build.0 = Debug|Win32
{DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
{DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
{DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|x64.ActiveCfg = Debug|x64
{DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|x64.Build.0 = Debug|x64
{DC4B5920-933D-4C82-B842-F34431D55A93}.Release|Win32.ActiveCfg = Release|Win32
{DC4B5920-933D-4C82-B842-F34431D55A93}.Release|Win32.Build.0 = Release|Win32
{DC4B5920-933D-4C82-B842-F34431D55A93}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
{DC4B5920-933D-4C82-B842-F34431D55A93}.Release|ARM64EC.Build.0 = Release|ARM64EC
{DC4B5920-933D-4C82-B842-F34431D55A93}.Release|x64.ActiveCfg = Release|x64
{DC4B5920-933D-4C82-B842-F34431D55A93}.Release|x64.Build.0 = Release|x64
{DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|Win32.ActiveCfg = Tracer|Win32
{DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|Win32.Build.0 = Tracer|Win32
{DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|ARM64EC.ActiveCfg = Tracer|ARM64EC
{DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|ARM64EC.Build.0 = Tracer|ARM64EC
{DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|x64.ActiveCfg = Tracer|x64
{DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|x64.Build.0 = Tracer|x64
EndGlobalSection
Expand Down
2 changes: 1 addition & 1 deletion NeuralAmpModeler/config/NeuralAmpModeler-win.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<ProgramDatabaseFile>$(PDB_FILE)</ProgramDatabaseFile>
</Link>
<PostBuildEvent>
<Command>CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(TargetPath)" "$(VST3_32_PATH)" "$(VST3_64_PATH)" "$(AAX_32_PATH)" "$(AAX_64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" "$(CREATE_BUNDLE_SCRIPT)"</Command>
<Command>CALL "$(SolutionDir)scripts\postbuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(TargetPath)" "$(VST3_ARM64EC_PATH)" "$(VST3_X64_PATH)" "$(AAX_ARM64EC_PATH)" "$(AAX_X64_PATH)" "$(BUILD_DIR)" "$(VST_ICON)" "$(AAX_ICON)" "$(CREATE_BUNDLE_SCRIPT)"</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>CALL "$(SolutionDir)scripts\prebuild-win.bat" "$(TargetExt)" "$(BINARY_NAME)" "$(Platform)" "$(TargetPath)" "$(OutDir)"</Command>
Expand Down
Loading
Loading