diff options
| author | Xanadu <none@none> | 2010-06-23 01:47:41 +0200 |
|---|---|---|
| committer | Xanadu <none@none> | 2010-06-23 01:47:41 +0200 |
| commit | ffaffe3fd753b0afc75679c9730276871a9d034a (patch) | |
| tree | f51f59797532a307b6f8f426fd22e593c4418070 /externals/ace | |
| parent | 27062ffd6173b0ea1181353eeade6935e355e351 (diff) | |
* Renamed several VS projects and the executables they produce to reflect the new naming convention.
* Cleaned up some useless and redundant preprocessor definitions.
* Fixed the win build so that it correctly uses the mysql lib it built from the sources.
* Note that you still need to use 8615_mysql_openssl_libs.zip for the OpenSSL binaries.
* Also note that Win x64 build from the existing VS files is still fubar (mysql lib...).
--HG--
branch : trunk
Diffstat (limited to 'externals/ace')
| -rw-r--r-- | externals/ace/win/VC90/ace.vcproj | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/externals/ace/win/VC90/ace.vcproj b/externals/ace/win/VC90/ace.vcproj index f54385fbd7a..39b0872d0a4 100644 --- a/externals/ace/win/VC90/ace.vcproj +++ b/externals/ace/win/VC90/ace.vcproj @@ -52,7 +52,7 @@ AdditionalOptions="/MP /wd 4748 /wd 4244" Optimization="0" AdditionalIncludeDirectories="..\..\..\;" - PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="ACE_BUILD_DLL;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -143,7 +143,7 @@ AdditionalOptions="/MP /wd 4748 /wd 4244" Optimization="0" AdditionalIncludeDirectories="..\..\..\;" - PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="ACE_BUILD_DLL;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -235,13 +235,14 @@ AdditionalOptions="/MP /wd 4748 /wd 4244" Optimization="2" AdditionalIncludeDirectories="..\..\..\;" - PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0" + PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE" RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="WinAcePCH.h" WarningLevel="3" Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" DisableSpecificWarnings="4355" ForcedIncludeFiles="WinAcePCH.h" /> @@ -325,7 +326,7 @@ AdditionalOptions="/MP /wd 4748 /wd 4244" Optimization="2" AdditionalIncludeDirectories="..\..\..\;" - PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SECURE_SCL=0" + PreprocessorDefinitions="ACE_BUILD_DLL;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE" RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" @@ -481,7 +482,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Debug|x64" > <Tool Name="VCCLCompilerTool" @@ -489,7 +490,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -1285,7 +1286,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Debug|x64" > <Tool Name="VCCLCompilerTool" @@ -1293,7 +1294,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" |