commit 2b473c6e6d1877e9f0defbb5c5b4016e1387f88f
parent 55dc2210ffcdb19507cda711b6f801cb8493d245
Author: Keith <smartguitarml@gmail.com>
Date: Tue, 30 Aug 2022 18:47:01 -0500
Updated aux files, added missing cmake
Diffstat:
4 files changed, 19 insertions(+), 133 deletions(-)
diff --git a/LICENSE b/LICENSE.txt
diff --git a/installers/windows/SmartAmpl_Install_Script.iss b/installers/windows/SmartAmpl_Install_Script.iss
@@ -1,133 +0,0 @@
-#define MyAppPublisher "GuitarML"
-#define MyAppURL "https://guitarml.com"
-#define MyAppName "SmartAmp"
-
-[Setup]
-AppName=SmartAmp
-AppVersion=##APPVERSION##
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DisableProgramGroupPage=yes
-DisableWelcomePage=no
-DisableDirPage=yes
-DefaultDirName={commoncf64}
-DefaultGroupName=SmartAmp
-OutputBaseFilename="SmartAmp-Win-##APPVERSION##"
-OutputDir=.
-LicenseFile=../../LICENSE.txt
-SetupIconFile=../../resources/guitarml.ico
-UninstallDisplayIcon=../../resources/SmartAmp.ico
-UninstallFilesDir={commoncf64}\GuitarML\{#MyAppName}
-Compression=lzma
-SolidCompression=yes
-
-[Types]
-Name: "full"; Description: "Full installation"
-Name: "custom"; Description: "Custom installation"; Flags: iscustom
-
-[Components]
-Name: "VST3_64"; Description: "VST3 Plugin 64-bit"; Types: full
-Name: "AAX"; Description: "AAX Plugin"; Types: full
-
-[Files]
-Source: "../../bin/Win64/SmartAmp.vst3"; DestDir: "{code:GetDir|VST3_64}"; Components: VST3_64; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "../../build-aax/SmartAmp_artefacts/Release/AAX/SmartAmp.aaxplugin"; DestDir: "{code:GetDir|AAX}"; Components: AAX; Flags: ignoreversion recursesubdirs createallsubdirs
-
-[Code]
-var
- AAXDirPage: TInputDirWizardPage;
- Vst3_64DirPage: TinputDirWizardPage;
-
-procedure InitializeWizard;
-begin
- Log('Initializing extra pages')
- //AAX Dir Page
- AAXDirPage := CreateInputDirPage(wpSelectComponents,
- 'Select AAX Install Location', 'Where would you like to install the AAX plugin?',
- 'AAX plugin will be installed in the following folder.'#13#10#13#10 +
- 'To continue, click Next. If you would like to select a different folder, click Browse.',
- False, 'New Folder');
-
- AAXDirPage.add('');
- AAXDirPage.values[0] := ExpandConstant('{commoncf64}\Avid\Audio\Plug-Ins');
-
- //VST3 64-bit Dir Page
- Vst3_64DirPage := CreateInputDirPage(AAXDirPage.ID,
- 'Select Install Location for VST3 64-bit', 'Where would you like to install the plugin?',
- 'VST3 64-bit plugin will be installed in the following folder.'#13#10#13#10 +
- 'To continue, click Next. If you would like to select a different folder, click Browse.',
- False, 'New Folder');
-
- Vst3_64DirPage.add('');
- Vst3_64DirPage.values[0] := ExpandConstant('{commoncf64}\VST3');
-
-
-end;
-
-function IsSelected(Param: String) : Boolean;
-begin
- if not (Pos(Param, WizardSelectedComponents(False)) = 0) then // WizardSelectedComponents(False)) then
- Result := True
-end;
-
-function ShouldSkipPage(PageID: Integer): Boolean;
-begin
- { Skip pages that shouldn't be shown }
- Result := False;
-
- if (PageID = AAXDirPage.ID) then
- begin
- Result := True;
- Log('Selected 1: ' + WizardSelectedComponents(False));
-
- if IsSelected ('aax') then
- begin
- Log('Not Skipping page');
- Result := False;
- end
- end
-
- else if (PageID = Vst3_64DirPage.ID) then
- begin
- Result := True;
- Log('Selected 2: ' + WizardSelectedComponents(False));
-
- if IsSelected ('vst3_64') then
- begin
- Log('Not Skipping');
- Result := False;
- end
- end
-
-
-end;
-
-function GetDir(Param: String) : String;
-begin
- if (Param = 'AAX') then
- Result := AAXDirPage.values[0]
- else if (Param = 'VST3_64') then
- Result := Vst3_64DirPage.values[0]
-end;
-
-function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo,
- MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
-var
- S: String;
-begin
- { Fill the 'Ready Memo' with the normal settings and the custom settings }
- S := '';
- S := S + MemoTypeInfo + NewLine + NewLine;
- S := S + MemoComponentsInfo + NewLine + NewLine;
- S := S + 'Destination Location:' + NewLine;
-
- if IsSelected('aax') then
- S := S + Space + GetDir('AAX') + ' (AAX)' + NewLine;
-
- if IsSelected('vst3_64') then
- S := S + Space + GetDir('VST3_64') + ' (VST3 64-bit)' + NewLine;
-
- Result := S;
-end;
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -0,0 +1,19 @@
+juce_add_binary_data(BinaryData SOURCES
+ amp_clean.jpg
+ amp_lead.jpg
+ amp_off.jpg
+ knob_silver.png
+ led_blue_off.png
+ led_blue_on.png
+ led_blue_on_off.png
+ led_red_off.png
+ led_red_on.png
+ power_switch_down.png
+ power_switch_up.png
+ ../models/bluej_clean_p0088.json
+ ../models/bluej_fullD_p0153.json
+)
+
+# Need to build BinaryData with -fPIC flag on Linux
+set_target_properties(BinaryData PROPERTIES
+ POSITION_INDEPENDENT_CODE TRUE)
diff --git a/resources/guitarml.ico b/resources/guitarml.ico
Binary files differ.
