removed .rej

--HG-- branch : openttd
2015-03-21 16:06:46 +03:00
parent d0b474b3e4
commit c7259e13c2
1 changed files with 0 additions and 48 deletions
--- a/projects/openttd_vs90.vcproj.rej
+++ b/projects/openttd_vs90.vcproj.rej
@@ -1,48 +0,0 @@
--- projects/openttd_vs90.vcproj	(revision 26379)
-+++ projects/openttd_vs90.vcproj	(working copy)
-@@ -255,38 +268,26 @@
- 			/>
- 			<Tool
- 				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release/openttd.tlb"
-+				TypeLibraryName=".\Debug/openttd.tlb"
- 				HeaderFileName=""
- 			/>
- 			<Tool
- 				Name="VCCLCompilerTool"
- 				AdditionalOptions="/MP"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-+				Optimization="0"
- 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				DefaultCharIsUnsigned="true"
-+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
-+				BasicRuntimeChecks="3"
-+				RuntimeLibrary="1"
- 				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough=""
-				PrecompiledHeaderFile=""
-				AssemblerOutput="2"
- 				AssemblerListingLocation="$(IntDir)/"
- 				ObjectFile="$(IntDir)/"
- 				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
- 				WarningLevel="3"
- 				WarnAsError="false"
- 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-+				Detect64BitPortabilityProblems="false"
-+				DebugInformationFormat="4"
- 				CallingConvention="1"
- 				CompileAs="0"
- 			/>