diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-05-26 12:16:53 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-05-26 12:16:53 +0000 |
| commit | ba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b (patch) | |
| tree | d4cc5fb3896996bb805e192efd5fb40ec41a4cfc /vcproj-9 | |
| parent | 80ce7898584ef58f01470fc8969bddfca47a2629 (diff) | |
| download | hercules-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')
| -rw-r--r-- | vcproj-9/char-server_sql.vcproj | 4 | ||||
| -rw-r--r-- | vcproj-9/char-server_txt.vcproj | 4 | ||||
| -rw-r--r-- | vcproj-9/login-server_sql.vcproj | 4 | ||||
| -rw-r--r-- | vcproj-9/login-server_txt.vcproj | 4 | ||||
| -rw-r--r-- | vcproj-9/map-server_sql.vcproj | 4 | ||||
| -rw-r--r-- | vcproj-9/map-server_txt.vcproj | 20 |
6 files changed, 20 insertions, 20 deletions
diff --git a/vcproj-9/char-server_sql.vcproj b/vcproj-9/char-server_sql.vcproj index 6b97f59e7..2e42ab8b5 100644 --- a/vcproj-9/char-server_sql.vcproj +++ b/vcproj-9/char-server_sql.vcproj @@ -41,7 +41,6 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4800" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_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" @@ -129,7 +129,6 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4800" Optimization="2" InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" @@ -146,6 +145,7 @@ WarningLevel="3" DebugInformationFormat="3" CompileAs="1" + DisableSpecificWarnings="4800" /> <Tool Name="VCManagedResourceCompilerTool" 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" diff --git a/vcproj-9/login-server_sql.vcproj b/vcproj-9/login-server_sql.vcproj index 693216f22..80cbd73c5 100644 --- a/vcproj-9/login-server_sql.vcproj +++ b/vcproj-9/login-server_sql.vcproj @@ -41,7 +41,6 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4800" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_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="4100;4800" /> <Tool Name="VCManagedResourceCompilerTool" @@ -129,7 +129,6 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4800" Optimization="2" InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" @@ -148,6 +147,7 @@ WarningLevel="3" DebugInformationFormat="3" CompileAs="1" + DisableSpecificWarnings="4100;4800" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/vcproj-9/login-server_txt.vcproj b/vcproj-9/login-server_txt.vcproj index 1b5a61613..78cc1d041 100644 --- a/vcproj-9/login-server_txt.vcproj +++ b/vcproj-9/login-server_txt.vcproj @@ -40,7 +40,6 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4100
/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" @@ -55,6 +54,7 @@ WarningLevel="3" DebugInformationFormat="4" CompileAs="1" + DisableSpecificWarnings="4100;4800" /> <Tool Name="VCManagedResourceCompilerTool" @@ -127,7 +127,6 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4800" Optimization="2" InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" @@ -144,6 +143,7 @@ WarningLevel="3" DebugInformationFormat="3" CompileAs="1" + DisableSpecificWarnings="4100;4800" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj index 15e1527b6..19f4d57e8 100644 --- a/vcproj-9/map-server_sql.vcproj +++ b/vcproj-9/map-server_sql.vcproj @@ -40,7 +40,6 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4018
/wd4100
/wd4800" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;MAPREGSQL;_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" @@ -128,7 +128,6 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4018
/wd4100
/wd4800" Optimization="2" InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" @@ -145,6 +144,7 @@ WarningLevel="3" DebugInformationFormat="3" CompileAs="1" + DisableSpecificWarnings="4018;4100;4800" /> <Tool Name="VCManagedResourceCompilerTool" 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
/wd4100
/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
/wd4100
/wd4800" Optimization="2" InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" @@ -145,6 +144,7 @@ WarningLevel="3" DebugInformationFormat="3" CompileAs="1" + DisableSpecificWarnings="4018;4100;4800" /> <Tool Name="VCManagedResourceCompilerTool" @@ -378,6 +378,14 @@ > </File> <File + RelativePath="..\src\map\quest.c" + > + </File> + <File + RelativePath="..\src\map\quest.h" + > + </File> + <File RelativePath="..\src\map\script.c" > </File> @@ -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" |