From 3b19148d800d3da9f224ab1853742e6b6ffc8eae Mon Sep 17 00:00:00 2001 From: fredb Date: Mon, 25 Jan 2010 21:55:42 +0000 Subject: [PATCH] Specific icon and packaging for the win64 version --- package/Win32-Inno/FlightGear-64.iss | 64 ++++++++++++++++++ package/Win32-Inno/FlightGear.iss | 17 +++-- projects/VC90/FlightGear/FlightGear.vcproj | 72 +++++++++++++++++++++ projects/VC90/flightgear.ico | Bin 13094 -> 13094 bytes projects/VC90/flightgear64.ico | Bin 0 -> 13094 bytes projects/VC90/flightgear64.rc | 1 + 6 files changed, 147 insertions(+), 7 deletions(-) create mode 100644 package/Win32-Inno/FlightGear-64.iss create mode 100644 projects/VC90/flightgear64.ico create mode 100644 projects/VC90/flightgear64.rc 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/VC90/flightgear.ico b/projects/VC90/flightgear.ico index e59a3df89422777e7584e95705a1223300942d79..e041319f68923c376c418b2887176b54e34ae3d8 100755 GIT binary patch delta 160 zcmZ3Mwk*w-fq{{Mg~7mp0SGu4R`4+}xB*!T3Q#@=1H(I@n1BF;pTWw&Fio6+!NCE{ z-)L*j%9y*klvRt7F?aF;Ha#GD9!&mY(+9Hk*!#J2^FDn_iH%9g&CQ*Bf?ba(H+S<7 ib{i%jJ=u(_8>r|I*9M>&#oW4#AhAU}U?rD$Lev1$Y$xLY delta 160 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 literal 0 HcmV?d00001 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" -- 2.39.5