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/bzip2 | |
| 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/bzip2')
| -rw-r--r-- | externals/bzip2/win/VC90/bzip2.vcproj | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/externals/bzip2/win/VC90/bzip2.vcproj b/externals/bzip2/win/VC90/bzip2.vcproj index de4ca649e37..98b3a33d9b1 100644 --- a/externals/bzip2/win/VC90/bzip2.vcproj +++ b/externals/bzip2/win/VC90/bzip2.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" > @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -84,8 +84,8 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" > @@ -148,8 +148,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="0" @@ -175,14 +175,14 @@ EnableIntrinsicFunctions="false" WholeProgramOptimization="false" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="0" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -214,8 +214,8 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1" |