1
0
Fork 0

Merge branch 'fredb/winbuild'

This commit is contained in:
Tim Moore 2010-02-05 00:25:52 +01:00
commit 446c2064a5
6 changed files with 18 additions and 18 deletions

View file

@ -22,17 +22,17 @@
AppId=FlightGear
AppName=FlightGear 64-bit
AppPublisher=The FlightGear Team
OutputBaseFilename=fgsetup64-2.0.0-RC3
AppVerName=FlightGear 64-bit v2.0.0-RC3
OutputBaseFilename=fgsetup64-2.0.0
AppVerName=FlightGear 64-bit v2.0.0
AppPublisherURL=http://www.flightgear.org
AppSupportURL=http://www.flightgear.org
AppUpdatesURL=http://www.flightgear.org
DefaultDirName={pf}\FlightGear
DefaultGroupName=FlightGear v2.0.0-RC3
DefaultGroupName=FlightGear v2.0.0
LicenseFile=X:\data\COPYING
Uninstallable=yes
SetupIconFile=x:\flightgear64.ico
VersionInfoVersion=1.9.9.993
VersionInfoVersion=2.0.0.0
WizardImageFile=X:\setupimg.bmp
WizardSmallImageFile=X:\setupsmall.bmp
;UpdateUninstallLogAppName=No
@ -54,7 +54,7 @@ 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-RC3"; Filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon
Name: "{userdesktop}\FlightGear 64-bit v2.0.0"; 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"

View file

@ -22,17 +22,17 @@
AppId=FlightGear
AppName=FlightGear
AppPublisher=The FlightGear Team
OutputBaseFilename=fgsetup-2.0.0-RC3
AppVerName=FlightGear v2.0.0-RC3
OutputBaseFilename=fgsetup-2.0.0
AppVerName=FlightGear v2.0.0
AppPublisherURL=http://www.flightgear.org
AppSupportURL=http://www.flightgear.org
AppUpdatesURL=http://www.flightgear.org
DefaultDirName={pf}\FlightGear
DefaultGroupName=FlightGear v2.0.0-RC3
DefaultGroupName=FlightGear v2.0.0
LicenseFile=X:\data\COPYING
Uninstallable=yes
SetupIconFile=x:\flightgear.ico
VersionInfoVersion=1.9.9.993
VersionInfoVersion=2.0.0.0
WizardImageFile=X:\setupimg.bmp
WizardImageStretch=No
WizardSmallImageFile=X:\setupsmall.bmp
@ -64,7 +64,7 @@ Name: "{group}\FlightGear Launcher"; Filename: "{app}\bin\Win32\fgrun.exe"; Work
Name: "{group}\FlightGear Manual"; Filename: "{app}\data\Docs\getstart.pdf"
Name: "{group}\FlightGear Documentation"; Filename: "{app}\data\Docs\index.html"
Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org"
Name: "{userdesktop}\FlightGear v2.0.0-RC3"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon
Name: "{userdesktop}\FlightGear v2.0.0"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon
Name: "{group}\Tools\Install & Uninstall Scenery"; Filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}";
Name: "{group}\Tools\TerraSync"; Filename: "{app}\bin\Win32\terrasync.exe"; Parameters: "-S -p 5505 -d ""{app}\terrasync"""; WorkingDir: "{app}";

View file

@ -46,7 +46,7 @@
#define PACKAGE "FlightGear"
/* Define to package version - use in main.cxx */
#define FLIGHTGEAR_VERSION "MSVC6-WIN32-2.0.0-rc2"
#define FLIGHTGEAR_VERSION "MSVC6-WIN32-2.0.0"
/* Define as the return type of signal handlers (int or void). */
#define RETSIGTYPE void
@ -64,7 +64,7 @@
#define TM_IN_SYS_TIME 1
/* Define to version number */
#define VERSION "2.0.0-rc2"
#define VERSION "2.0.0"
/* Define if compiling on a Winbloze (95, NT, etc.) platform */
#define WIN32 1

View file

@ -19,7 +19,7 @@
#define PACKAGE "FlightGear"
/* Define to package version - use in main.cxx */
#define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-2.0.0-rc2"
#define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-2.0.0"
/* Define as the return type of signal handlers (int or void). */
#define RETSIGTYPE void
@ -37,7 +37,7 @@
#define TM_IN_SYS_TIME 1
/* Define to version number */
#define VERSION "2.0.0-rc2"
#define VERSION "2.0.0"
#ifndef FG_VERSION /* allow override */
#define FG_VERSION 7
#endif /* FG_VERSION */

View file

@ -50,7 +50,7 @@
#define PACKAGE "FlightGear"
/* Define to package version - use in main.cxx */
#define FLIGHTGEAR_VERSION "MSVC8-WIN32-2.0.0-rc2"
#define FLIGHTGEAR_VERSION "MSVC8-WIN32-2.0.0"
/* Define as the return type of signal handlers (int or void). */
#define RETSIGTYPE void
@ -68,7 +68,7 @@
#define TM_IN_SYS_TIME 1
/* Define to version number */
#define VERSION "2.0.0-rc2"
#define VERSION "2.0.0"
/* Define if compiling on a Winbloze (95, NT, etc.) platform */
#define WIN32 1

View file

@ -19,7 +19,7 @@
#define PACKAGE "FlightGear"
/* Define to package version - use in main.cxx */
#define FLIGHTGEAR_VERSION "MSVC9.0-WIN32-2.0.0-rc2"
#define FLIGHTGEAR_VERSION "MSVC9.0-WIN32-2.0.0"
/* Define as the return type of signal handlers (int or void). */
#define RETSIGTYPE void
@ -37,7 +37,7 @@
#define TM_IN_SYS_TIME 1
/* Define to version number */
#define VERSION "2.0.0-rc2"
#define VERSION "2.0.0"
#ifndef FG_VERSION /* allow override */
#define FG_VERSION 7
#endif /* FG_VERSION */