From b70e5a30c14f7d540bb1c5982c27b8ccbf22d909 Mon Sep 17 00:00:00 2001 From: darkvater Date: Thu, 12 Aug 2004 22:06:56 +0000 Subject: (svn r33) -Executeable is now openttd(.exe) always -Resourcefile has been updated to 0.3.3.0 --- Makefile | 6 ++++-- os/win32/installer/install.nsi | 2 +- ttd.rc | 8 ++++---- ttd.vcproj | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index c72a38142..aa69baa72 100644 --- a/Makefile +++ b/Makefile @@ -170,7 +170,7 @@ EXE= endif # Set output executable names -TTD=ttd$(EXE) +TTD=openttd$(EXE) STRGEN=strgen/strgen$(EXE) OSXAPP="OpenTTD.app" @@ -542,8 +542,10 @@ rev.c: FORCE FORCE: +# ttd$(EXE) is removed just to make sure people execute the right binary (openttd$(EXE)) +# remove this for next release! clean: - rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(ttd_OBJS) + rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(ttd_OBJS) ttd$(EXE) mrproper: clean rm -rf $(MAKE_CONFIG) diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi index 116eb0396..cb27e7b3d 100644 --- a/os/win32/installer/install.nsi +++ b/os/win32/installer/install.nsi @@ -112,7 +112,7 @@ Section "!OpenTTD" Section1 File ${PATH_ROOT}readme.txt ; Copy executable - File /oname=openttd.exe ${PATH_ROOT}ReleasePNG\ttd.exe + File /oname=openttd.exe ${PATH_ROOT}ReleasePNG\openttd.exe File ${PATH_ROOT}strgen\Release\strgen.exe diff --git a/ttd.rc b/ttd.rc index 8070d7f45..5c5baf657 100644 --- a/ttd.rc +++ b/ttd.rc @@ -60,8 +60,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,3,2,1 - PRODUCTVERSION 0,3,2,1 + FILEVERSION 0,3,3,0 + PRODUCTVERSION 0,3,3,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,14 +79,14 @@ BEGIN VALUE "Comments", "This program is licensed under the GNU General Public License.\0" VALUE "CompanyName", "OpenTTD Developers\0" VALUE "FileDescription", "OpenTTD\0" - VALUE "FileVersion", "0.3.2.1\0" + VALUE "FileVersion", "0.3.3.0\0" VALUE "InternalName", "openttd\0" VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2004. All Rights Reserved.\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "openttd.exe\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "OpenTTD\0" - VALUE "ProductVersion", "0.3.2.1\0" + VALUE "ProductVersion", "0.3.3.0\0" VALUE "SpecialBuild", "\0" END END diff --git a/ttd.vcproj b/ttd.vcproj index eb1c91f60..9cf9f7983 100644 --- a/ttd.vcproj +++ b/ttd.vcproj @@ -52,7 +52,7 @@