diff --git a/win/audacity.iss b/win/audacity.iss index 2e8e7e7ba..cb7c442f5 100755 --- a/win/audacity.iss +++ b/win/audacity.iss @@ -7,7 +7,7 @@ ; ; This requires that the ISS Preprocessor be installed -#define AppExe "..\win\release\audacity.exe" +#define AppExe ".\release\audacity.exe" #define AppMajor "" #define AppMinor "" #define AppRev "" @@ -103,13 +103,13 @@ Source: "..\presets\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs ; Don't use the WXWIN environment variable, because... ; 1) Can't get the documented {%WXWIN|default dir} parsing to work. ; 2) Need the DLL's in the release dir for testing, anyway. -Source: "..\win\release\wxbase30u_net_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\release\wxbase30u_xml_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\release\wxbase30u_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\release\wxmsw30u_adv_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\release\wxmsw30u_core_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\release\wxmsw30u_html_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\release\wxmsw30u_qa_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\release\wxbase311u_net_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\release\wxbase311u_xml_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\release\wxbase311u_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\release\wxmsw311u_adv_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\release\wxmsw311u_core_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\release\wxmsw311u_html_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\release\wxmsw311u_qa_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion ; MSVC runtime DLLs. Some users can't put these in the system dir, so just put them in the EXE dir. ; It's legal, per http://www.fsf.org/licensing/licenses/gpl-faq.html#WindowsRuntimeAndGPL . @@ -120,14 +120,14 @@ Source: "..\win\release\wxmsw30u_qa_vc_custom.dll"; DestDir: "{app}"; Flags: ign ; "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\" ; or "C:\Program Files\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\" ; according to your system -Source: "..\win\release\msvcp120.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\release\msvcr120.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\release\msvcp120.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: ".\release\msvcr120.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\release\languages\*"; DestDir: "{app}\Languages\"; Flags: ignoreversion recursesubdirs +Source: ".\release\languages\*"; DestDir: "{app}\Languages\"; Flags: ignoreversion recursesubdirs ; We don't currently ship any modules, so the next line is commented out -; Source: "..\win\release\modules\*"; DestDir: "{app}\Modules\"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist -Source: "..\win\release\nyquist\*"; DestDir: "{app}\Nyquist\"; Flags: ignoreversion recursesubdirs -Source: "..\win\release\plug-ins\*"; DestDir: "{app}\Plug-Ins\"; Flags: ignoreversion +; Source: ".\release\modules\*"; DestDir: "{app}\Modules\"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist +Source: ".\release\nyquist\*"; DestDir: "{app}\Nyquist\"; Flags: ignoreversion recursesubdirs +Source: ".\release\plug-ins\*"; DestDir: "{app}\Plug-Ins\"; Flags: ignoreversion [Icons] Name: "{commonprograms}\Audacity"; Filename: "{app}\audacity.exe" diff --git a/win/audacity.rc b/win/audacity.rc index a6c05eb62..fcdef6d76 100644 --- a/win/audacity.rc +++ b/win/audacity.rc @@ -38,7 +38,7 @@ BEGIN VALUE "FileDescription", "A customised Audacity® Cross-Platform Sound Editor" VALUE "FileVersion", AUDACITY_FILE_VERSION VALUE "InternalName", "DarkAudacity" - VALUE "LegalCopyright", "Copyright © 2017. All rights reserved." + VALUE "LegalCopyright", "Copyright © 2018. All rights reserved." VALUE "LegalTrademarks", "Audacity® is a registered trademark of Dominic Mazzoni." VALUE "OriginalFilename", "DarkAudacity.exe" VALUE "ProductName", "DarkAudacity" @@ -48,7 +48,7 @@ BEGIN VALUE "FileDescription", "Audacity® Cross-Platform Sound Editor" VALUE "FileVersion", AUDACITY_FILE_VERSION VALUE "InternalName", "Audacity" - VALUE "LegalCopyright", "Copyright © 2017. All rights reserved." + VALUE "LegalCopyright", "Copyright © 2018. All rights reserved." VALUE "LegalTrademarks", "Audacity® is a registered trademark of Dominic Mazzoni." VALUE "OriginalFilename", "Audacity.exe" VALUE "ProductName", "Audacity"