Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r14136) -Fix(r14135): MSVC project was not supposed to be on previous commit

Browse Source
replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
belugas 16 years ago
parent 7dc212edeb
commit e89e6b1361
1 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File

112
projects/openttd_vs80.vcproj
Unescape Escape View File

@ -132,15 +132,14 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Debug|Win32"
OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
@ -159,39 +158,25 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3" TypeLibraryName=".\Debug/openttd.tlb"
TypeLibraryName=".\Release/openttd.tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="3" Optimization="0"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs" 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=\&quot;OpenTTD\&quot;;WITH_ASSERT" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
StringPooling="true" BasicRuntimeChecks="3"
ExceptionHandling="1" RuntimeLibrary="1"
RuntimeLibrary="0"
StructMemberAlignment="0"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
DefaultCharIsUnsigned="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
AssemblerOutput="2"
AssemblerListingLocation="$(IntDir)/" AssemblerListingLocation="$(IntDir)/"
ObjectFile="$(IntDir)/" ObjectFile="$(IntDir)/"
ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
BrowseInformation="1"
BrowseInformationFile="$(IntDir)/"
WarningLevel="3" WarningLevel="3"
WarnAsError="false" WarnAsError="false"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
CallingConvention="1" CallingConvention="1"
CompileAs="0" CompileAs="0"
/> />
@ -200,7 +185,7 @@
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG" PreprocessorDefinitions="_DEBUG"
Culture="1053" Culture="1053"
/> />
<Tool <Tool
@ -209,14 +194,12 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
LinkIncremental="1" LinkIncremental="0"
SuppressStartupBanner="true" SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="" IgnoreDefaultLibraryNames="LIBCMT.lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" TargetMachine="1"
OptimizeForWindows98="1"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -244,14 +227,15 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="Release|x64"
OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
@ -270,25 +254,39 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\Debug/openttd.tlb" TargetEnvironment="3"
TypeLibraryName=".\Release/openttd.tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="3"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs" AdditionalIncludeDirectories="..\objs\langs"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
BasicRuntimeChecks="3" StringPooling="true"
RuntimeLibrary="1" ExceptionHandling="1"
RuntimeLibrary="0"
StructMemberAlignment="0"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
DefaultCharIsUnsigned="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
PrecompiledHeaderFile=""
AssemblerOutput="2"
AssemblerListingLocation="$(IntDir)/" AssemblerListingLocation="$(IntDir)/"
ObjectFile="$(IntDir)/" ObjectFile="$(IntDir)/"
ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
BrowseInformation="1"
BrowseInformationFile="$(IntDir)/"
WarningLevel="3" WarningLevel="3"
WarnAsError="false" WarnAsError="false"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false" DebugInformationFormat="3"
DebugInformationFormat="4"
CallingConvention="1" CallingConvention="1"
CompileAs="0" CompileAs="0"
/> />
@ -297,7 +295,7 @@
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG" PreprocessorDefinitions="NDEBUG"
Culture="1053" Culture="1053"
/> />
<Tool <Tool
@ -306,12 +304,14 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib" AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
LinkIncremental="0" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="LIBCMT.lib;LIBC.lib" IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
TargetMachine="1" OptimizeReferences="2"
OptimizeForWindows98="1"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
@ -539,10 +539,6 @@
RelativePath=".\..\src\engine.cpp" RelativePath=".\..\src\engine.cpp"
> >
</File> </File>
<File
RelativePath=".\..\src\fiber_win32.cpp"
>
</File>
<File <File
RelativePath=".\..\src\fileio.cpp" RelativePath=".\..\src\fileio.cpp"
> >
@ -739,6 +735,10 @@
RelativePath=".\..\src\thread_win32.cpp" RelativePath=".\..\src\thread_win32.cpp"
> >
</File> </File>
<File
RelativePath=".\..\src\fiber_win32.cpp"
>
</File>
<File <File
RelativePath=".\..\src\tile_map.cpp" RelativePath=".\..\src\tile_map.cpp"
> >
@ -2624,20 +2624,20 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Debug|Win32"
ExcludedFromBuild="true"
> >
<Tool <Tool
Name="MASM AMD64" Name="VCCustomBuildTool"
PreserveIdentifierCase="true"
PreservePublicAndExternSymbolCase="true"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Release|x64"
ExcludedFromBuild="true"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="MASM AMD64"
PreserveIdentifierCase="true"
PreservePublicAndExternSymbolCase="true"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration

Write Preview
Loading…
Cancel
Save