diff options
| author | Xanadu <none@none> | 2010-06-16 06:36:35 +0200 |
|---|---|---|
| committer | Xanadu <none@none> | 2010-06-16 06:36:35 +0200 |
| commit | ec63820f56fe40d47c6ee3343c50dc50d2dac616 (patch) | |
| tree | 3c54546cfeed0c81e876c4520e40bee1b4ba1127 /src/tools/map_extractor | |
| parent | 5d7bed7222ae2505c05ed6f5c97f0639f2e2999f (diff) | |
* Fixed extraction tools windows compile and core windows compile for 32-bit targets. This should do until sufficiently good project files can be generated using cmake.
* Windows users need to download 8615_mysql_openssl_libs.zip from the project download page and unpack it to /externals.
--HG--
branch : trunk
Diffstat (limited to 'src/tools/map_extractor')
| -rw-r--r-- | src/tools/map_extractor/VC90/VC90_ad.vcproj | 57 |
1 files changed, 31 insertions, 26 deletions
diff --git a/src/tools/map_extractor/VC90/VC90_ad.vcproj b/src/tools/map_extractor/VC90/VC90_ad.vcproj index 83480dd3912..e875137556c 100644 --- a/src/tools/map_extractor/VC90/VC90_ad.vcproj +++ b/src/tools/map_extractor/VC90/VC90_ad.vcproj @@ -17,8 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\ad__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\ad__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -49,12 +49,14 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE" + MinimalRebuild="false" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" PrecompiledHeaderFile="$(IntDir)\ad.pch" - AssemblerListingLocation="$(IntDir)\" + AssemblerListingLocation="" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" XMLDocumentationFileName="$(IntDir)\" @@ -62,7 +64,7 @@ BrowseInformationFile="" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -77,14 +79,13 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="bzip2.lib libmpq.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ad_debug.exe" - LinkIncremental="1" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe" + LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\..\..\externals\bzip2\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\libmpq\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" - IgnoreDefaultLibraryNames="LIBCD.lib;LIBCMTD.lib;MSVCRT.lib" + AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\ad.pdb" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" @@ -115,8 +116,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)\" - IntermediateDirectory="$(PlatformName)_$(ConfigurationName)\" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -145,16 +146,19 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="1" + Optimization="2" + InlineFunctionExpansion="0" AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - RuntimeLibrary="0" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" - PrecompiledHeaderFile="$(IntDir)\ad.pch" - AssemblerListingLocation="$(IntDir)\" + PrecompiledHeaderFile="" + AssemblerListingLocation="" ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc90.pdb" XMLDocumentationFileName="$(IntDir)\" BrowseInformation="0" WarningLevel="3" @@ -173,15 +177,16 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="bzip2.lib libmpq.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ad.exe" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\..\..\externals\bzip2\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\libmpq\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" - IgnoreDefaultLibraryNames="LIBCD.lib;LIBCMTD.lib;MSVCRT.lib" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\ad.pdb" + AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="false" + ProgramDatabaseFile="" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" TargetMachine="1" |