diff --git a/other/ewsdr_inno_setup.iss b/other/ewsdr_inno_setup.iss index e6c9ba9..7803b02 100644 --- a/other/ewsdr_inno_setup.iss +++ b/other/ewsdr_inno_setup.iss @@ -1,45 +1,46 @@ -[Setup] -AppId={{6D65ED5C-AF9A-4A7E-AB17-8AE9125CA6E9}} -AppName=EWSDR -AppVersion=__VERSION__ -DefaultDirName={pf}\EWSDR -DefaultGroupName=EWSDR -UninstallDisplayIcon={app}\ewsdr.exe -Compression=lzma2 -SolidCompression=yes -OutputDir=__OUTPUT_DIR__ -ArchitecturesAllowed=x64 -ArchitecturesInstallIn64BitMode=x64 -OutputBaseFilename=__OUTPUT_FILENAME__ + [Setup] + AppId={{6D65ED5C-AF9A-4A7E-AB17-8AE9125CA6E9}} + AppName=EWSDR + AppVersion=__VERSION__ + DefaultDirName={pf}\EWSDR + DefaultGroupName=EWSDR + UninstallDisplayIcon={app}\ewsdr.exe + Compression=lzma2 + SolidCompression=yes + OutputDir=__OUTPUT_DIR__ + ArchitecturesAllowed=x64 + ArchitecturesInstallIn64BitMode=x64 + OutputBaseFilename=__OUTPUT_FILENAME__ -[Languages] -Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" + [Languages] + Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" -[Tasks] + [Tasks] + Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + [Files] + Source: "__SOURCE_PATH__\__ARCH__\ewsdr.exe"; DestDir: "{app}"; DestName: "ewsdr.exe" + Source: "__SOURCE_PATH__\__ARCH__\wdsp.dll"; DestDir: "{app}"; + Source: "__SOURCE_PATH__\__ARCH__\libfftw3-3.dll"; DestDir: "{app}"; + Source: "__SOURCE_PATH__\__ARCH__\libfftw3f-3.dll"; DestDir: "{app}"; + [Icons] + Name: "{group}\EWSDR"; Filename: "{app}\ewsdr.exe" + Name: "{group}\EWSDR OpenGL"; Filename: "{app}\ewsdr.exe"; Parameters: "--opengl" -[Files] -Source: "__SOURCE_PATH__\__ARCH__\ewsdr.exe"; DestDir: "{app}"; DestName: "ewsdr.exe" -Source: "__SOURCE_PATH__\__ARCH__\wdsp.dll"; DestDir: "{app}"; -Source: "__SOURCE_PATH__\__ARCH__\libfftw3-3.dll"; DestDir: "{app}"; -Source: "__SOURCE_PATH__\__ARCH__\libfftw3f-3.dll"; DestDir: "{app}"; + Name: "{commondesktop}\EWSDR"; Filename: "{app}\ewsdr.exe"; Tasks: desktopicon + Name: "{commondesktop}\EWSDR OpenGL"; Filename: "{app}\ewsdr.exe"; Parameters: "--opengl"; Tasks: desktopicon -[Icons] -Name: "{group}\EWSDR"; Filename: "{app}\ewsdr.exe" -Name: "{commondesktop}\EWSDR"; Filename: "{app}\ewsdr.exe"; Tasks: desktopicon + [Run] + Filename: "{app}\ewsdr.exe"; Description: "{cm:LaunchProgram,EWSDR}"; Flags: nowait showcheckbox -[Run] -Filename: {app}\ewsdr.exe; Description: {cm:LaunchProgram,EWSDR}; Flags: nowait showcheckbox - -[code] -procedure CurPageChanged(CurPageID: Integer); -var - ResultCode:Integer; -begin - if CurPageID = wpWelcome then + [code] + procedure CurPageChanged(CurPageID: Integer); + var + ResultCode: Integer; begin - Exec('taskkill', '/F /IM ewsdr.exe', '', 0, ewWaitUntilTerminated, ResultCode); + if CurPageID = wpWelcome then + begin + Exec('taskkill', '/F /IM ewsdr.exe', '', 0, ewWaitUntilTerminated, ResultCode); + end; end; -end;