(svn r7759) -Merge: makefile rewrite. This merge features:

 - A proper ./configure, so everything needs to be configured only once, not for every make.
 - Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
 - A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
 - Proper support for OSX universal binaries.
 - Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
 - Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.

Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.

1 files changed, 0 insertions, 392 deletions

diff --git a/langs.vcproj b/langs.vcproj
deleted file mode 100644
index 27295ab90..000000000
--- a/langs.vcproj
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="langs"
-	ProjectGUID="{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
-	RootNamespace="langs"
-	SccProjectName=""
-	SccLocalPath=""
-	Keyword="MakeFileProj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="."
-			ConfigurationType="10"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName="./langs.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Generating strings.h"
-				CommandLine="strgen\debug\strgen.exe -s lang -d table"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\lang\american.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating american language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\american.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\brazilian_portuguese.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating brazilian_portuguese language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\brazilian_portuguese.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\bulgarian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating bulgarian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\bulgarian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\catalan.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating catalan language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\catalan.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\czech.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating czech language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\czech.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\danish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating danish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\danish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\dutch.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating dutch language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\dutch.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="lang\english.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating english language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\english.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\esperanto.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating esperanto language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\esperanto.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\estonian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating estonian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\estonian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\finnish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating finnish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\finnish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\french.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating french language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\french.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\galician.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating galician language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\galician.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\german.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating german language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\german.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\hungarian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating hungarian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\hungarian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\icelandic.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating icelandic language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\icelandic.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\italian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating italian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\italian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\lithuanian.txt">
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating lithuanian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\lithuanian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\norwegian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating norwegian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\norwegian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\origveh.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating Original Vehicle names file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\origveh.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\polish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating polish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\polish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\portuguese.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating portuguese language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\portuguese.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\romanian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating romanian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\romanian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\russian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating russian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\russian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\slovak.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating slovak language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\slovak.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\spanish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating spanish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\spanish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="lang\swedish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating swedish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\swedish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\turkish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating turkish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\turkish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\ukrainian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating ukrainian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\ukrainian.lng"/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>