From 802edd7f0d322cb6a684144610a5cb378c90f0e8 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sun, 11 Sep 2005 17:55:32 +0000 Subject: (svn r2943) Fix compilation of openttd in release mode. Don't use any precompiled headers, so no more troubles in the future. Remove release build of strgen, since it is never used. Add current ottd version to resource file. Don't forget to update when we make a release :) --- openttd.rc | 6 +- openttd.vcproj | 318 ++++++++++++++++++++------------------------------- strgen/strgen.vcproj | 60 ---------- 3 files changed, 126 insertions(+), 258 deletions(-) diff --git a/openttd.rc b/openttd.rc index 82c152dac..433b6b40f 100644 --- a/openttd.rc +++ b/openttd.rc @@ -61,8 +61,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,0,0 - PRODUCTVERSION 0,0,0,0 + FILEVERSION 0,4,0,1 + PRODUCTVERSION 0,4,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -80,7 +80,7 @@ BEGIN VALUE "Comments", "This program is licensed under the GNU General Public License.\0" VALUE "CompanyName", "OpenTTD Development Team\0" VALUE "FileDescription", "OpenTTD\0" - VALUE "FileVersion", "0.0.0.0\0" + VALUE "FileVersion", "0.4.0.1\0" VALUE "InternalName", "openttd\0" VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2005. All Rights Reserved.\0" VALUE "LegalTrademarks", "\0" diff --git a/openttd.vcproj b/openttd.vcproj index cbdb9db14..8a33a58ec 100644 --- a/openttd.vcproj +++ b/openttd.vcproj @@ -36,9 +36,9 @@ BufferSecurityCheck="FALSE" EnableFunctionLevelLinking="TRUE" DefaultCharIsUnsigned="TRUE" - UsePrecompiledHeader="1" - PrecompiledHeaderThrough="stdafx.h" - PrecompiledHeaderFile=".\Release/openttd.pch" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" AssemblerOutput="2" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" @@ -171,7 +171,7 @@ RelativePath=".\callback_table.c"> + RelativePath=".\command.c"> @@ -190,13 +190,6 @@ - - - @@ -207,9 +200,6 @@ Name="Release|Win32"> + RelativePath=".\economy.c"> + RelativePath=".\engine.c"> + RelativePath=".\fileio.c"> + RelativePath=".\gfx.c"> + RelativePath=".\gfxinit.c"> + RelativePath=".\landscape.c"> @@ -250,25 +240,19 @@ RelativePath=".\mersenne.c"> - - - + RelativePath=".\minilzo.c"> + RelativePath=".\misc.c"> + RelativePath=".\namegen.c"> + RelativePath=".\network.c"> @@ -293,45 +277,24 @@ - - - - - - - - - + RelativePath=".\oldloader.c"> + RelativePath=".\openttd.c"> + RelativePath=".\openttd.rc"> + RelativePath=".\pathfind.c"> @@ -349,33 +312,19 @@ RelativePath=".\rail.c"> + RelativePath=".\saveload.c"> + RelativePath=".\sdl.c"> - - - - - - @@ -384,25 +333,25 @@ RelativePath=".\signs.c"> + RelativePath=".\sound.c"> + RelativePath=".\spritecache.c"> + RelativePath=".\StdAfx.c"> + RelativePath=".\strings.c"> + RelativePath=".\texteff.c"> @@ -411,52 +360,31 @@ RelativePath=".\tile.c"> + RelativePath=".\vehicle.c"> + RelativePath=".\viewport.c"> + RelativePath=".\widget.c"> + RelativePath=".\win32.c"> - - - - - - - - - + RelativePath=".\window.c"> + RelativePath=".\command.h"> + RelativePath=".\console.h"> + RelativePath=".\debug.h"> + RelativePath=".\depot.h"> @@ -496,40 +424,40 @@ RelativePath=".\driver.h"> + RelativePath=".\economy.h"> + RelativePath=".\engine.h"> + RelativePath=".\fileio.h"> + RelativePath=".\functions.h"> + RelativePath=".\gfx.h"> + RelativePath=".\gfxinit.h"> + RelativePath=".\gui.h"> + RelativePath=".\hal.h"> + RelativePath=".\industry.h"> + RelativePath=".\macros.h"> + RelativePath=".\md5.h"> @@ -559,7 +487,7 @@ RelativePath=".\newgrf.h"> + RelativePath=".\news.h"> @@ -574,16 +502,16 @@ RelativePath=".\video\null_v.h"> + RelativePath=".\openttd.h"> + RelativePath=".\pathfind.h"> + RelativePath=".\player.h"> @@ -595,7 +523,7 @@ RelativePath=".\rail.h"> + RelativePath=".\saveload.h"> @@ -610,16 +538,16 @@ RelativePath=".\signs.h"> + RelativePath=".\sound.h"> + RelativePath=".\station.h"> + RelativePath=".\StdAfx.h"> @@ -634,19 +562,19 @@ RelativePath=".\town.h"> + RelativePath=".\variables.h"> + RelativePath=".\vehicle.h"> + RelativePath=".\viewport.h"> + RelativePath=".\waypoint.h"> @@ -658,89 +586,89 @@ RelativePath=".\video\win32_v.h"> + RelativePath=".\window.h"> + RelativePath=".\aircraft_gui.c"> + RelativePath=".\airport_gui.c"> + RelativePath=".\bridge_gui.c"> + RelativePath=".\dock_gui.c"> + RelativePath=".\engine_gui.c"> + RelativePath=".\graph_gui.c"> + RelativePath=".\industry_gui.c"> + RelativePath=".\intro_gui.c"> + RelativePath=".\main_gui.c"> + RelativePath=".\misc_gui.c"> + RelativePath=".\music_gui.c"> + RelativePath=".\news_gui.c"> + RelativePath=".\order_gui.c"> + RelativePath=".\player_gui.c"> + RelativePath=".\rail_gui.c"> + RelativePath=".\road_gui.c"> + RelativePath=".\roadveh_gui.c"> + RelativePath=".\settings_gui.c"> + RelativePath=".\ship_gui.c"> + RelativePath=".\smallmap_gui.c"> + RelativePath=".\station_gui.c"> + RelativePath=".\subsidy_gui.c"> + RelativePath=".\town_gui.c"> + RelativePath=".\train_gui.c"> @@ -750,68 +678,68 @@ Name="Landscape" Filter=""> + RelativePath=".\aircraft_cmd.c"> + RelativePath=".\clear_cmd.c"> + RelativePath=".\disaster_cmd.c"> + RelativePath=".\dummy_land.c"> + RelativePath=".\industry_cmd.c"> + RelativePath=".\misc_cmd.c"> + RelativePath=".\order_cmd.c"> + RelativePath=".\rail_cmd.c"> + RelativePath=".\road_cmd.c"> + RelativePath=".\roadveh_cmd.c"> + RelativePath=".\ship_cmd.c"> + RelativePath=".\station_cmd.c"> + RelativePath=".\town_cmd.c"> + RelativePath=".\train_cmd.c"> + RelativePath=".\tree_cmd.c"> + RelativePath=".\tunnelbridge_cmd.c"> + RelativePath=".\unmovable_cmd.c"> + RelativePath=".\water_cmd.c"> + RelativePath=".\table\ai_rail.h"> + RelativePath=".\table\allstrings.h"> @@ -820,67 +748,67 @@ RelativePath=".\table\autorail.h"> + RelativePath=".\table\build_industry.h"> + RelativePath=".\table\clear_land.h"> + RelativePath=".\table\engines.h"> + RelativePath=".\table\genland.h"> + RelativePath=".\table\industry_land.h"> + RelativePath=".\table\landscape_const.h"> + RelativePath=".\table\landscape_sprite.h"> + RelativePath=".\table\palettes.h"> + RelativePath=".\table\road_land.h"> + RelativePath=".\table\roadveh.h"> + RelativePath=".\table\station_land.h"> + RelativePath=".\table\strings.h"> + RelativePath=".\table\track_land.h"> + RelativePath=".\table\train_cmd.h"> + RelativePath=".\table\tree_land.h"> + RelativePath=".\table\tunnel_land.h"> + RelativePath=".\table\unmovable_land.h"> + RelativePath=".\table\water_land.h"> + RelativePath=".\openttd.ico"> + RelativePath=".\mainicon.ico"> + RelativePath=".\ReadMe.txt"> diff --git a/strgen/strgen.vcproj b/strgen/strgen.vcproj index 4624604ed..f01e71168 100644 --- a/strgen/strgen.vcproj +++ b/strgen/strgen.vcproj @@ -10,66 +10,6 @@ Name="Win32"/> - - - - - - - - - - - - - - -