diff options
| -rwxr-xr-x | projects/generate | 2 | ||||
| -rw-r--r-- | projects/openttd_vs80.vcproj | 104 | ||||
| -rw-r--r-- | projects/openttd_vs80.vcproj.in | 104 |
3 files changed, 105 insertions, 105 deletions
diff --git a/projects/generate b/projects/generate index bc3b61395..39228259e 100755 --- a/projects/generate +++ b/projects/generate @@ -18,7 +18,7 @@ fi # openttd_vs80.sln is for MSVC 2005 # openttd_vs80.vcproj is for MSVC 2005 # langs_vs80.vcproj is for MSVC 2005 -# strgen_vs80.vcprojc is vor MSVC 2005 +# strgen_vs80.vcproj is for MSVC 2005 # openttd.sln is for MSVC 2003 # openttd.vcproj is for MSVC 2003 diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index f4e9bf89c..07ec91eea 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -134,15 +134,14 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -163,39 +162,25 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" - TypeLibraryName=".\Release/openttd.tlb" + TypeLibraryName=".\Debug/openttd.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="2" - OmitFramePointers="true" + Optimization="0" 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="1" - RuntimeLibrary="0" - StructMemberAlignment="0" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="true" - DefaultCharIsUnsigned="true" + 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" - PrecompiledHeaderThrough="" - PrecompiledHeaderFile="" - AssemblerOutput="2" AssemblerListingLocation="$(IntDir)/" ObjectFile="$(IntDir)/" ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" - BrowseInformation="1" - BrowseInformationFile="$(IntDir)/" WarningLevel="3" WarnAsError="false" SuppressStartupBanner="true" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" CallingConvention="1" CompileAs="0" /> @@ -204,7 +189,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1053" /> <Tool @@ -213,14 +198,12 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" - LinkIncremental="1" + LinkIncremental="0" SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="" + IgnoreDefaultLibraryNames="LIBCMT.lib" GenerateDebugInformation="true" SubSystem="2" - OptimizeReferences="2" - OptimizeForWindows98="1" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -248,14 +231,15 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" - IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + Name="Release|x64" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -276,25 +260,39 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Debug/openttd.tlb" + TargetEnvironment="3" + TypeLibraryName=".\Release/openttd.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="2" + OmitFramePointers="true" 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" + 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="1" + RuntimeLibrary="0" + StructMemberAlignment="0" + 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="false" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" + DebugInformationFormat="3" CallingConvention="1" CompileAs="0" /> @@ -303,7 +301,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1053" /> <Tool @@ -312,12 +310,14 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" - LinkIncremental="0" + LinkIncremental="1" SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="LIBCMT.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" SubSystem="2" - TargetMachine="1" + OptimizeReferences="2" + OptimizeForWindows98="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -2064,20 +2064,20 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool - Name="MASM AMD64" - PreserveIdentifierCase="true" - PreservePublicAndExternSymbolCase="true" + Name="VCCustomBuildTool" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" + Name="Release|x64" > <Tool - Name="VCCustomBuildTool" + Name="MASM AMD64" + PreserveIdentifierCase="true" + PreservePublicAndExternSymbolCase="true" /> </FileConfiguration> <FileConfiguration diff --git a/projects/openttd_vs80.vcproj.in b/projects/openttd_vs80.vcproj.in index d62c02d3f..52b9e409b 100644 --- a/projects/openttd_vs80.vcproj.in +++ b/projects/openttd_vs80.vcproj.in @@ -134,15 +134,14 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -163,39 +162,25 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" - TypeLibraryName=".\Release/openttd.tlb" + TypeLibraryName=".\Debug/openttd.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" - EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="2" - OmitFramePointers="true" + Optimization="0" 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="1" - RuntimeLibrary="0" - StructMemberAlignment="0" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="true" - DefaultCharIsUnsigned="true" + 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" - PrecompiledHeaderThrough="" - PrecompiledHeaderFile="" - AssemblerOutput="2" AssemblerListingLocation="$(IntDir)/" ObjectFile="$(IntDir)/" ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" - BrowseInformation="1" - BrowseInformationFile="$(IntDir)/" WarningLevel="3" WarnAsError="false" SuppressStartupBanner="true" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" CallingConvention="1" CompileAs="0" /> @@ -204,7 +189,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1053" /> <Tool @@ -213,14 +198,12 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" - LinkIncremental="1" + LinkIncremental="0" SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="" + IgnoreDefaultLibraryNames="LIBCMT.lib" GenerateDebugInformation="true" SubSystem="2" - OptimizeReferences="2" - OptimizeForWindows98="1" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -248,14 +231,15 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" - IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + Name="Release|x64" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -276,25 +260,39 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Debug/openttd.tlb" + TargetEnvironment="3" + TypeLibraryName=".\Release/openttd.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="2" + OmitFramePointers="true" 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" + 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="1" + RuntimeLibrary="0" + StructMemberAlignment="0" + 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="false" SuppressStartupBanner="true" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" + DebugInformationFormat="3" CallingConvention="1" CompileAs="0" /> @@ -303,7 +301,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1053" /> <Tool @@ -312,12 +310,14 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" - LinkIncremental="0" + LinkIncremental="1" SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="LIBCMT.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" SubSystem="2" - TargetMachine="1" + OptimizeReferences="2" + OptimizeForWindows98="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -465,20 +465,20 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool - Name="MASM AMD64" - PreserveIdentifierCase="true" - PreservePublicAndExternSymbolCase="true" + Name="VCCustomBuildTool" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" + Name="Release|x64" > <Tool - Name="VCCustomBuildTool" + Name="MASM AMD64" + PreserveIdentifierCase="true" + PreservePublicAndExternSymbolCase="true" /> </FileConfiguration> <FileConfiguration |