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/libmpq/win | |
| 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/libmpq/win')
| -rw-r--r-- | externals/libmpq/win/VC90/libmpq.vcproj | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/externals/libmpq/win/VC90/libmpq.vcproj b/externals/libmpq/win/VC90/libmpq.vcproj index 13ce6289775..83947857137 100644 --- a/externals/libmpq/win/VC90/libmpq.vcproj +++ b/externals/libmpq/win/VC90/libmpq.vcproj @@ -17,8 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory="..\bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" > @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\;..\..\..\bzip2;..\..\..\zlib" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -49,6 +49,7 @@ WarningLevel="3" DebugInformationFormat="3" CompileAs="1" + DisableSpecificWarnings="4103;4244;4018" /> <Tool Name="VCManagedResourceCompilerTool" @@ -61,7 +62,7 @@ /> <Tool Name="VCLibrarianTool" - LinkLibraryDependencies="true" + LinkLibraryDependencies="false" AdditionalLibraryDirectories="" /> <Tool @@ -82,8 +83,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory="..\bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="0" @@ -109,14 +110,15 @@ EnableIntrinsicFunctions="false" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\;..\..\..\bzip2;..\..\..\zlib" - PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;_NDEBUG" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="1" WarningLevel="3" - DebugInformationFormat="0" + DebugInformationFormat="3" CompileAs="1" + DisableSpecificWarnings="4103;4244;4018" /> <Tool Name="VCManagedResourceCompilerTool" @@ -129,7 +131,7 @@ /> <Tool Name="VCLibrarianTool" - LinkLibraryDependencies="true" + LinkLibraryDependencies="false" AdditionalLibraryDirectories="" /> <Tool |