diff --git a/package/Win32-Inno/FlightGear-64.iss b/package/Win32-Inno/FlightGear-64.iss new file mode 100644 index 000000000..ca6008461 --- /dev/null +++ b/package/Win32-Inno/FlightGear-64.iss @@ -0,0 +1,64 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! +; +; This script creates an installable FlightGear package for Win32 using the +; "Inno Setup" package builder. Inno Setup is free (but probably not open +; source?.) The official web site for this package building software is: +; +; http://www.jrsoftware.org/isinfo.php +; +; Note: the files must appear in the X: drive. +; You can do this with the command below: +; +; subst X: path_to_files +; +; For example: +; +; C:\> subst X: F:\Path\to\FlightGear\root +; C:\> subst X: F:\ +; + +[Setup] +AppId=FlightGear +AppName=FlightGear 64-bit +AppPublisher=The FlightGear Team +OutputBaseFilename=fgsetup64-2.0.0-RC2 +AppVerName=FlightGear v2.0.0-RC2 +AppPublisherURL=http://www.flightgear.org +AppSupportURL=http://www.flightgear.org +AppUpdatesURL=http://www.flightgear.org +DefaultDirName={pf}\FlightGear +DefaultGroupName=FlightGear v2.0.0-RC2 +LicenseFile=X:\data\COPYING +Uninstallable=yes +SetupIconFile=x:\flightgear64.ico +VersionInfoVersion=1.9.9.993 +WizardImageFile=X:\setupimg.bmp +WizardSmallImageFile=X:\setupsmall.bmp +;UpdateUninstallLogAppName=No +CreateUninstallRegKey=no +ArchitecturesInstallIn64BitMode=x64 +ArchitecturesAllowed=x64 +VersionInfoCompany=The FlightGear Team + +[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. +Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:" + +[Files] +; NOTE: run subst X: F:\ (or whatever path the expanded tree resides at) +Source: "X:\*.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "X:\bin\Win64\*.*"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion recursesubdirs +Source: "X:\bin\vcredist_x64.exe"; DestDir: "{app}\bin"; Flags: ignoreversion + +[Icons] +Name: "{group}\FlightGear 64-bit Launcher"; Filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}"; +Name: "{userdesktop}\FlightGear 64-bit v2.0.0-RC2"; Filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon + +[Run] +Filename: "{app}\bin\vcredist_x64.exe"; WorkingDir: "{app}"; Parameters: "/qb!"; Description: "Installing Flightgear prerequisites" +; Put installation directory into the fgrun.prefs +filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}\bin\Win64"; Parameters: "--silent ""--fg-exe={app}\bin\Win64\fgfs.exe""" + +;Filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}"; Description: "Launch FlightGear"; Flags: postinstall skipifsilent + diff --git a/package/Win32-Inno/FlightGear.iss b/package/Win32-Inno/FlightGear.iss index cca9a4684..0f16566ad 100644 --- a/package/Win32-Inno/FlightGear.iss +++ b/package/Win32-Inno/FlightGear.iss @@ -19,10 +19,11 @@ ; [Setup] +AppId=FlightGear AppName=FlightGear +AppPublisher=The FlightGear Team OutputBaseFilename=fgsetup-2.0.0-RC2 AppVerName=FlightGear v2.0.0-RC2 -AppPublisher=The FlightGear Organization AppPublisherURL=http://www.flightgear.org AppSupportURL=http://www.flightgear.org AppUpdatesURL=http://www.flightgear.org @@ -31,9 +32,11 @@ DefaultGroupName=FlightGear v2.0.0-RC2 LicenseFile=X:\data\COPYING Uninstallable=yes SetupIconFile=x:\flightgear.ico -VersionInfoVersion=1.9.9.992 +VersionInfoVersion=1.9.9.993 WizardImageFile=X:\setupimg.bmp WizardSmallImageFile=X:\setupsmall.bmp +VersionInfoCompany=The FlightGear Team +UninstallDisplayIcon={app}\bin\Win32\fgrun.exe [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. @@ -43,7 +46,9 @@ Name: "insoal"; Description: "Install OpenAL (the sound engine)" [Files] ; NOTE: run subst X: F:\ (or whatever path the expanded tree resides at) Source: "X:\*.txt"; DestDir: "{app}"; Flags: ignoreversion -Source: "X:\bin\*.*"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs +Source: "X:\bin\Win32\*.*"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion recursesubdirs +Source: "X:\bin\vcredist_x86.exe"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "X:\bin\OpenAL\oalinst.exe"; DestDir: "{app}\bin\OpenAL"; Flags: ignoreversion Source: "X:\data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files @@ -80,12 +85,10 @@ Name: "{group}\Tools\Explore Documentation Folder"; Filename: "{app}\data\Docs" Filename: "{app}\bin\vcredist_x86.exe"; WorkingDir: "{app}"; Parameters: "/qb!"; Description: "Installing Flightgear prerequisites" ; Put installation directory into the fgrun.prefs -filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--fg-exe={app}\bin\Win32\fgfs.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{app}\terrasync""" +filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--fg-exe={app}\bin\Win32\fgfs.exe"" ""--ts-exe={app}\bin\Win32\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{app}\terrasync""" ; Put installation and source directories into the fgadmin.prefs filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--install-source={src}\..\Scenery"" ""--scenery-dest={app}\scenery""" - Filename: "{app}\bin\OpenAL\oalinst.exe"; WorkingDir: "{app}"; Description: "Installing OpenAL"; Tasks: insoal - -Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Description: "Launch FlightGear"; Flags: postinstall skipifsilent +;Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Description: "Launch FlightGear"; Flags: postinstall skipifsilent diff --git a/projects/VC90/FlightGear/FlightGear.vcproj b/projects/VC90/FlightGear/FlightGear.vcproj index f23265ef3..d85b591de 100644 --- a/projects/VC90/FlightGear/FlightGear.vcproj +++ b/projects/VC90/FlightGear/FlightGear.vcproj @@ -4297,10 +4297,82 @@ <File RelativePath="..\flightgear.ico" > + <FileConfiguration + Name="Debug|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> <File RelativePath="..\flightgear.rc" > + <FileConfiguration + Name="Debug|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\flightgear64.ico" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\flightgear64.rc" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCResourceCompilerTool" + /> + </FileConfiguration> </File> </Files> <Globals> diff --git a/projects/VC90/flightgear.ico b/projects/VC90/flightgear.ico index e59a3df89..e041319f6 100755 Binary files a/projects/VC90/flightgear.ico and b/projects/VC90/flightgear.ico differ diff --git a/projects/VC90/flightgear64.ico b/projects/VC90/flightgear64.ico new file mode 100644 index 000000000..4f262054d Binary files /dev/null and b/projects/VC90/flightgear64.ico differ diff --git a/projects/VC90/flightgear64.rc b/projects/VC90/flightgear64.rc new file mode 100644 index 000000000..0a929ebcb --- /dev/null +++ b/projects/VC90/flightgear64.rc @@ -0,0 +1 @@ +FLIGHTGEAR ICON "flightgear64.ico"