Changeset - r32:dbfc54b77821
[Not reviewed]
master
0 4 0
darkvater - 20 years ago 2004-08-12 22:06:56
darkvater@openttd.org
(svn r33) -Executeable is now openttd(.exe) always
-Resourcefile has been updated to 0.3.3.0
4 files changed with 12 insertions and 10 deletions:
0 comments (0 inline, 0 general)
Makefile
Show inline comments
 
@@ -167,13 +167,13 @@ ifdef WIN32
 
EXE=.exe
 
else
 
EXE=
 
endif
 

	
 
# Set output executable names
 
TTD=ttd$(EXE)
 
TTD=openttd$(EXE)
 
STRGEN=strgen/strgen$(EXE)
 
OSXAPP="OpenTTD.app"
 

	
 
# What revision are we compiling, if we have an idea?
 
REV_NUMBER := $(shell if test -d .svn; then svnversion . | tr -dc 0-9; fi)
 

	
 
@@ -539,14 +539,16 @@ rev.c: FORCE
 
	@cmp -s rev.c rev.c.new 2>/dev/null || mv rev.c.new rev.c
 
	@rm -f rev.c.new
 

	
 
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)
 

	
 
ifndef OSX
 
ifndef MORPHOS
os/win32/installer/install.nsi
Show inline comments
 
@@ -109,13 +109,13 @@ Section "!OpenTTD" Section1
 
	;Copy text files
 
  File ${PATH_ROOT}changelog.txt
 
;  File "gpl.txt"
 
  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
 

	
 

	
 
  ; Delete old files from the main dir. they are now placed in data/ and lang/
 
	Delete "$INSTDIR\*.lng"
 
	Delete "$INSTDIR\*.grf"
ttd.rc
Show inline comments
 
@@ -57,14 +57,14 @@ END
 
/////////////////////////////////////////////////////////////////////////////
 
//
 
// Version
 
//
 

	
 
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
 
#else
 
 FILEFLAGS 0x0L
 
#endif
 
@@ -76,20 +76,20 @@ BEGIN
 
    BEGIN
 
        BLOCK "000004b0"
 
        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
 
    BLOCK "VarFileInfo"
 
    BEGIN
 
        VALUE "Translation", 0x0, 1200
ttd.vcproj
Show inline comments
 
@@ -49,13 +49,13 @@
 
				DebugInformationFormat="3"/>
 
			<Tool
 
				Name="VCCustomBuildTool"/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib"
 
				OutputFile=".\Release/ttd.exe"
 
				OutputFile=".\Release/openttd.exe"
 
				LinkIncremental="1"
 
				SuppressStartupBanner="TRUE"
 
				ProgramDatabaseFile=".\Release/ttd.pdb"
 
				GenerateMapFile="TRUE"
 
				MapFileName=".\Release/ttd.map"
 
				SubSystem="2"
 
@@ -122,13 +122,13 @@
 
				CallingConvention="1"/>
 
			<Tool
 
				Name="VCCustomBuildTool"/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib"
 
				OutputFile=".\Checked/ttd.exe"
 
				OutputFile=".\Checked/openttd.exe"
 
				LinkIncremental="1"
 
				SuppressStartupBanner="TRUE"
 
				GenerateDebugInformation="TRUE"
 
				ProgramDatabaseFile=".\Checked/ttd.pdb"
 
				GenerateMapFile="TRUE"
 
				MapFileName=".\Checked/ttd.map"
 
@@ -186,13 +186,13 @@
 
				DebugInformationFormat="4"/>
 
			<Tool
 
				Name="VCCustomBuildTool"/>
 
			<Tool
 
				Name="VCLinkerTool"
 
				AdditionalDependencies="winmm.lib ws2_32.lib"
 
				OutputFile=".\Debug/ttd.exe"
 
				OutputFile=".\Debug/openttd.exe"
 
				LinkIncremental="0"
 
				SuppressStartupBanner="TRUE"
 
				GenerateDebugInformation="TRUE"
 
				ProgramDatabaseFile=".\Debug/ttd.pdb"
 
				SubSystem="2"
 
				TargetMachine="1"/>
0 comments (0 inline, 0 general)