From ba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 26 May 2008 12:16:53 +0000
Subject: Moved the options to disable specific compiler warnings from the
 generic 'AdditionalOptions' to the appropriate 'DisableSpecificWarnings'
 section. Corrected an ancient mistake in the grfio/zlib code (calling
 inflateEnd in case of an error during the Deflate process).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12726 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 vcproj-9/map-server_txt.vcproj | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'vcproj-9/map-server_txt.vcproj')

diff --git a/vcproj-9/map-server_txt.vcproj b/vcproj-9/map-server_txt.vcproj
index 61a985d5f..5b3872dc0 100644
--- a/vcproj-9/map-server_txt.vcproj
+++ b/vcproj-9/map-server_txt.vcproj
@@ -40,7 +40,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100&#x0D;&#x0A;/wd4800"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\src\common;..\src\zlib"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
@@ -55,6 +54,7 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 				CompileAs="1"
+				DisableSpecificWarnings="4018;4100;4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -127,7 +127,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100&#x0D;&#x0A;/wd4800"
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
@@ -145,6 +144,7 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4018;4100;4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -377,6 +377,14 @@
 				RelativePath="..\src\map\pet.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\map\quest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\map\quest.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\map\script.c"
 				>
@@ -433,14 +441,6 @@
 				RelativePath="..\src\map\vending.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\map\quest.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\map\quest.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="zlib"
-- 
cgit v1.2.3-70-g09d2