summaryrefslogtreecommitdiff
path: root/vcproj-9/char-server_txt.vcproj
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-05-26 12:16:53 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-05-26 12:16:53 +0000
commitba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b (patch)
treed4cc5fb3896996bb805e192efd5fb40ec41a4cfc /vcproj-9/char-server_txt.vcproj
parent80ce7898584ef58f01470fc8969bddfca47a2629 (diff)
downloadhercules-ba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b.tar.gz
hercules-ba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b.tar.bz2
hercules-ba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b.tar.xz
hercules-ba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b.zip
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
Diffstat (limited to 'vcproj-9/char-server_txt.vcproj')
-rw-r--r--vcproj-9/char-server_txt.vcproj4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcproj-9/char-server_txt.vcproj b/vcproj-9/char-server_txt.vcproj
index cf909c7c0..d4f212564 100644
--- a/vcproj-9/char-server_txt.vcproj
+++ b/vcproj-9/char-server_txt.vcproj
@@ -41,7 +41,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4800"
Optimization="0"
AdditionalIncludeDirectories="..\src\common;..\src\zlib"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
@@ -56,6 +55,7 @@
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="1"
+ DisableSpecificWarnings="4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -128,7 +128,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4800"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
@@ -145,6 +144,7 @@
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="1"
+ DisableSpecificWarnings="4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"