From 17871cc1006e39afda8ce6a0ace4231fea42320b Mon Sep 17 00:00:00 2001 From: eathenabot Date: Sat, 12 May 2012 20:31:55 +0000 Subject: * Merged changes up to eAthena 15096. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16106 54d463be-8e91-2dee-dedb-b68131a5f0ec --- vcproj-9/char-server_sql.vcproj | 8 ++++---- vcproj-9/login-server_sql.vcproj | 8 ++++---- vcproj-9/map-server_sql.vcproj | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'vcproj-9') diff --git a/vcproj-9/char-server_sql.vcproj b/vcproj-9/char-server_sql.vcproj index 3e6e85558..0ea3e9c27 100644 --- a/vcproj-9/char-server_sql.vcproj +++ b/vcproj-9/char-server_sql.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\old\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST" GeneratePreprocessedFile="0" ExceptionHandling="0" @@ -71,7 +71,7 @@ AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib" OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="2" - AdditionalLibraryDirectories="..\3rdparty\mysql\lib" + AdditionalLibraryDirectories="..\3rdparty\mysql\old\lib" IgnoreAllDefaultLibraries="true" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" @@ -137,7 +137,7 @@ OmitFramePointers="true" EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\old\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST" StringPooling="true" RuntimeLibrary="0" @@ -162,7 +162,7 @@ AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib" OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories="..\3rdparty\mysql\lib" + AdditionalLibraryDirectories="..\3rdparty\mysql\old\lib" IgnoreAllDefaultLibraries="true" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" diff --git a/vcproj-9/login-server_sql.vcproj b/vcproj-9/login-server_sql.vcproj index 2cf3c6e6c..3799fda05 100644 --- a/vcproj-9/login-server_sql.vcproj +++ b/vcproj-9/login-server_sql.vcproj @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\old\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;WITH_SQL" GeneratePreprocessedFile="0" ExceptionHandling="0" @@ -71,7 +71,7 @@ AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib" OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="2" - AdditionalLibraryDirectories="..\3rdparty\mysql\lib" + AdditionalLibraryDirectories="..\3rdparty\mysql\old\lib" IgnoreAllDefaultLibraries="true" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" @@ -137,7 +137,7 @@ OmitFramePointers="true" EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\old\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;WITH_SQL" StringPooling="true" RuntimeLibrary="0" @@ -164,7 +164,7 @@ AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib" OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories="..\3rdparty\mysql\lib" + AdditionalLibraryDirectories="..\3rdparty\mysql\old\lib" IgnoreAllDefaultLibraries="true" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj index a9f2b4fba..3cf1c0ff5 100644 --- a/vcproj-9/map-server_sql.vcproj +++ b/vcproj-9/map-server_sql.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\old\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST" GeneratePreprocessedFile="0" ExceptionHandling="0" @@ -70,7 +70,7 @@ AdditionalDependencies="libcmtd.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib pcre.lib" OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="2" - AdditionalLibraryDirectories="..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib" + AdditionalLibraryDirectories="..\3rdparty\mysql\old\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib" IgnoreAllDefaultLibraries="true" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" @@ -136,7 +136,7 @@ OmitFramePointers="true" EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\old\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST" StringPooling="true" RuntimeLibrary="0" @@ -161,7 +161,7 @@ AdditionalDependencies="libcmt.lib oldnames.lib ws2_32.lib libmysql.lib zdll.lib pcre.lib" OutputFile="$(OutDir)\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories="..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib" + AdditionalLibraryDirectories="..\3rdparty\mysql\old\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib" IgnoreAllDefaultLibraries="true" IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" -- cgit v1.2.3-60-g2f50