From acbd1801c75640d7385b20cc6f198fdce8121a6a Mon Sep 17 00:00:00 2001 From: tron Date: Thu, 25 Nov 2004 10:47:30 +0000 Subject: [PATCH] (svn r815) Include strings.h only in the files which need it. This should reduce the compile time after altering english.txt by about 1/3, because "only" 62 instead of 90 .c files must be recompiled. --- ai_new.c | 1 + aircraft_cmd.c | 1 + aircraft_gui.c | 1 + airport_gui.c | 2 +- bridge_gui.c | 2 +- clear_cmd.c | 1 + command.c | 1 + console.c | 1 + disaster_cmd.c | 1 + dock_gui.c | 2 +- dummy_land.c | 1 + economy.c | 1 + engine.c | 1 + engine_gui.c | 2 +- graph_gui.c | 1 + industry_cmd.c | 1 + industry_gui.c | 1 + intro_gui.c | 2 +- main_gui.c | 2 +- misc.c | 1 + misc_cmd.c | 1 + misc_gui.c | 2 +- music_gui.c | 1 + network.c | 1 + network_gui.c | 1 + news_gui.c | 2 +- oldloader.c | 2 +- order_cmd.c | 1 + order_gui.c | 1 + player_gui.c | 2 +- players.c | 1 + rail_cmd.c | 1 + rail_gui.c | 2 +- road_cmd.c | 1 + road_gui.c | 2 +- roadveh_cmd.c | 1 + roadveh_gui.c | 2 +- screenshot.c | 1 + settings_gui.c | 2 +- ship_cmd.c | 1 + ship_gui.c | 2 +- smallmap_gui.c | 1 + station_cmd.c | 1 + station_gui.c | 1 + strings.c | 1 + subsidy_gui.c | 1 + terraform_gui.c | 2 +- town_cmd.c | 1 + town_gui.c | 1 + train_cmd.c | 1 + train_gui.c | 2 +- tree_cmd.c | 1 + ttd.c | 1 + ttd.h | 3 --- tunnelbridge_cmd.c | 1 + unix.c | 1 + unmovable_cmd.c | 1 + vehicle.c | 1 + vehicle_gui.c | 2 +- viewport.c | 1 + water_cmd.c | 1 + widget.c | 1 + win32.c | 1 + 63 files changed, 62 insertions(+), 21 deletions(-) diff --git a/ai_new.c b/ai_new.c index 57f25643a1..3471299955 100644 --- a/ai_new.c +++ b/ai_new.c @@ -15,6 +15,7 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "command.h" #include "ai.h" #include "town.h" diff --git a/aircraft_cmd.c b/aircraft_cmd.c index 7e0f7bb4ce..41e612559b 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "engine.h" #include "command.h" diff --git a/aircraft_gui.c b/aircraft_gui.c index 841f1e3d3f..d0b380ee4e 100644 --- a/aircraft_gui.c +++ b/aircraft_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "window.h" #include "gui.h" #include "vehicle.h" diff --git a/airport_gui.c b/airport_gui.c index 95238f4e24..2cd9c15a7b 100644 --- a/airport_gui.c +++ b/airport_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/bridge_gui.c b/bridge_gui.c index dbb9ef6423..f78d49d903 100644 --- a/bridge_gui.c +++ b/bridge_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/clear_cmd.c b/clear_cmd.c index 0c7fb2be7f..225f40ed05 100644 --- a/clear_cmd.c +++ b/clear_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "viewport.h" #include "command.h" diff --git a/command.c b/command.c index ab016fc19c..0da83e269b 100644 --- a/command.c +++ b/command.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "gui.h" #include "command.h" #include "player.h" diff --git a/console.c b/console.c index 1eb0fbeacc..fe7be247f5 100644 --- a/console.c +++ b/console.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "window.h" #include "gui.h" #include "gfx.h" diff --git a/disaster_cmd.c b/disaster_cmd.c index 93feb9b80e..fed34fd5c6 100644 --- a/disaster_cmd.c +++ b/disaster_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "command.h" #include "news.h" diff --git a/dock_gui.c b/dock_gui.c index 553ba6edca..1b024086f0 100644 --- a/dock_gui.c +++ b/dock_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/dummy_land.c b/dummy_land.c index a5e8f0a1bb..8efd8803dd 100644 --- a/dummy_land.c +++ b/dummy_land.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "viewport.h" #include "command.h" diff --git a/economy.c b/economy.c index aa1898d27c..b4166562e5 100644 --- a/economy.c +++ b/economy.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "news.h" #include "player.h" #include "station.h" diff --git a/engine.c b/engine.c index f980703bce..3d8e9af126 100644 --- a/engine.c +++ b/engine.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "engine.h" #include "table/engines.h" #include "player.h" diff --git a/engine_gui.c b/engine_gui.c index 5217a459ba..536ff6524b 100644 --- a/engine_gui.c +++ b/engine_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/graph_gui.c b/graph_gui.c index 9929d5d190..000a468487 100644 --- a/graph_gui.c +++ b/graph_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "window.h" #include "gui.h" #include "gfx.h" diff --git a/industry_cmd.c b/industry_cmd.c index 80410febb4..d1af5e81d2 100644 --- a/industry_cmd.c +++ b/industry_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "viewport.h" #include "command.h" #include "industry.h" diff --git a/industry_gui.c b/industry_gui.c index db34d8b445..48c6b03f42 100644 --- a/industry_gui.c +++ b/industry_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" //#include "gui.h" #include "window.h" #include "gfx.h" diff --git a/intro_gui.c b/intro_gui.c index deb42cf375..750ffb16bb 100644 --- a/intro_gui.c +++ b/intro_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/main_gui.c b/main_gui.c index f1f0ea286c..92874db042 100644 --- a/main_gui.c +++ b/main_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/misc.c b/misc.c index 6e6bc1b427..afc0847370 100644 --- a/misc.c +++ b/misc.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "gfx.h" #include "assert.h" diff --git a/misc_cmd.c b/misc_cmd.c index f592c08cea..f907df5c09 100644 --- a/misc_cmd.c +++ b/misc_cmd.c @@ -1,6 +1,7 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "command.h" #include "player.h" #include "gfx.h" diff --git a/misc_gui.c b/misc_gui.c index 8e1957c466..fe3569c017 100644 --- a/misc_gui.c +++ b/misc_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/music_gui.c b/music_gui.c index 773f0fc73b..7994b4d65d 100644 --- a/music_gui.c +++ b/music_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "window.h" #include "gui.h" #include "gfx.h" diff --git a/network.c b/network.c index 50ff771d50..c249e1b86b 100644 --- a/network.c +++ b/network.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "gui.h" #include "command.h" #include "player.h" diff --git a/network_gui.c b/network_gui.c index 216be02c88..6f2e3ad1b3 100644 --- a/network_gui.c +++ b/network_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "window.h" #include "gui.h" #include "gfx.h" diff --git a/news_gui.c b/news_gui.c index 22af2ce764..b5a0e059ee 100644 --- a/news_gui.c +++ b/news_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/oldloader.c b/oldloader.c index f12b3a8642..81f3ed9b31 100644 --- a/oldloader.c +++ b/oldloader.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "town.h" #include "industry.h" #include "station.h" diff --git a/order_cmd.c b/order_cmd.c index 6e5e0d04c5..d63f3f8c5f 100644 --- a/order_cmd.c +++ b/order_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "command.h" #include "station.h" diff --git a/order_gui.c b/order_gui.c index 68b19e7bdd..3dcc5f4bd2 100644 --- a/order_gui.c +++ b/order_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "window.h" #include "gui.h" #include "gfx.h" diff --git a/player_gui.c b/player_gui.c index c53cd6b3eb..61a2a02e59 100644 --- a/player_gui.c +++ b/player_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/players.c b/players.c index 2050969c11..d72983f1a6 100644 --- a/players.c +++ b/players.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "player.h" #include "town.h" #include "vehicle.h" diff --git a/rail_cmd.c b/rail_cmd.c index 9e63f870dd..19f84a8d2d 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "viewport.h" #include "command.h" diff --git a/rail_gui.c b/rail_gui.c index dc0721d738..81fda3cd1c 100644 --- a/rail_gui.c +++ b/rail_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/road_cmd.c b/road_cmd.c index b189640cb1..0f4271c759 100644 --- a/road_cmd.c +++ b/road_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "viewport.h" #include "command.h" diff --git a/road_gui.c b/road_gui.c index c7779b878f..61b8a1668b 100644 --- a/road_gui.c +++ b/road_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/roadveh_cmd.c b/roadveh_cmd.c index 5de98db27d..bf1c4d4a45 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "engine.h" #include "command.h" diff --git a/roadveh_gui.c b/roadveh_gui.c index e240cf01eb..dd57e0f9db 100644 --- a/roadveh_gui.c +++ b/roadveh_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "gfx.h" diff --git a/screenshot.c b/screenshot.c index 4f3e723092..28ed9b3947 100644 --- a/screenshot.c +++ b/screenshot.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "gfx.h" #include "viewport.h" #include "player.h" diff --git a/settings_gui.c b/settings_gui.c index 4e3ef73515..476a7f01fb 100644 --- a/settings_gui.c +++ b/settings_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "gfx.h" diff --git a/ship_cmd.c b/ship_cmd.c index 980f8e3263..a5e7f65a19 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "command.h" #include "pathfind.h" diff --git a/ship_gui.c b/ship_gui.c index 23a796d0df..94c06dfc8c 100644 --- a/ship_gui.c +++ b/ship_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "gfx.h" diff --git a/smallmap_gui.c b/smallmap_gui.c index 2802520549..d9c9714b3b 100644 --- a/smallmap_gui.c +++ b/smallmap_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "gui.h" #include "window.h" #include "gfx.h" diff --git a/station_cmd.c b/station_cmd.c index 04bb7d5261..f28626ef00 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "station.h" #include "gfx.h" #include "window.h" diff --git a/station_gui.c b/station_gui.c index a43be575e0..f0c2f34a51 100644 --- a/station_gui.c +++ b/station_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "window.h" #include "gui.h" #include "station.h" diff --git a/strings.c b/strings.c index 5b8b0d005a..d2b0f1fcfb 100644 --- a/strings.c +++ b/strings.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "station.h" #include "town.h" #include "vehicle.h" diff --git a/subsidy_gui.c b/subsidy_gui.c index ddb2945618..4227c4bb5c 100644 --- a/subsidy_gui.c +++ b/subsidy_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "window.h" #include "gui.h" #include "station.h" diff --git a/terraform_gui.c b/terraform_gui.c index 2f5ae77ce8..7704903be0 100644 --- a/terraform_gui.c +++ b/terraform_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "viewport.h" diff --git a/town_cmd.c b/town_cmd.c index e0c616864d..c913567de7 100644 --- a/town_cmd.c +++ b/town_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "viewport.h" #include "town.h" #include "command.h" diff --git a/town_gui.c b/town_gui.c index ef9163de27..829a1c015b 100644 --- a/town_gui.c +++ b/town_gui.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "town.h" #include "window.h" #include "gfx.h" diff --git a/train_cmd.c b/train_cmd.c index edc7a68343..b082dacfb5 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "command.h" #include "pathfind.h" diff --git a/train_gui.c b/train_gui.c index 1cd2c9b608..6a848f3de8 100644 --- a/train_gui.c +++ b/train_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "window.h" #include "gui.h" #include "gfx.h" diff --git a/tree_cmd.c b/tree_cmd.c index 55b17fd0dc..ed79466918 100644 --- a/tree_cmd.c +++ b/tree_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "viewport.h" #include "command.h" #include "town.h" diff --git a/ttd.c b/ttd.c index a4052711e8..fed7c0f3cb 100644 --- a/ttd.c +++ b/ttd.c @@ -1,4 +1,5 @@ #include "stdafx.h" +#include "table/strings.h" #define VARDEF #include "ttd.h" diff --git a/ttd.h b/ttd.h index 656c716400..5e60dec6dd 100644 --- a/ttd.h +++ b/ttd.h @@ -1,9 +1,6 @@ #ifndef TTD_H #define TTD_H -// include strings -#include "table/strings.h" - #ifndef VARDEF #define VARDEF extern #endif diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c index 1e1d61fa08..47ebab2e1f 100644 --- a/tunnelbridge_cmd.c +++ b/tunnelbridge_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "viewport.h" #include "command.h" diff --git a/unix.c b/unix.c index 058e757755..9d1736df46 100644 --- a/unix.c +++ b/unix.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "hal.h" #include diff --git a/unmovable_cmd.c b/unmovable_cmd.c index 44700ab213..61b6fb4b06 100644 --- a/unmovable_cmd.c +++ b/unmovable_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "command.h" #include "viewport.h" #include "player.h" diff --git a/vehicle.c b/vehicle.c index dbabd034c6..2621adf30a 100644 --- a/vehicle.c +++ b/vehicle.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "gfx.h" //#include "station.h" diff --git a/vehicle_gui.c b/vehicle_gui.c index 2b3e279166..65342d626c 100644 --- a/vehicle_gui.c +++ b/vehicle_gui.c @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ttd.h" - +#include "table/strings.h" #include "vehicle.h" VehicleSortListingTypeFunctions * const _vehicle_sorter[] = { diff --git a/viewport.c b/viewport.c index 5c195503f0..5adb9cf057 100644 --- a/viewport.c +++ b/viewport.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "viewport.h" #include "window.h" #include "vehicle.h" diff --git a/water_cmd.c b/water_cmd.c index f7393cf9a1..016b11b867 100644 --- a/water_cmd.c +++ b/water_cmd.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "vehicle.h" #include "viewport.h" #include "command.h" diff --git a/widget.c b/widget.c index 49313e26fb..1c47c55289 100644 --- a/widget.c +++ b/widget.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "window.h" #include "gfx.h" #include "viewport.h" diff --git a/win32.c b/win32.c index 2a7da52844..e855624563 100644 --- a/win32.c +++ b/win32.c @@ -1,5 +1,6 @@ #include "stdafx.h" #include "ttd.h" +#include "table/strings.h" #include "gfx.h" #include "sound.h" #include "window.h"