diff options
| author | rubidium <rubidium@openttd.org> | 2008-01-24 18:47:05 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-01-24 18:47:05 +0000 |
| commit | bbdc5a9314f0f0e90517b3a513ba49db06e30260 (patch) | |
| tree | 80e848502114343ca21477b04e1cddee125bb546 | |
| parent | 4991dcecc7ea2e4ab9de69cf0cdfc69740594ef3 (diff) | |
| download | openttd-bbdc5a9314f0f0e90517b3a513ba49db06e30260.tar.xz | |
(svn r11979) -Codechange: drop MSVC 2003 support because MSVC 2003 is broken in such a manner that it triggers an internal compiler error without any clue what of the code is wrong. Even trying to bisect the problem does not give a single line of code that causes the trouble.
| -rw-r--r-- | docs/Readme_Windows_MSVC.txt | 28 | ||||
| -rwxr-xr-x | projects/generate | 48 | ||||
| -rw-r--r-- | projects/langs.vcproj | 538 | ||||
| -rw-r--r-- | projects/langs.vcproj.in | 44 | ||||
| -rw-r--r-- | projects/openttd.sln | 43 | ||||
| -rw-r--r-- | projects/openttd.tgt | 2667 | ||||
| -rw-r--r-- | projects/openttd.vcproj | 1429 | ||||
| -rw-r--r-- | projects/openttd.vcproj.in | 177 | ||||
| -rw-r--r-- | projects/strgen.vcproj | 101 | ||||
| -rw-r--r-- | src/debug.cpp | 50 | ||||
| -rw-r--r-- | src/debug.h | 38 | ||||
| -rw-r--r-- | src/graph_gui.cpp | 2 | ||||
| -rw-r--r-- | src/stdafx.h | 24 |
13 files changed, 53 insertions, 5136 deletions
diff --git a/docs/Readme_Windows_MSVC.txt b/docs/Readme_Windows_MSVC.txt index 92e8b56d5..1d5a9fe59 100644 --- a/docs/Readme_Windows_MSVC.txt +++ b/docs/Readme_Windows_MSVC.txt @@ -6,11 +6,11 @@ PLEASE READ THE ENTIRE DOCUMENT BEFORE DOING ANY ACTUAL CHANGES!! SUPPORTED MSVC COMPILERS ------------------------ -OpenTTD includes projects for MSVC 2003.NET and MSVC 2005.NET. Both will +OpenTTD includes projects for MSVC 2005.NET and MSVC 2008.NET. Both will compile out of the box, providing you have the required libraries/headers; -which ones, see below. There is no support for VS6, you are therefore -strongly encouraged to either upgrade to MSVC 2005 Express (free) or use GCC. -MSVC 2002 probably works as well, but it has not been tested. +which ones, see below. There is no support for VS6 or MSVC 2002, or +MSVC 2003.NET. You are therefore strongly encouraged to either upgrade to +MSVC 2005 Express (free) or use GCC. 1) REQUIRED FILES @@ -74,20 +74,6 @@ NOTE: make sure that the directory for the DirectX SDK is the first one in the list, above all others, otherwise compilation will most likely fail!! -2.3) DEBUGGING - WORKING DIRECTORY (MSVC 2003 ONLY!) ----------------------------------------------------- -The very first time you check out and compile OpenTTD with Visual Studio 2003, running -the binary will complain about missing files. You need to go into and change a setting - -OpenTTD > Project > Properties > Configuration (All Configurations) > ... - Configuration Properties > Debugging > - - * Working Directory: ..\bin - -VS 2005 works out of the box because Microsoft allowed a user to supply a humanly- -readable defaults file (openttd_vs80.vcproj.user), whereas 2003 is braindead. - - 3) TTD GRAPHICS FILES --------------------- Copy the following files from Transport Tycoon Deluxe to the bin/data folder @@ -102,12 +88,12 @@ Copy the following files from Transport Tycoon Deluxe to the bin/data folder 4) COMPILING ------------ -Open trunk/openttd[_vs80].sln +Open trunk/openttd_vs[89]0.sln Set the build mode to 'Release' in Build > Configuration manager > Active solution configuration > select "Release" Compile... -If everything works well the binary should be in trunk/objs/[Win32]/Release/openttd.exe +If everything works well the binary should be in trunk/objs/Win[32|64]/Release/openttd.exe 5) EDITING, CHANGING SOURCE CODE @@ -126,4 +112,4 @@ to ask about reasons; or just wait. The problem will most likely solve itself within a few days as the problem is noticed and fixed. An up-to-date version of this README can be found on the wiki: -http://wiki.openttd.org/index.php/MicrosoftVisualCExpress
\ No newline at end of file +http://wiki.openttd.org/index.php/MicrosoftVisualCExpress diff --git a/projects/generate b/projects/generate index 35ff065dc..cdc29bf40 100755 --- a/projects/generate +++ b/projects/generate @@ -25,13 +25,6 @@ fi # langs_vs80.vcproj is for MSVC 2005 # strgen_vs80.vcproj is for MSVC 2005 -# openttd.sln is for MSVC 2003 -# openttd.vcproj is for MSVC 2003 -# langs.vcproj is for MSVC 2003 -# strgen.vcproj is for MSVC 2003 - -# openttd.tgt is for WatCom - # First, collect the list of Windows files @@ -110,7 +103,7 @@ load_main_data() { print " <Filter"; print " Name=\\""$0"\\""; - print " Filter=\\"\\">"; + print " >"; } next; @@ -121,7 +114,8 @@ load_main_data() { gsub(" ", "", $0); gsub("/", "\\\\", $0); print " <File"; - print " RelativePath=\\".\\\\'$file_prefix'"$0"\\">"; + print " RelativePath=\\".\\\\'$file_prefix'"$0"\\""; + print " >"; print " </File>"; } } @@ -138,15 +132,18 @@ load_lang_data() { i=`basename $i | sed s/.txt$//g` RES="$RES <File - RelativePath=\"..\\src\\lang\\"$i".txt\"> + RelativePath=\"..\\src\\lang\\"$i".txt\" + > <FileConfiguration - Name=\"Debug|Win32\"> + Name=\"Debug|Win32\" + > <Tool Name=\"VCCustomBuildTool\" Description=\"Generating "$i" language file\" CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang "\$(InputPath)"
\" AdditionalDependencies=\"\" - Outputs=\"..\\bin\\lang\\"$i".lng\"/> + Outputs=\"..\\bin\\lang\\"$i".lng\" + /> </FileConfiguration> </File>" done @@ -165,22 +162,7 @@ generate() { } ' > "$ROOT_DIR/projects/$2" - # The files-list - echo "$1" | awk -v type="$3" ' - /
/ { - if (type == "msvc2003") gsub("
", "\n", $0); - } - /Filter="">/ { - if (type == "msvc2005") gsub("Filter=\"\">", ">", $0); - } - /"\/>/ { - if (type == "msvc2005") gsub("/>", "\n" substr($0, 1, index($0, $1) - 2) "/>", $0); - } - /">/ { - if (type == "msvc2005") gsub(">", "\n" substr($0, 1, index($0, $1) - 1) ">", $0); - } - { print $0 } - ' >> "$ROOT_DIR/projects/$2" + echo "$1" >> "$ROOT_DIR/projects/$2" # Everything below the !!FILES!! marker cat "$ROOT_DIR/projects/$2".in | tr '\r' '\n' | awk ' @@ -199,9 +181,7 @@ safety_check "$ROOT_DIR/source.list" load_main_data "$ROOT_DIR/source.list" openttd load_lang_data "$ROOT_DIR/src/lang/*.txt" lang -generate "$openttd" "openttd.vcproj" "msvc2003" -generate "$openttd" "openttd_vs80.vcproj" "msvc2005" -generate "$openttd" "openttd_vs90.vcproj" "msvc2005" -generate "$lang" "langs.vcproj" "msvc2003" -generate "$lang" "langs_vs80.vcproj" "msvc2005" -generate "$lang" "langs_vs90.vcproj" "msvc2005" +generate "$openttd" "openttd_vs80.vcproj" +generate "$openttd" "openttd_vs90.vcproj" +generate "$lang" "langs_vs80.vcproj" +generate "$lang" "langs_vs90.vcproj" diff --git a/projects/langs.vcproj b/projects/langs.vcproj deleted file mode 100644 index bdc8d380c..000000000 --- a/projects/langs.vcproj +++ /dev/null @@ -1,538 +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="..\bin\lang\" - IntermediateDirectory="..\objs\langs\" - 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="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - - <File - RelativePath="..\src\lang\afrikaans.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating afrikaans language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\afrikaans.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\brazilian_portuguese.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating brazilian_portuguese language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\brazilian_portuguese.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\bulgarian.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating bulgarian language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\bulgarian.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\catalan.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating catalan language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\catalan.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\croatian.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating croatian language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\croatian.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\czech.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating czech language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\czech.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\danish.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating danish language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\danish.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\dutch.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating dutch language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\dutch.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\english.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating english language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\english.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\english_US.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating english_US language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\english_US.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\esperanto.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating esperanto language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\esperanto.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\estonian.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating estonian language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\estonian.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\finnish.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating finnish language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\finnish.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\french.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating french language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\french.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\galician.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating galician language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\galician.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\german.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating german language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\german.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\hungarian.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating hungarian language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\hungarian.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\icelandic.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating icelandic language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\icelandic.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\italian.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating italian language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\italian.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\japanese.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating japanese language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\japanese.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\korean.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating korean language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\korean.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\lithuanian.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating lithuanian language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\lithuanian.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\norwegian_bokmal.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating norwegian_bokmal language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\norwegian_bokmal.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\norwegian_nynorsk.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating norwegian_nynorsk language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\norwegian_nynorsk.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\origveh.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating origveh language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\origveh.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\piglatin.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating piglatin language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\piglatin.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\polish.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating polish language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\polish.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\portuguese.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating portuguese language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\portuguese.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\romanian.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating romanian language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\romanian.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\russian.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating russian language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\russian.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\simplified_chinese.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating simplified_chinese language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\simplified_chinese.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\slovak.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating slovak language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\slovak.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\slovenian.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating slovenian language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\slovenian.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\spanish.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating spanish language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\spanish.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\swedish.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating swedish language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\swedish.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\traditional_chinese.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating traditional_chinese language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\traditional_chinese.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\turkish.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating turkish language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\turkish.lng"/> - </FileConfiguration> - </File> - <File - RelativePath="..\src\lang\ukrainian.txt"> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCustomBuildTool" - Description="Generating ukrainian language file" - CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)" -" - AdditionalDependencies="" - Outputs="..\bin\lang\ukrainian.lng"/> - </FileConfiguration> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/projects/langs.vcproj.in b/projects/langs.vcproj.in deleted file mode 100644 index e1bcf36d5..000000000 --- a/projects/langs.vcproj.in +++ /dev/null @@ -1,44 +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="..\bin\lang\" - IntermediateDirectory="..\objs\langs\" - 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="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> -!!FILES!! - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/projects/openttd.sln b/projects/openttd.sln deleted file mode 100644 index 81e7bd6a3..000000000 --- a/projects/openttd.sln +++ /dev/null @@ -1,43 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd.vcproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}" - ProjectSection(ProjectDependencies) = postProject - {0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966} - {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs.vcproj", "{0F066B23-18DF-4284-8265-F4A5E7E3B966}" - ProjectSection(ProjectDependencies) = postProject - {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug.ActiveCfg = Debug|Win32 - {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug.Build.0 = Debug|Win32 - {668328A0-B40E-4CDB-BD72-D0064424414A}.Release.ActiveCfg = Release|Win32 - {668328A0-B40E-4CDB-BD72-D0064424414A}.Release.Build.0 = Release|Win32 - {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.ActiveCfg = Release|Win32 - {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.Build.0 = Release|Win32 - {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.ActiveCfg = Release|Win32 - {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.Build.0 = Release|Win32 - {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug.ActiveCfg = Debug|Win32 - {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug.Build.0 = Debug|Win32 - {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release.ActiveCfg = Debug|Win32 - {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release.Build.0 = Debug|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection - GlobalSection(DPCodeReviewSolutionGUID) = preSolution - DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} - EndGlobalSection -EndGlobal diff --git a/projects/openttd.tgt b/projects/openttd.tgt deleted file mode 100644 index dc2c11089..000000000 --- a/projects/openttd.tgt +++ /dev/null @@ -1,2667 +0,0 @@ -40 -targetIdent -0 -MProject -1 -MComponent -0 -2 -WString -4 -OEXE -3 -WString -5 -op2en -1 -0 -0 -4 -MCommand -0 -5 -MCommand -0 -6 -MItem -11 -openttd.exe -7 -WString -4 -OEXE -8 -WVList -8 -9 -MRState -10 -WString -7 -OS2LINK -11 -WString -25 -?????No debug information -1 -1 -12 -MRState -13 -WString -7 -OS2LINK -14 -WString -14 -?????Debug All -1 -0 -15 -MVState -16 -WString -7 -OS2LINK -17 -WString -11 -?????Stack: -1 -18 -WString -7 -2097152 -0 -19 -MVState -20 -WString -7 -OS2LINK -21 -WString -18 -?????Libraries(,): -1 -22 -WString -24 -png.lib zlib.lib sdl.lib -0 -23 -MCState -24 -WString -7 -OS2LINK -25 -WString -13 -?????Map file -0 -0 -26 -MVState -27 -WString -7 -OS2LINK -28 -WString -11 -?????Stack: -0 -29 -WString -7 -4194304 -0 -30 -MVState -31 -WString -7 -OS2LINK -32 -WString -18 -?????Libraries(,): -0 -33 -WString -34 -mmpm2.lib png.lib zlib.lib sdl.lib -0 -34 -MVState -35 -WString -7 -OS2LINK -36 -WString -17 -o????Description: -0 -37 -WString -7 -OpenTTD -0 -38 -WVList -3 -39 -ActionStates -40 -WString -5 -&Make -41 -WVList -0 -42 -ActionStates -43 -WString -4 -&Run -44 -WVList -0 -45 -ActionStates -46 -WString -7 -Sam&ple -47 -WVList -0 --1 -1 -1 -0 -48 -WPickList -127 -49 -MItem -3 -*.c -50 -WString -4 -COBJ -51 -WVList -14 -52 -MVState -53 -WString -3 -WCC -54 -WString -28 -?????Disable Warning message -1 -55 -WString -3 -202 -0 -56 -MVState -57 -WString -3 -WCC -58 -WString -23 -?????Macro definitions: -1 -59 -WString -50 -ENABLE_NETWORK=1 WITH_ZLIB=1 WITH_PNG=1 WITH_SDL=1 -0 -60 -MRState -61 -WString -3 -WCC -62 -WString -21 -?????4 byte alignment -1 -1 -63 -MRState -64 -WString -3 -WCC -65 -WString -21 -?????No optimizations -1 -0 -66 -MRState -67 -WString -3 -WCC -68 -WString -24 -?????Space optimizations -1 -1 -69 -MRState -70 -WString -3 -WCC -71 -WString -29 -?????No debugging information -1 -1 -72 -MRState -73 -WString -3 -WCC -74 -WString -24 -?????Full debugging info -1 -0 -75 -MVState -76 -WString -3 -WCC -77 -WString -28 -?????Disable Warning message -0 -78 -WString -3 -202 -0 -79 -MVState -80 -WString -3 -WCC -81 -WString -23 -?????Macro definitions: -0 -82 -WString -61 -ENABLE_NETWORK=1 WITH_ZLIB=1 WITH_PNG=1 WITH_SDL=1 WITH_REV=1 -0 -83 -MCState -84 -WString -3 -WCC -85 -WString -31 -?????Force enums to be type int -0 -1 -86 -MRState -87 -WString -3 -WCC -88 -WString -29 -?????No debugging information -0 -1 -89 -MRState -90 -WString -3 -WCC -91 -WString -28 -?????Line number information -0 -0 -92 -MRState -93 -WString -3 -WCC -94 -WString -39 -??2??Pentium Pro Register based calling -0 -0 -95 -MRState -96 -WString -3 -WCC -97 -WString -36 -??2??Pentium Pro Stack based calling -0 -1 -98 -WVList -0 --1 -1 -1 -0 -99 -MItem -7 -ai\ai.c -100 -WString -4 -COBJ -101 -WVList -0 -102 -WVList -0 -49 -1 -1 -0 -103 -MItem -20 -ai\default\default.c -104 -WString -4 -COBJ -105 -WVList -0 -106 -WVList -0 -49 -1 -1 -0 -107 -MItem -17 -ai\trolly\build.c -108 -WString -4 -COBJ -109 -WVList -0 -110 -WVList -0 -49 -1 -1 -0 -111 -MItem -22 -ai\trolly\pathfinder.c -112 -WString -4 -COBJ -113 -WVList -0 -114 -WVList -0 -49 -1 -1 -0 -115 -MItem -18 -ai\trolly\shared.c -116 -WString -4 -COBJ -117 -WVList -0 -118 -WVList -0 -49 -1 -1 -0 -119 -MItem -18 -ai\trolly\trolly.c -120 -WString -4 -COBJ -121 -WVList -0 -122 -WVList -0 -49 -1 -1 -0 -123 -MItem -14 -aircraft_cmd.c -124 -WString -4 -COBJ -125 -WVList -0 -126 -WVList -0 -49 -1 -1 -0 -127 -MItem -14 -aircraft_gui.c -128 -WString -4 -COBJ -129 -WVList -0 -130 -WVList -0 -49 -1 -1 -0 -131 -MItem -9 -airport.c -132 -WString -4 -COBJ -133 -WVList -0 -134 -WVList -0 -49 -1 -1 -0 -135 -MItem -13 -airport_gui.c -136 -WString -4 -COBJ -137 -WVList -0 -138 -WVList -0 -49 -1 -1 -0 -139 -MItem -8 -aystar.c -140 -WString -4 -COBJ -141 -WVList -0 -142 -WVList -0 -49 -1 -1 -0 -143 -MItem -12 -bridge_gui.c -144 -WString -4 -COBJ -145 -WVList -0 -146 -WVList -0 -49 -1 -1 -0 -147 -MItem -12 -bridge_map.c -148 -WString -4 -COBJ -149 -WVList -0 -150 -WVList -0 -49 -1 -1 -0 -151 -MItem -16 -callback_table.c -152 -WString -4 -COBJ -153 -WVList -0 -154 -WVList -0 -49 -1 -1 -0 -155 -MItem -11 -clear_cmd.c -156 -WString -4 -COBJ -157 -WVList -0 -158 -WVList -0 -49 -1 -1 -0 -159 -MItem -9 -command.c -160 -WString -4 -COBJ -161 -WVList -0 -162 -WVList -0 -49 -1 -1 -0 -163 -MItem -9 -console.c -164 -WString -4 -COBJ -165 -WVList -0 -166 -WVList -0 -49 -1 -1 -0 -167 -MItem -14 -console_cmds.c -168 -WString -4 -COBJ -169 -WVList -0 -170 -WVList -0 -49 -1 -1 -0 -171 -MItem -10 -currency.c -172 -WString -4 -COBJ -173 -WVList -0 -174 -WVList -0 -49 -1 -1 -0 -175 -MItem -7 -debug.c -176 -WString -4 -COBJ -177 -WVList -0 -178 -WVList -0 -49 -1 -1 -0 -179 -MItem -11 -dedicated.c -180 -WString -4 -COBJ -181 -WVList -0 -182 -WVList -0 -49 -1 -1 -0 -183 -MItem -7 -depot.c -184 -WString -4 -COBJ -185 -WVList -0 -186 -WVList -0 -49 -1 -1 -0 -187 -MItem -14 -disaster_cmd.c -188 -WString -4 -COBJ -189 -WVList -0 -190 -WVList -0 -49 -1 -1 -0 -191 -MItem -10 -dock_gui.c -192 -WString -4 -COBJ -193 -WVList -0 -194 -WVList -0 -49 -1 -1 -0 -195 -MItem -8 -driver.c -196 -WString -4 -COBJ -197 -WVList -0 -198 -WVList -0 -49 -1 -1 -0 -199 -MItem -12 -dummy_land.c -200 -WString -4 -COBJ -201 -WVList -0 -202 -WVList -0 -49 -1 -1 -0 -203 -MItem -9 -economy.c -204 -WString -4 -COBJ -205 -WVList -0 -206 -WVList -0 -49 -1 -1 -0 -207 -MItem -8 -elrail.c -208 -WString -4 -COBJ -209 -WVList -0 -210 -WVList -0 -49 -1 -1 -0 -211 -MItem -8 -engine.c -212 -WString -4 -COBJ -213 -WVList -0 -214 -WVList -0 -49 -1 -1 -0 -215 -MItem -12 -engine_gui.c -216 -WString -4 -COBJ -217 -WVList -0 -218 -WVList -0 -49 -1 -1 -0 -219 -MItem -8 -fileio.c -220 -WString -4 -COBJ -221 -WVList -0 -222 -WVList -0 -49 -1 -1 -0 -223 -MItem -5 -gfx.c -224 -WString -4 -COBJ -225 -WVList -0 -226 -WVList -0 -49 -1 -1 -0 -227 -MItem -9 -gfxinit.c -228 -WString -4 -COBJ -229 -WVList -0 -230 -WVList -0 -49 -1 -1 -0 -231 -MItem -11 -graph_gui.c -232 -WString -4 -COBJ -233 -WVList -0 -234 -WVList -0 -49 -1 -1 -0 -235 -MItem -14 -industry_cmd.c -236 -WString -4 -COBJ -237 -WVList -0 -238 -WVList -0 -49 -1 -1 -0 -239 -MItem -14 -industry_gui.c -240 -WString -4 -COBJ -241 -WVList -0 -242 -WVList -0 -49 -1 -1 -0 -243 -MItem -11 -intro_gui.c -244 -WString -4 -COBJ -245 -WVList -0 -246 -WVList -0 -49 -1 -1 -0 -247 -MItem -11 -landscape.c -248 -WString -4 -COBJ -249 -WVList -0 -250 -WVList -0 -49 -1 -1 -0 -251 -MItem -10 -main_gui.c -252 -WString -4 -COBJ -253 -WVList -0 -254 -WVList -0 -49 -1 -1 -0 -255 -MItem -5 -map.c -256 -WString -4 -COBJ -257 -WVList -0 -258 -WVList -0 -49 -1 -1 -0 -259 -MItem -5 -md5.c -260 -WString -4 -COBJ -261 -WVList -0 -262 -WVList -0 -49 -1 -1 -0 -263 -MItem -10 -mersenne.c -264 -WString -4 -COBJ -265 -WVList -0 -266 -WVList -0 -49 -1 -1 -0 -267 -MItem -9 -minilzo.c -268 -WString -4 -COBJ -269 -WVList -0 -270 -WVList -0 -49 -1 -1 -0 -271 -MItem -6 -misc.c -272 -WString -4 -COBJ -273 -WVList -0 -274 -WVList -0 -49 -1 -1 -0 -275 -MItem -10 -misc_cmd.c -276 -WString -4 -COBJ -277 -WVList -0 -278 -WVList -0 -49 -1 -1 -0 -279 -MItem -10 -misc_gui.c -280 -WString -4 -COBJ -281 -WVList -0 -282 -WVList -0 -49 -1 -1 -0 -283 -MItem -7 -mixer.c -284 -WString -4 -COBJ -285 -WVList -0 -286 -WVList -0 -49 -1 -1 -0 -287 -MItem -14 -music\null_m.c -288 -WString -4 -COBJ -289 -WVList -0 -290 -WVList -0 -49 -1 -1 -0 -291 -MItem -13 -music\os2_m.c -292 -WString -4 -COBJ -293 -WVList -0 -294 -WVList -0 -49 -1 -1 -0 -295 -MItem -11 -music_gui.c -296 -WString -4 -COBJ -297 -WVList -0 -298 -WVList -0 -49 -1 -1 -0 -299 -MItem -9 -namegen.c -300 -WString -4 -COBJ -301 -WVList -0 -302 -WVList -0 -49 -1 -1 -0 -303 -MItem -9 -network.c -304 -WString -4 -COBJ -305 -WVList -0 -306 -WVList -0 -49 -1 -1 -0 -307 -MItem -16 -network_client.c -308 -WString -4 -COBJ -309 -WVList -0 -310 -WVList -0 -49 -1 -1 -0 -311 -MItem -14 -network_data.c -312 -WString -4 -COBJ -313 -WVList -0 -314 -WVList -0 -49 -1 -1 -0 -315 -MItem -18 -network_gamelist.c -316 -WString -4 -COBJ -317 -WVList -0 -318 -WVList -0 -49 -1 -1 -0 -319 -MItem -13 -network_gui.c -320 -WString -4 -COBJ -321 -WVList -0 -322 -WVList -0 -49 -1 -1 -0 -323 -MItem -16 -network_server.c -324 -WString -4 -COBJ -325 -WVList -0 -326 -WVList -0 -49 -1 -1 -0 -327 -MItem -13 -network_udp.c -328 -WString -4 -COBJ -329 -WVList -0 -330 -WVList -0 -49 -1 -1 -0 -331 -MItem -8 -newgrf.c -332 -WString -4 -COBJ -333 -WVList -0 -334 -WVList -0 -49 -1 -1 -0 -335 -MItem -15 -newgrf_engine.c -336 -WString -4 -COBJ -337 -WVList -0 -338 -WVList -0 -49 -1 -1 -0 -339 -MItem -16 -newgrf_station.c -340 -WString -4 -COBJ -341 -WVList -0 -342 -WVList -0 -49 -1 -1 -0 -343 -MItem -10 -news_gui.c -344 -WString -4 -COBJ -345 -WVList -0 -346 -WVList -0 -49 -1 -1 -0 -347 -MItem -5 -npf.c -348 -WString -4 -COBJ -349 -WVList -0 -350 -WVList -0 -49 -1 -1 -0 -351 -MItem -11 -oldloader.c -352 -WString -4 -COBJ -353 -WVList -0 -354 -WVList -0 -49 -1 -1 -0 -355 -MItem -9 -openttd.c -356 -WString -4 -COBJ -357 -WVList -0 -358 -WVList -0 -49 -1 -1 -0 -359 -MItem -11 -order_cmd.c -360 -WString -4 -COBJ -361 -WVList -0 -362 -WVList -0 -49 -1 -1 -0 -363 -MItem -11 -order_gui.c -364 -WString -4 -COBJ -365 -WVList -0 -366 -WVList -0 -49 -1 -1 -0 -367 -MItem -5 -os2.c -368 -WString -4 -COBJ -369 -WVList -0 -370 -WVList -0 -49 -1 -1 -0 -371 -MItem -10 -os_timer.c -372 -WString -4 -COBJ -373 -WVList -0 -374 -WVList -0 -49 -1 -1 -0 -375 -MItem -10 -pathfind.c -376 -WString -4 -COBJ -377 -WVList -0 -378 -WVList -0 -49 -1 -1 -0 -379 -MItem -12 -player_gui.c -380 -WString -4 -COBJ -381 -WVList -0 -382 -WVList -0 -49 -1 -1 -0 -383 -MItem -9 -players.c -384 -WString -4 -COBJ -385 -WVList -0 -386 -WVList -0 -49 -1 -1 -0 -387 -MItem -6 -oldpool.c -388 -WString -4 -COBJ -389 -WVList -0 -390 -WVList -0 -49 -1 -1 -0 -391 -MItem -7 -queue.c -392 -WString -4 -COBJ -393 -WVList -0 -394 -WVList -0 -49 -1 -1 -0 -395 -MItem -6 -rail.c -396 -WString -4 -COBJ -397 -WVList -0 -398 -WVList -0 -49 -1 -1 -0 -399 -MItem -10 -rail_cmd.c -400 -WString -4 -COBJ -401 -WVList -0 -402 -WVList -0 -49 -1 -1 -0 -403 -MItem -10 -rail_gui.c -404 -WString -4 -COBJ -405 -WVList -0 -406 -WVList -0 -49 -1 -1 -0 -407 -MItem -5 -rev.c -408 -WString -4 -COBJ -409 -WVList -0 -410 -WVList -1 -411 -ActionStates -412 -WString -5 -&Make -413 -WVList -0 -49 -1 -1 -0 -414 -MItem -10 -road_cmd.c -415 -WString -4 -COBJ -416 -WVList -0 -417 -WVList -0 -49 -1 -1 -0 -418 -MItem -10 -road_gui.c -419 -WString -4 -COBJ -420 -WVList -0 -421 -WVList -0 -49 -1 -1 -0 -422 -MItem -10 -road_map.c -423 -WString -4 -COBJ -424 -WVList -0 -425 -WVList -0 -49 -1 -1 -0 -426 -MItem -13 -roadveh_cmd.c -427 -WString -4 -COBJ -428 -WVList -0 -429 -WVList -0 -49 -1 -1 -0 -430 -MItem -13 -roadveh_gui.c -431 -WString -4 -COBJ -432 -WVList -0 -433 -WVList -0 -49 -1 -1 -0 -434 -MItem -10 -saveload.c -435 -WString -4 -COBJ -436 -WVList -0 -437 -WVList -0 -49 -1 -1 -0 -438 -MItem -12 -screenshot.c -439 -WString -4 -COBJ -440 -WVList -0 -441 -WVList -0 -49 -1 -1 -0 -442 -MItem -5 -sdl.c -443 -WString -4 -COBJ -444 -WVList -0 -445 -WVList -0 -49 -1 -1 -0 -446 -MItem -10 -settings.c -447 -WString -4 -COBJ -448 -WVList -0 -449 -WVList -0 -49 -1 -1 -0 -450 -MItem -14 -settings_gui.c -451 -WString -4 -COBJ -452 -WVList -0 -453 -WVList -0 -49 -1 -1 -0 -454 -MItem -10 -ship_cmd.c -455 -WString -4 -COBJ -456 -WVList -0 -457 -WVList -0 -49 -1 -1 -0 -458 -MItem -10 -ship_gui.c -459 -WString -4 -COBJ -460 -WVList -0 -461 -WVList -0 -49 -1 -1 -0 -462 -MItem -7 -signs.c -463 -WString -4 -COBJ -464 -WVList -0 -465 -WVList -0 -49 -1 -1 -0 -466 -MItem -14 -smallmap_gui.c -467 -WString -4 -COBJ -468 -WVList -0 -469 -WVList -0 -49 -1 -1 -0 -470 -MItem -7 -sound.c -471 -WString -4 -COBJ -472 -WVList -0 -473 -WVList -0 -49 -1 -1 -0 -474 -MItem -14 -sound\null_s.c -475 -WString -4 -COBJ -476 -WVList -0 -477 -WVList -0 -49 -1 -1 -0 -478 -MItem -13 -sound\sdl_s.c -479 -WString -4 -COBJ -480 -WVList -0 -481 -WVList -0 -49 -1 -1 -0 -482 -MItem -8 -sprite.c -483 -WString -4 -COBJ -484 -WVList -0 -485 -WVList -0 -49 -1 -1 -0 -486 -MItem -13 -spritecache.c -487 -WString -4 -COBJ -488 -WVList -0 -489 -WVList -0 -49 -1 -1 -0 -490 -MItem -13 -station_cmd.c -491 -WString -4 -COBJ -492 -WVList -0 -493 -WVList -0 -49 -1 -1 -0 -494 -MItem -13 -station_gui.c -495 -WString -4 -COBJ -496 -WVList -0 -497 -WVList -0 -49 -1 -1 -0 -498 -MItem -13 -station_map.c -499 -WString -4 -COBJ -500 -WVList -0 -501 -WVList -0 -49 -1 -1 -0 -502 -MItem -8 -StdAfx.c -503 -WString -4 -COBJ -504 -WVList -0 -505 -WVList -0 -49 -1 -1 -0 -506 -MItem -8 -string.c -507 -WString -4 -COBJ -508 -WVList -0 -509 -WVList -0 -49 -1 -1 -0 -510 -MItem -9 -strings.c -511 -WString -4 -COBJ -512 -WVList -0 -513 -WVList -0 -49 -1 -1 -0 -514 -MItem -13 -subsidy_gui.c -515 -WString -4 -COBJ -516 -WVList -0 -517 -WVList -0 -49 -1 -1 -0 -518 -MItem -15 -terraform_gui.c -519 -WString -4 -COBJ -520 -WVList -0 -521 -WVList -0 -49 -1 -1 -0 -522 -MItem -9 -texteff.c -523 -WString -4 -COBJ -524 -WVList -0 -525 -WVList -0 -49 -1 -1 -0 -526 -MItem -8 -thread.c -527 -WString -4 -COBJ -528 -WVList -0 -529 -WVList -0 -49 -1 -1 -0 -530 -MItem -6 -tile.c -531 -WString -4 -COBJ -532 -WVList -0 -533 -WVList -0 -49 -1 -1 -0 -534 -MItem -10 -town_cmd.c -535 -WString -4 -COBJ -536 -WVList -0 -537 -WVList -0 -49 -1 -1 -0 -538 -MItem -10 -town_gui.c -539 -WString -4 -COBJ -540 -WVList -0 -541 -WVList -0 -49 -1 -1 -0 -542 -MItem -11 -train_cmd.c -543 -WString -4 -COBJ -544 -WVList -0 -545 -WVList -0 -49 -1 -1 -0 -546 -MItem -11 -train_gui.c -547 -WString -4 -COBJ -548 -WVList -0 -549 -WVList -0 -49 -1 -1 -0 -550 -MItem -10 -tree_cmd.c -551 -WString -4 -COBJ -552 -WVList -0 -553 -WVList -0 -49 -1 -1 -0 -554 -MItem -12 -tunnel_map.c -555 -WString -4 -COBJ -556 -WVList -0 -557 -WVList -0 -49 -1 -1 -0 -558 -MItem -18 -tunnelbridge_cmd.c -559 -WString -4 -COBJ -560 -WVList -0 -561 -WVList -0 -49 -1 -1 -0 -562 -MItem -15 -unmovable_cmd.c -563 -WString -4 -COBJ -564 -WVList -0 -565 -WVList -0 -49 -1 -1 -0 -566 -MItem -9 -vehicle.c -567 -WString -4 -COBJ -568 -WVList -0 -569 -WVList -0 -49 -1 -1 -0 -570 -MItem -13 -vehicle_gui.c -571 -WString -4 -COBJ -572 -WVList -0 -573 -WVList -0 -49 -1 -1 -0 -574 -MItem -19 -video\dedicated_v.c -575 -WString -4 -COBJ -576 -WVList -0 -577 -WVList -0 -49 -1 -1 -0 -578 -MItem -14 -video\null_v.c -579 -WString -4 -COBJ -580 -WVList -0 -581 -WVList -0 -49 -1 -1 -0 -582 -MItem -13 -video\sdl_v.c -583 -WString -4 -COBJ -584 -WVList -0 -585 -WVList -0 -49 -1 -1 -0 -586 -MItem -10 -viewport.c -587 -WString -4 -COBJ -588 -WVList -0 -589 -WVList -0 -49 -1 -1 -0 -590 -MItem -11 -water_cmd.c -591 -WString -4 -COBJ -592 -WVList -0 -593 -WVList -0 -49 -1 -1 -0 -594 -MItem -10 -waypoint.c -595 -WString -4 -COBJ -596 -WVList -0 -597 -WVList -0 -49 -1 -1 -0 -598 -MItem -8 -widget.c -599 -WString -4 -COBJ -600 -WVList -0 -601 -WVList -0 -49 -1 -1 -0 -602 -MItem -8 -window.c -603 -WString -4 -COBJ -604 -WVList -0 -605 -WVList -0 -49 -1 -1 -0 diff --git a/projects/openttd.vcproj b/projects/openttd.vcproj deleted file mode 100644 index 45d91cc32..000000000 --- a/projects/openttd.vcproj +++ /dev/null @@ -1,1429 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="openttd" - RootNamespace="openttd" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Release|Win32" - OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="1" - WholeProgramOptimization="TRUE"> - <Tool - Name="VCCLCompilerTool" - Optimization="3" - GlobalOptimizations="TRUE" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="TRUE" - FavorSizeOrSpeed="2" - OmitFramePointers="TRUE" - OptimizeForProcessor="1" - AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" - StringPooling="TRUE" - ExceptionHandling="TRUE" - RuntimeLibrary="0" - StructMemberAlignment="3" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - DefaultCharIsUnsigned="TRUE" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" - PrecompiledHeaderFile="" - AssemblerOutput="2" - AssemblerListingLocation="$(IntDir)/" - ObjectFile="$(IntDir)/" - ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" - BrowseInformation="1" - BrowseInformationFile="$(IntDir)/" - WarningLevel="3" - WarnAsError="TRUE" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CallingConvention="1" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="TRUE" - SubSystem="2" - OptimizeReferences="2" - OptimizeForWindows98="1" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Release/openttd.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs""/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1053"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" - IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="1"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - AssemblerListingLocation="$(IntDir)/" - ObjectFile="$(IntDir)/" - ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" - WarningLevel="3" - WarnAsError="TRUE" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="4" - CallingConvention="1" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" - LinkIncremental="0" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="LIBCMT.lib" - GenerateDebugInformation="TRUE" - SubSystem="2" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Debug/openttd.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs""/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter=""> - <File - RelativePath=".\..\src\airport.cpp"> - </File> - <File - RelativePath=".\..\src\articulated_vehicles.cpp"> - </File> - <File - RelativePath=".\..\src\autoreplace_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\aystar.cpp"> - </File> - <File - RelativePath=".\..\src\bmp.cpp"> - </File> - <File - RelativePath=".\..\src\callback_table.cpp"> - </File> - <File - RelativePath=".\..\src\cargopacket.cpp"> - </File> - <File - RelativePath=".\..\src\cargotype.cpp"> - </File> - <File - RelativePath=".\..\src\command.cpp"> - </File> - <File - RelativePath=".\..\src\console.cpp"> - </File> - <File - RelativePath=".\..\src\console_cmds.cpp"> - </File> - <File - RelativePath=".\..\src\core\bitmath_func.cpp"> - </File> - <File - RelativePath=".\..\src\core\random_func.cpp"> - </File> - <File - RelativePath=".\..\src\currency.cpp"> - </File> - <File - RelativePath=".\..\src\date.cpp"> - </File> - <File - RelativePath=".\..\src\debug.cpp"> - </File> - <File - RelativePath=".\..\src\dedicated.cpp"> - </File> - <File - RelativePath=".\..\src\depot.cpp"> - </File> - <File - RelativePath=".\..\src\driver.cpp"> - </File> - <File - RelativePath=".\..\src\economy.cpp"> - </File> - <File - RelativePath=".\..\src\elrail.cpp"> - </File> - <File - RelativePath=".\..\src\engine.cpp"> - </File> - <File - RelativePath=".\..\src\fileio.cpp"> - </File> - <File - RelativePath=".\..\src\fios.cpp"> - </File> - <File - RelativePath=".\..\src\fontcache.cpp"> - </File> - <File - RelativePath=".\..\src\genworld.cpp"> - </File> - <File - RelativePath=".\..\src\gfx.cpp"> - </File> - <File - RelativePath=".\..\src\gfxinit.cpp"> - </File> - <File - RelativePath=".\..\src\heightmap.cpp"> - </File> - <File - RelativePath=".\..\src\helpers.cpp"> - </File> - <File - RelativePath=".\..\src\landscape.cpp"> - </File> - <File - RelativePath=".\..\src\map.cpp"> - </File> - <File - RelativePath=".\..\src\md5.cpp"> - </File> - <File - RelativePath=".\..\src\minilzo.cpp"> - </File> - <File - RelativePath=".\..\src\misc.cpp"> - </File> - <File - RelativePath=".\..\src\mixer.cpp"> - </File> - <File - RelativePath=".\..\src\music.cpp"> - </File> - <File - RelativePath=".\..\src\namegen.cpp"> - </File> - <File - RelativePath=".\..\src\network\network.cpp"> - </File> - <File - RelativePath=".\..\src\network\network_client.cpp"> - </File> - <File - RelativePath=".\..\src\network\network_data.cpp"> - </File> - <File - RelativePath=".\..\src\network\network_gamelist.cpp"> - </File> - <File - RelativePath=".\..\src\network\network_server.cpp"> - </File> - <File - RelativePath=".\..\src\network\network_udp.cpp"> - </File> - <File - RelativePath=".\..\src\npf.cpp"> - </File> - <File - RelativePath=".\..\src\oldloader.cpp"> - </File> - <File - RelativePath=".\..\src\oldpool.cpp"> - </File> - <File - RelativePath=".\..\src\openttd.cpp"> - </File> - <File - RelativePath=".\..\src\os_timer.cpp"> - </File> - <File - RelativePath=".\..\src\ottdres.rc"> - </File> - <File - RelativePath=".\..\src\pathfind.cpp"> - </File> - <File - RelativePath=".\..\src\players.cpp"> - </File> - <File - RelativePath=".\..\src\queue.cpp"> - </File> - <File - RelativePath=".\..\src\rail.cpp"> - </File> - <File - RelativePath=".\..\src\rev.cpp"> - </File> - <File - RelativePath=".\..\src\road.cpp"> - </File> - <File - RelativePath=".\..\src\saveload.cpp"> - </File> - <File - RelativePath=".\..\src\screenshot.cpp"> - </File> - <File - RelativePath=".\..\src\sdl.cpp"> - </File> - <File - RelativePath=".\..\src\settings.cpp"> - </File> - <File - RelativePath=".\..\src\signal.cpp"> - </File> - <File - RelativePath=".\..\src\signs.cpp"> - </File> - <File - RelativePath=".\..\src\sound.cpp"> - </File> - <File - RelativePath=".\..\src\spritecache.cpp"> - </File> - <File - RelativePath=".\..\src\station.cpp"> - </File> - <File - RelativePath=".\..\src\string.cpp"> - </File> - <File - RelativePath=".\..\src\strings.cpp"> - </File> - <File - RelativePath=".\..\src\texteff.cpp"> - </File> - <File - RelativePath=".\..\src\tgp.cpp"> - </File> - <File - RelativePath=".\..\src\thread.cpp"> - </File> - <File - RelativePath=".\..\src\tile_map.cpp"> - </File> - <File - RelativePath=".\..\src\vehicle.cpp"> - </File> - <File - RelativePath=".\..\src\viewport.cpp"> - </File> - <File - RelativePath=".\..\src\waypoint.cpp"> - </File> - <File - RelativePath=".\..\src\widget.cpp"> - </File> - <File - RelativePath=".\..\src\widgets\dropdown.cpp"> - </File> - <File - RelativePath=".\..\src\win32.cpp"> - </File> - <File - RelativePath=".\..\src\window.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter=""> - <File - RelativePath=".\..\src\aircraft.h"> - </File> - <File - RelativePath=".\..\src\airport.h"> - </File> - <File - RelativePath=".\..\src\airport_movement.h"> - </File> - <File - RelativePath=".\..\src\articulated_vehicles.h"> - </File> - <File - RelativePath=".\..\src\autoslope.h"> - </File> - <File - RelativePath=".\..\src\aystar.h"> - </File> - <File - RelativePath=".\..\src\bmp.h"> - </File> - <File - RelativePath=".\..\src\cargopacket.h"> - </File> - <File - RelativePath=".\..\src\cargotype.h"> - </File> - <File - RelativePath=".\..\src\command.h"> - </File> - <File - RelativePath=".\..\src\console.h"> - </File> - <File - RelativePath=".\..\src\core\bitmath_func.hpp"> - </File> - <File - RelativePath=".\..\src\core\math_func.hpp"> - </File> - <File - RelativePath=".\..\src\core\random_func.hpp"> - </File> - <File - RelativePath=".\..\src\currency.h"> - </File> - <File - RelativePath=".\..\src\date.h"> - </File> - <File - RelativePath=".\..\src\debug.h"> - </File> - <File - RelativePath=".\..\src\video\dedicated_v.h"> - </File> - <File - RelativePath=".\..\src\depot.h"> - </File> - <File - RelativePath=".\..\src\direction.h"> - </File> - <File - RelativePath=".\..\src\music\dmusic.h"> - </File> - <File - RelativePath=".\..\src\driver.h"> - </File> - <File - RelativePath=".\..\src\economy.h"> - </File> - <File - RelativePath=".\..\src\engine.h"> - </File> - <File - RelativePath=".\..\src\fileio.h"> - </File> - <File - RelativePath=".\..\src\fios.h"> - </File> - <File - RelativePath=".\..\src\fontcache.h"> - </File> - <File - RelativePath=".\..\src\functions.h"> - </File> - <File - RelativePath=".\..\src\genworld.h"> - </File> - <File - RelativePath=".\..\src\gfx.h"> - </File> - <File - RelativePath=".\..\src\gfxinit.h"> - </File> - <File - RelativePath=".\..\src\group.h"> - </File> - <File - RelativePath=".\..\src\gui.h"> - </File> - <File - RelativePath=".\..\src\heightmap.h"> - </File> - <File - RelativePath=".\..\src\industry.h"> - </File> - <File - RelativePath=".\..\src\landscape.h"> - </File> - <File - RelativePath=".\..\src\livery.h"> - </File> - <File - RelativePath=".\..\src\map.h"> - </File> - <File - RelativePath=".\..\src\md5.h"> - </File> - <File - RelativePath=".\..\src\mixer.h"> - </File> - <File - RelativePath=".\..\src\music.h"> - </File> - <File - RelativePath=".\..\src\network\network.h"> - </File> - <File - RelativePath=".\..\src\network\network_client.h"> - </File> - <File - RelativePath=".\..\src\network\network_data.h"> - </File> - <File - RelativePath=".\..\src\network\network_gamelist.h"> - </File> - <File - RelativePath=".\..\src\network\network_gui.h"> - </File> - <File - RelativePath=".\..\src\network\network_server.h"> - </File> - <File - RelativePath=".\..\src\network\network_udp.h"> - </File> - <File - RelativePath=".\..\src\newgrf.h"> - </File> - <File - RelativePath=".\..\src\newgrf_callbacks.h"> - </File> - <File - RelativePath=".\..\src\newgrf_canal.h"> - </File> - <File - RelativePath=".\..\src\newgrf_cargo.h"> - </File> - <File - RelativePath=".\..\src\newgrf_commons.h"> - </File> - <File - RelativePath=".\..\src\newgrf_config.h"> - </File> - <File - RelativePath=".\..\src\newgrf_engine.h"> - </File> - <File - RelativePath=".\..\src\newgrf_house.h"> - </File> - <File - RelativePath=".\..\src\newgrf_industries.h"> - </File> - <File - RelativePath=".\..\src\newgrf_industrytiles.h"> - </File> - <File - RelativePath=".\..\src\newgrf_sound.h"> - </File> - <File - RelativePath=".\..\src\newgrf_spritegroup.h"> - </File> - <File - RelativePath=".\..\src\newgrf_station.h"> - </File> - <File - RelativePath=".\..\src\newgrf_storage.h"> - </File> - <File - RelativePath=".\..\src\newgrf_text.h"> - </File> - <File - RelativePath=".\..\src\newgrf_town.h"> - </File> - <File - RelativePath=".\..\src\newgrf_townname.h"> - </File> - <File - RelativePath=".\..\src\news.h"> - </File> - <File - RelativePath=".\..\src\npf.h"> - </File> - <File - RelativePath=".\..\src\music\null_m.h"> - </File> - <File - RelativePath=".\..\src\sound\null_s.h"> - </File> - <File - RelativePath=".\..\src\video\null_v.h"> - </File> - <File - RelativePath=".\..\src\oldpool.h"> - </File> - <File - RelativePath=".\..\src\openttd.h"> - </File> - <File - RelativePath=".\..\src\pathfind.h"> - </File> - <File - RelativePath=".\..\src\player.h"> - </File> - <File - RelativePath=".\..\src\player_face.h"> - </File> - <File - RelativePath=".\..\src\queue.h"> - </File> - <File - RelativePath=".\..\src\rail.h"> - </File> - <File - RelativePath=".\..\src\road_cmd.h"> - </File> - <File - RelativePath=".\..\src\saveload.h"> - </File> - <File - RelativePath=".\..\src\screenshot.h"> - </File> - <File - RelativePath=".\..\src\sound\sdl_s.h"> - </File> - <File - RelativePath=".\..\src\video\sdl_v.h"> - </File> - <File - RelativePath=".\..\src\settings.h"> - </File> - <File - RelativePath=".\..\src\signs.h"> - </File> - <File - RelativePath=".\..\src\signal_func.h"> - </File> - <File - RelativePath=".\..\src\slope.h"> - </File> - <File - RelativePath=".\..\src\sound.h"> - </File> - <File - RelativePath=".\..\src\sprite.h"> - </File> - <File - RelativePath=".\..\src\spritecache.h"> - </File> - <File - RelativePath=".\..\src\station.h"> - </File> - <File - RelativePath=".\..\src\station_gui.h"> - </File> - <File - RelativePath=".\..\src\stdafx.h"> - </File> - <File - RelativePath=".\..\src\string.h"> - </File> - <File - RelativePath=".\..\src\texteff.hpp"> - </File> - <File - RelativePath=".\..\src\tgp.h"> - </File> - <File - RelativePath=".\..\src\thread.h"> - </File> - <File - RelativePath=".\..\src\tile.h"> - </File> - <File - RelativePath=".\..\src\timetable.h"> - </File> - <File - RelativePath=".\..\src\town.h"> - </File> - <File - RelativePath=".\..\src\train.h"> - </File> - <File - RelativePath=".\..\src\transparency.h"> - </File> - <File - RelativePath=".\..\src\transparency_gui.h"> - </File> - <File - RelativePath=".\..\src\tunnelbridge.h"> - </File> - <File - RelativePath=".\..\src\variables.h"> - </File> - <File - RelativePath=".\..\src\vehicle.h"> - </File> - <File - RelativePath=".\..\src\vehicle_gui.h"> - </File> - <File - RelativePath=".\..\src\viewport.h"> - </File> - <File - RelativePath=".\..\src\waypoint.h"> - </File> - <File - RelativePath=".\..\src\music\win32_m.h"> - </File> - <File - RelativePath=".\..\src\sound\win32_s.h"> - </File> - <File - RelativePath=".\..\src\video\win32_v.h"> - </File> - <File - RelativePath=".\..\src\window.h"> - </File> - <File - RelativePath=".\..\src\widgets\dropdown.h"> - </File> - <File - RelativePath=".\..\src\widgets\dropdown_type.h"> - </File> - <File - RelativePath=".\..\src\widgets\dropdown_func.h"> - </File> - <File - RelativePath=".\..\src\zoom.hpp"> - </File> - </Filter> - <Filter - Name="GUI Source Code" - Filter=""> - <File - RelativePath=".\..\src\aircraft_gui.cpp"> - </File> - <File - RelativePath=".\..\src\airport_gui.cpp"> - </File> - <File - RelativePath=".\..\src\autoreplace_gui.cpp"> - </File> - <File - RelativePath=".\..\src\bridge_gui.cpp"> - </File> - <File - RelativePath=".\..\src\build_vehicle_gui.cpp"> - </File> - <File - RelativePath=".\..\src\depot_gui.cpp"> - </File> - <File - RelativePath=".\..\src\dock_gui.cpp"> - </File> - <File - RelativePath=".\..\src\engine_gui.cpp"> - </File> - <File - RelativePath=".\..\src\genworld_gui.cpp"> - </File> - <File - RelativePath=".\..\src\graph_gui.cpp"> - </File> - <File - RelativePath=".\..\src\group_gui.cpp"> - </File> - <File - RelativePath=".\..\src\industry_gui.cpp"> - </File> - <File - RelativePath=".\..\src\intro_gui.cpp"> - </File> - <File - RelativePath=".\..\src\main_gui.cpp"> - </File> - <File - RelativePath=".\..\src\misc_gui.cpp"> - </File> - <File - RelativePath=".\..\src\music_gui.cpp"> - </File> - <File - RelativePath=".\..\src\network\network_gui.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_gui.cpp"> - </File> - <File - RelativePath=".\..\src\news_gui.cpp"> - </File> - <File - RelativePath=".\..\src\order_gui.cpp"> - </File> - <File - RelativePath=".\..\src\player_gui.cpp"> - </File> - <File - RelativePath=".\..\src\rail_gui.cpp"> - </File> - <File - RelativePath=".\..\src\road_gui.cpp"> - </File> - <File - RelativePath=".\..\src\roadveh_gui.cpp"> - </File> - <File - RelativePath=".\..\src\settings_gui.cpp"> - </File> - <File - RelativePath=".\..\src\ship_gui.cpp"> - </File> - <File - RelativePath=".\..\src\signs_gui.cpp"> - </File> - <File - RelativePath=".\..\src\smallmap_gui.cpp"> - </File> - <File - RelativePath=".\..\src\station_gui.cpp"> - </File> - <File - RelativePath=".\..\src\subsidy_gui.cpp"> - </File> - <File - RelativePath=".\..\src\terraform_gui.cpp"> - </File> - <File - RelativePath=".\..\src\timetable_gui.cpp"> - </File> - <File - RelativePath=".\..\src\town_gui.cpp"> - </File> - <File - RelativePath=".\..\src\train_gui.cpp"> - </File> - <File - RelativePath=".\..\src\transparency_gui.cpp"> - </File> - <File - RelativePath=".\..\src\vehicle_gui.cpp"> - </File> - </Filter> - <Filter - Name="Landscape" - Filter=""> - <File - RelativePath=".\..\src\aircraft_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\clear_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\disaster_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\dummy_land.cpp"> - </File> - <File - RelativePath=".\..\src\group_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\industry_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\misc_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\order_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\rail_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\road_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\roadveh_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\ship_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\station_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\terraform_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\timetable_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\town_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\train_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\tree_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\tunnelbridge_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\unmovable_cmd.cpp"> - </File> - <File - RelativePath=".\..\src\water_cmd.cpp"> - </File> - </Filter> - <Filter - Name="Tables" - Filter=""> - <File - RelativePath=".\..\src\table\ai_rail.h"> - </File> - <File - RelativePath=".\..\src\table\animcursors.h"> - </File> - <File - RelativePath=".\..\src\table\autorail.h"> - </File> - <File - RelativePath=".\..\src\table\build_industry.h"> - </File> - <File - RelativePath=".\..\src\table\cargo_const.h"> - </File> - <File - RelativePath=".\..\src\table\clear_land.h"> - </File> - <File - RelativePath=".\..\src\table\elrail_data.h"> - </File> - <File - RelativePath=".\..\src\table\engines.h"> - </File> - <File - RelativePath=".\..\src\table\genland.h"> - </File> - <File - RelativePath=".\..\src\table\industry_land.h"> - </File> - <File - RelativePath=".\..\src\table\landscape_sprite.h"> - </File> - <File - RelativePath=".\..\src\table\namegen.h"> - </File> - <File - RelativePath=".\..\src\table\palettes.h"> - </File> - <File - RelativePath=".\..\src\table\road_land.h"> - </File> - <File - RelativePath=".\..\src\table\roadveh.h"> - </File> - <File - RelativePath=".\..\src\table\sprites.h"> - </File> - <File - RelativePath=".\..\src\table\station_land.h"> - </File> - <File - RelativePath=".\..\src\..\objs\langs\table\strings.h"> - </File> - <File - RelativePath=".\..\src\table\town_land.h"> - </File> - <File - RelativePath=".\..\src\table\track_land.h"> - </File> - <File - RelativePath=".\..\src\table\train_cmd.h"> - </File> - <File - RelativePath=".\..\src\table\tree_land.h"> - </File> - <File - RelativePath=".\..\src\table\unmovable_land.h"> - </File> - <File - RelativePath=".\..\src\table\water_land.h"> - </File> - </Filter> - <Filter - Name="AI Files" - Filter=""> - <File - RelativePath=".\..\src\ai\ai.cpp"> - </File> - <File - RelativePath=".\..\src\ai\trolly\build.cpp"> - </File> - <File - RelativePath=".\..\src\ai\default\default.cpp"> - </File> - <File - RelativePath=".\..\src\ai\trolly\pathfinder.cpp"> - </File> - <File - RelativePath=".\..\src\ai\trolly\shared.cpp"> - </File> - <File - RelativePath=".\..\src\ai\trolly\trolly.cpp"> - </File> - </Filter> - <Filter - Name="Blitters" - Filter=""> - <File - RelativePath=".\..\src\blitter\32bpp_anim.cpp"> - </File> - <File - RelativePath=".\..\src\blitter\32bpp_anim.hpp"> - </File> - <File - RelativePath=".\..\src\blitter\32bpp_base.cpp"> - </File> - <File - RelativePath=".\..\src\blitter\32bpp_base.hpp"> - </File> - <File - RelativePath=".\..\src\blitter\32bpp_optimized.cpp"> - </File> - <File - RelativePath=".\..\src\blitter\32bpp_optimized.hpp"> - </File> - <File - RelativePath=".\..\src\blitter\32bpp_simple.cpp"> - </File> - <File - RelativePath=".\..\src\blitter\32bpp_simple.hpp"> - </File> - <File - RelativePath=".\..\src\blitter\8bpp_base.cpp"> - </File> - <File - RelativePath=".\..\src\blitter\8bpp_base.hpp"> - </File> - <File - RelativePath=".\..\src\blitter\8bpp_debug.cpp"> - </File> - <File - RelativePath=".\..\src\blitter\8bpp_debug.hpp"> - </File> - <File - RelativePath=".\..\src\blitter\8bpp_optimized.cpp"> - </File> - <File - RelativePath=".\..\src\blitter\8bpp_optimized.hpp"> - </File> - <File - RelativePath=".\..\src\blitter\8bpp_simple.cpp"> - </File> - <File - RelativePath=".\..\src\blitter\8bpp_simple.hpp"> - </File> - <File - RelativePath=".\..\src\blitter\base.hpp"> - </File> - <File - RelativePath=".\..\src\blitter\factory.hpp"> - </File> - <File - RelativePath=".\..\src\blitter\null.cpp"> - </File> - <File - RelativePath=".\..\src\blitter\null.hpp"> - </File> - </Filter> - <Filter - Name="Drivers" - Filter=""> - <File - RelativePath=".\..\src\music\music_driver.hpp"> - </File> - <File - RelativePath=".\..\src\sound\sound_driver.hpp"> - </File> - <File - RelativePath=".\..\src\video\video_driver.hpp"> - </File> - </Filter> - <Filter - Name="Sprite loaders" - Filter=""> - <File - RelativePath=".\..\src\spriteloader\grf.cpp"> - </File> - <File - RelativePath=".\..\src\spriteloader\grf.hpp"> - </File> - <File - RelativePath=".\..\src\spriteloader\png.cpp"> - </File> - <File - RelativePath=".\..\src\spriteloader\png.hpp"> - </File> - <File - RelativePath=".\..\src\spriteloader\spriteloader.hpp"> - </File> - </Filter> - <Filter - Name="NewGRF" - Filter=""> - <File - RelativePath=".\..\src\newgrf.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_canal.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_cargo.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_commons.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_config.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_engine.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_house.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_industries.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_industrytiles.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_sound.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_spritegroup.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_station.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_storage.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_text.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_town.cpp"> - </File> - <File - RelativePath=".\..\src\newgrf_townname.cpp"> - </File> - </Filter> - <Filter - Name="Map Accessors" - Filter=""> - <File - RelativePath=".\..\src\bridge_map.cpp"> - </File> - <File - RelativePath=".\..\src\bridge_map.h"> - </File> - <File - RelativePath=".\..\src\clear_map.h"> - </File> - <File - RelativePath=".\..\src\industry_map.h"> - </File> - <File - RelativePath=".\..\src\rail_map.h"> - </File> - <File - RelativePath=".\..\src\road_map.cpp"> - </File> - <File - RelativePath=".\..\src\road_map.h"> - </File> - <File - RelativePath=".\..\src\station_map.h"> - </File> - <File - RelativePath=".\..\src\town_map.h"> - </File> - <File - RelativePath=".\..\src\tree_map.h"> - </File> - <File - RelativePath=".\..\src\tunnel_map.cpp"> - </File> - <File - RelativePath=".\..\src\tunnel_map.h"> - </File> - <File - RelativePath=".\..\src\tunnelbridge_map.h"> - </File> - <File - RelativePath=".\..\src\unmovable_map.h"> - </File> - <File - RelativePath=".\..\src\void_map.h"> - </File> - <File - RelativePath=".\..\src\water_map.h"> - </File> - </Filter> - <Filter - Name="Misc" - Filter=""> - <File - RelativePath=".\..\src\misc\array.hpp"> - </File> - <File - RelativePath=".\..\src\misc\autocopyptr.hpp"> - </File> - <File - RelativePath=".\..\src\misc\autoptr.hpp"> - </File> - <File - RelativePath=".\..\src\misc\binaryheap.hpp"> - </File> - <File - RelativePath=".\..\src\misc\blob.hpp"> - </File> - <File - RelativePath=".\..\src\misc\countedptr.hpp"> - </File> - <File - RelativePath=".\..\src\misc\crc32.hpp"> - </File> - <File - RelativePath=".\..\src\misc\dbg_helpers.cpp"> - </File> - <File - RelativePath=".\..\src\misc\dbg_helpers.h"> - </File> - <File - RelativePath=".\..\src\misc\fixedsizearray.hpp"> - </File> - <File - RelativePath=".\..\src\misc\hashtable.hpp"> - </File> - <File - RelativePath=".\..\src\misc\str.hpp"> - </File> - <File - RelativePath=".\..\src\misc\strapi.hpp"> - </File> - </Filter> - <Filter - Name="Network Core" - Filter=""> - <File - RelativePath=".\..\src\network\core\config.h"> - </File> - <File - RelativePath=".\..\src\network\core\core.cpp"> - </File> - <File - RelativePath=".\..\src\network\core\core.h"> - </File> - <File - RelativePath=".\..\src\network\core\game.h"> - </File> - <File - RelativePath=".\..\src\network\core\os_abstraction.h"> - </File> - <File - RelativePath=".\..\src\network\core\packet.cpp"> - </File> - <File - RelativePath=".\..\src\network\core\packet.h"> - </File> - <File - RelativePath=".\..\src\network\core\tcp.cpp"> - </File> - <File - RelativePath=".\..\src\network\core\tcp.h"> - </File> - <File - RelativePath=".\..\src\network\core\udp.cpp"> - </File> - <File - RelativePath=".\..\src\network\core\udp.h"> - </File> - </Filter> - <Filter - Name="YAPF" - Filter=""> - <File - RelativePath=".\..\src\yapf\follow_track.cpp"> - </File> - <File - RelativePath=".\..\src\yapf\follow_track.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\nodelist.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\track_dir.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf.h"> - </File> - <File - RelativePath=".\..\src\yapf\yapf.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_base.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_common.cpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_common.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_costbase.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_costcache.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_costrail.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_destrail.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_node.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_node_rail.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_node_road.hpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_rail.cpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_road.cpp"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_settings.h"> - </File> - <File - RelativePath=".\..\src\yapf\yapf_ship.cpp"> - </File> - </Filter> - <Filter - Name="Video" - Filter=""> - <File - RelativePath=".\..\src\video\dedicated_v.cpp"> - </File> - <File - RelativePath=".\..\src\video\null_v.cpp"> - </File> - <File - RelativePath=".\..\src\video\sdl_v.cpp"> - </File> - <File - RelativePath=".\..\src\video\win32_v.cpp"> - </File> - </Filter> - <Filter - Name="Music" - Filter=""> - <File - RelativePath=".\..\src\music\dmusic.cpp"> - </File> - <File - RelativePath=".\..\src\music\null_m.cpp"> - </File> - <File - RelativePath=".\..\src\music\win32_m.cpp"> - </File> - </Filter> - <Filter - Name="Sound" - Filter=""> - <File - RelativePath=".\..\src\sound\null_s.cpp"> - </File> - <File - RelativePath=".\..\src\sound\sdl_s.cpp"> - </File> - <File - RelativePath=".\..\src\sound\win32_s.cpp"> - </File> - </Filter> - <File - RelativePath=".\..\media\mainicon.ico"> - </File> - <File - RelativePath=".\..\media\openttd.ico"> - </File> - <File - RelativePath=".\..\readme.txt"> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/projects/openttd.vcproj.in b/projects/openttd.vcproj.in deleted file mode 100644 index afdac3331..000000000 --- a/projects/openttd.vcproj.in +++ /dev/null @@ -1,177 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="openttd" - RootNamespace="openttd" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Release|Win32" - OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="1" - WholeProgramOptimization="TRUE"> - <Tool - Name="VCCLCompilerTool" - Optimization="3" - GlobalOptimizations="TRUE" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="TRUE" - FavorSizeOrSpeed="2" - OmitFramePointers="TRUE" - OptimizeForProcessor="1" - AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" - StringPooling="TRUE" - ExceptionHandling="TRUE" - RuntimeLibrary="0" - StructMemberAlignment="3" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - DefaultCharIsUnsigned="TRUE" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" - PrecompiledHeaderFile="" - AssemblerOutput="2" - AssemblerListingLocation="$(IntDir)/" - ObjectFile="$(IntDir)/" - ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" - BrowseInformation="1" - BrowseInformationFile="$(IntDir)/" - WarningLevel="3" - WarnAsError="TRUE" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CallingConvention="1" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="" - GenerateDebugInformation="TRUE" - SubSystem="2" - OptimizeReferences="2" - OptimizeForWindows98="1" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Release/openttd.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs""/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1053"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" - IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="1"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - AssemblerListingLocation="$(IntDir)/" - ObjectFile="$(IntDir)/" - ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" - WarningLevel="3" - WarnAsError="TRUE" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="FALSE" - DebugInformationFormat="4" - CallingConvention="1" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" - LinkIncremental="0" - SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="LIBCMT.lib" - GenerateDebugInformation="TRUE" - SubSystem="2" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Debug/openttd.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs""/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> -!!FILES!! - <File - RelativePath=".\..\media\mainicon.ico"> - </File> - <File - RelativePath=".\..\media\openttd.ico"> - </File> - <File - RelativePath=".\..\readme.txt"> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/projects/strgen.vcproj b/projects/strgen.vcproj deleted file mode 100644 index ec0407af0..000000000 --- a/projects/strgen.vcproj +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="strgen" - RootNamespace="strgen" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Release|Win32" - OutputDirectory="..\objs\strgen\" - IntermediateDirectory="..\objs\strgen\" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - GlobalOptimizations="TRUE" - FavorSizeOrSpeed="2" - PreprocessorDefinitions="STRGEN;WIN32;NDEBUG;_CONSOLE" - BasicRuntimeChecks="0" - RuntimeLibrary="5" - PrecompiledHeaderFile="" - AssemblerOutput="2" - AssemblerListingLocation="$(IntDir)" - ObjectFile="$(IntDir)" - ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb" - WarningLevel="3" - WarnAsError="TRUE" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - OutputFile="$(IntDir)\strgen.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(IntDir)\strgen.pdb" - SubSystem="1" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Debug/strgen.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1053"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> - <File - RelativePath="..\src\strgen\strgen.cpp"> - </File> - <File - RelativePath="..\src\string.cpp"> - </File> - </Filter> - <File - RelativePath="..\src\macros.h"> - </File> - <File - RelativePath="..\src\stdafx.h"> - </File> - <File - RelativePath="..\src\string.h"> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/src/debug.cpp b/src/debug.cpp index d6104f9b0..aefa0a64b 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -59,50 +59,34 @@ struct DebugLevel { #if !defined(NO_DEBUG_MESSAGES) -/** Functionized DEBUG macro for compilers that don't support - * variadic macros (__VA_ARGS__) such as...yes MSVC2003 and lower */ -#if defined(NO_VARARG_MACRO) -void CDECL DEBUG(int name, int level, ...) -{ - va_list va; - const char *dbg; - const DebugLevel *dl = &debug_level[name]; - - if (level != 0 && *dl->level < level) return; - dbg = dl->name; - va_start(va, level); -#else void CDECL debug(const char *dbg, ...) { va_list va; va_start(va, dbg); -#endif /* NO_VARARG_MACRO */ - { - const char *s; - char buf[1024]; + const char *s; + char buf[1024]; - s = va_arg(va, const char*); - vsnprintf(buf, lengthof(buf), s, va); - va_end(va); + s = va_arg(va, const char*); + vsnprintf(buf, lengthof(buf), s, va); + va_end(va); #if defined(ENABLE_NETWORK) - if (_debug_socket != INVALID_SOCKET) { - char buf2[lengthof(buf) + 32]; + if (_debug_socket != INVALID_SOCKET) { + char buf2[lengthof(buf) + 32]; - snprintf(buf2, lengthof(buf2), "dbg: [%s] %s\n", dbg, buf); - send(_debug_socket, buf2, strlen(buf2), 0); - } else + snprintf(buf2, lengthof(buf2), "dbg: [%s] %s\n", dbg, buf); + send(_debug_socket, buf2, strlen(buf2), 0); + } else #endif /* ENABLE_NETWORK */ - { + { #if defined(WINCE) - /* We need to do OTTD2FS twice, but as it uses a static buffer, we need to store one temporary */ - TCHAR tbuf[512]; - _sntprintf(tbuf, sizeof(tbuf), _T("%s"), OTTD2FS(dbg)); - NKDbgPrintfW(_T("dbg: [%s] %s\n"), tbuf, OTTD2FS(buf)); + /* We need to do OTTD2FS twice, but as it uses a static buffer, we need to store one temporary */ + TCHAR tbuf[512]; + _sntprintf(tbuf, sizeof(tbuf), _T("%s"), OTTD2FS(dbg)); + NKDbgPrintfW(_T("dbg: [%s] %s\n"), tbuf, OTTD2FS(buf)); #else - fprintf(stderr, "dbg: [%s] %s\n", dbg, buf); + fprintf(stderr, "dbg: [%s] %s\n", dbg, buf); #endif - IConsoleDebug(dbg, buf); - } + IConsoleDebug(dbg, buf); } } #endif /* NO_DEBUG_MESSAGES */ diff --git a/src/debug.h b/src/debug.h index 4432a5666..5df7bfae8 100644 --- a/src/debug.h +++ b/src/debug.h @@ -19,44 +19,14 @@ * 6.. - extremely detailed spamming */ -/* Of course MSVC 2003 and lower has no support for variadic macros - * so we need to work around this... *sigh* */ -#if defined(_MSC_VER) && (_MSC_VER < 1400) - #define NO_VARARG_MACRO -#endif - -#if defined(NO_VARARG_MACRO) - enum DebugLevelType { - ai, - driver, - grf, - map, - misc, - ms, - net, - sprite, - oldloader, - ntp, - npf, - yapf, - freetype, - sl, - station, - }; -#endif /* NO_VARARG_MACRO */ - #ifdef NO_DEBUG_MESSAGES - #if defined(NO_VARARG_MACRO) - static inline void DEBUG(int name, int level, ...) {} - #elif defined(__GNUC__) && (__GNUC__ < 3) + #if defined(__GNUC__) && (__GNUC__ < 3) #define DEBUG(name, level, args...) #else #define DEBUG(name, level, ...) #endif #else /* NO_DEBUG_MESSAGES */ - #if defined(NO_VARARG_MACRO) - void CDECL DEBUG(int name, int level, ...); - #elif defined(__GNUC__) && (__GNUC__ < 3) + #if defined(__GNUC__) && (__GNUC__ < 3) #define DEBUG(name, level, args...) if ((level == 0) || ( _debug_ ## name ## _level >= level)) debug(#name, args) #else #define DEBUG(name, level, ...) if (level == 0 || _debug_ ## name ## _level >= level) debug(#name, __VA_ARGS__) @@ -78,9 +48,7 @@ extern int _debug_sl_level; extern int _debug_station_level; - #if !defined(NO_VARARG_MACRO) - void CDECL debug(const char *dbg, ...); - #endif /* NO_VARARG_MACRO */ + void CDECL debug(const char *dbg, ...); #endif /* NO_DEBUG_MESSAGES */ void SetDebugString(const char *s); diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 3c69e19d5..45c31a1c6 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -43,7 +43,7 @@ enum { }; /* Apparently these don't play well with enums. */ -static const OverflowSafeInt64 INVALID_DATAPOINT = INT64_MAX; // Value used for a datapoint that shouldn't be drawn. +static const OverflowSafeInt64 INVALID_DATAPOINT(INT64_MAX); // Value used for a datapoint that shouldn't be drawn. static const uint INVALID_DATAPOINT_POS = UINT_MAX; // Used to determine if the previous point was drawn. struct GraphDrawer { diff --git a/src/stdafx.h b/src/stdafx.h index 6ce5a0066..0e9a6d3c6 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -156,19 +156,17 @@ #pragma warning(disable: 4761) // integral size mismatch in argument : conversion supplied #pragma warning(disable: 4200) // nonstandard extension used : zero-sized array in struct/union - #if (_MSC_VER >= 1400) // MSVC 2005 safety checks - #pragma warning(disable: 4996) // 'strdup' was declared deprecated - #define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions - #pragma warning(disable: 6308) // code analyzer: 'realloc' might return null pointer: assigning null pointer to 't_ptr', which is passed as an argument to 'realloc', will cause the original memory block to be leaked - #pragma warning(disable: 6011) // code analyzer: Dereferencing NULL pointer 'pfGetAddrInfo': Lines: 995, 996, 998, 999, 1001 - #pragma warning(disable: 6326) // code analyzer: potential comparison of a constant with another constant - #pragma warning(disable: 6031) // code analyzer: Return value ignored: 'ReadFile' - #pragma warning(disable: 6255) // code analyzer: _alloca indicates failure by raising a stack overflow exception. Consider using _malloca instead - #pragma warning(disable: 6246) // code analyzer: Local declaration of 'statspec' hides declaration of the same name in outer scope. For additional information, see previous declaration at ... - #else /* _MSC_VER >= 1400 ( <1400 for MSVC2003) */ - #pragma warning(disable: 4288) // nonstandard extension used : 'y' : loop control variable declared in the for-loop is used outside the for-loop scope; it conflicts with the declaration in the outer scope - #pragma warning(disable: 4292) // compiler limit : terminating debug information emission for enum 'StringIdEnum' with member 'STR_801D_COAL_CAR' - #endif /* _MSC_VER >= 1400 */ + #if (_MSC_VER < 1400) // MSVC 2005 safety checks + #error "Only MSVC 2005 or higher are supported. MSVC 2003 and earlier are not!. Upgrade your compiler." + #endif /* (_MSC_VER < 1400) */ + #pragma warning(disable: 4996) // 'strdup' was declared deprecated + #define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions + #pragma warning(disable: 6308) // code analyzer: 'realloc' might return null pointer: assigning null pointer to 't_ptr', which is passed as an argument to 'realloc', will cause the original memory block to be leaked + #pragma warning(disable: 6011) // code analyzer: Dereferencing NULL pointer 'pfGetAddrInfo': Lines: 995, 996, 998, 999, 1001 + #pragma warning(disable: 6326) // code analyzer: potential comparison of a constant with another constant + #pragma warning(disable: 6031) // code analyzer: Return value ignored: 'ReadFile' + #pragma warning(disable: 6255) // code analyzer: _alloca indicates failure by raising a stack overflow exception. Consider using _malloca instead + #pragma warning(disable: 6246) // code analyzer: Local declaration of 'statspec' hides declaration of the same name in outer scope. For additional information, see previous declaration at ... #include <malloc.h> // alloca() #define NORETURN __declspec(noreturn) |