diff --git a/FlightGear.iss b/FlightGear.iss index 9b070c9..1e80878 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -20,13 +20,6 @@ #include "InstallConfig.iss" -#if GetEnv("VSINSTALLDIR") == "" - #define VSInstallDir "C:\Program Files (x86)\Microsoft Visual Studio 14.0" -#else - #define VSInstallDir GetEnv("VSINSTALLDIR") -#endif - -#define VCInstallDir VSInstallDir + "\VC" #define InstallDir32 "X:\install\msvc140" #define OSGInstallDir InstallDir32 + "\OpenSceneGraph" #define OSGPluginsDir OSGInstallDir + "\bin\osgPlugins-" + OSGVersion @@ -69,7 +62,7 @@ ArchitecturesAllowed=x86 x64 ; Sign tool must be defined in the Inno Setup GUI, to avoid ; exposing the certificate password -; SignTool=fg_code_sign1 +; SignTool=fg_code_sign1 [Tasks] ; NOTE: The following entry contains English phrases ("Create a desktop icon" and "Additional icons"). You are free to translate them into another language if required. @@ -92,7 +85,6 @@ Source: "{#ThirdPartyDir}\3rdParty\bin\libintl-8.dll"; DestDir: "{app}\bin"; Che Source: "{#ThirdPartyDir}\3rdParty\bin\CrashRpt1403.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty\bin\crashrpt_lang.ini"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty\bin\CrashSender1403.exe"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode -Source: "{#VCInstallDir}\redist\x86\Microsoft.VC140.CRT\*.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode ; 64 bits install Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBinaries}"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode @@ -107,7 +99,6 @@ Source: "{#ThirdPartyDir}\3rdParty.x64\bin\libintl-8.dll"; DestDir: "{app}\bin"; Source: "{#ThirdPartyDir}\3rdParty.x64\bin\CrashRpt1403.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty.x64\bin\crashrpt_lang.ini"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty.x64\bin\CrashSender1403.exe"; DestDir: "{app}\bin"; Check: Is64BitInstallMode -Source: "{#VCInstallDir}\redist\x64\Microsoft.VC140.CRT\*.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode ; Include the base package #if IncludeData == "TRUE"