diff options
| author | kent@kent-amd64.(none) <> | 2007-03-20 17:58:30 +0100 |
|---|---|---|
| committer | kent@kent-amd64.(none) <> | 2007-03-20 17:58:30 +0100 |
| commit | a149769b2da4145ef12d6f3d57bb27dd6fa274e8 (patch) | |
| tree | 8163c1306e6b7ceebe77cc93d6b8777df71fa9a6 /server-tools | |
| parent | a947708760a572e44584b929991d6caded82dee7 (diff) | |
| parent | aab816e7796a54f683df18498e14e7fe4832b742 (diff) | |
| download | mariadb-git-a149769b2da4145ef12d6f3d57bb27dd6fa274e8.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/mysqlmanager.vcproj | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/server-tools/instance-manager/mysqlmanager.vcproj b/server-tools/instance-manager/mysqlmanager.vcproj index d835e242eb1..a38565fc1f3 100644 --- a/server-tools/instance-manager/mysqlmanager.vcproj +++ b/server-tools/instance-manager/mysqlmanager.vcproj @@ -12,13 +12,14 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="../../client_debug" - IntermediateDirectory="Debug" + OutputDirectory=".\debug_obj" + IntermediateDirectory=".\debug_obj" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" + OptimizeForProcessor="2" AdditionalIncludeDirectories="..\..\include,../../extra/yassl/include" PreprocessorDefinitions="MYSQL_INSTANCE_MANAGER;MYSQL_SERVER;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;CONSOLE" MinimalRebuild="TRUE" @@ -34,10 +35,12 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="wsock32.lib" - OutputFile="../../client_debug/mysqlmanager.exe" - LinkIncremental="2" + OutputFile=".\debug/mysqlmanager.exe" + LinkIncremental="1" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="../../client_debug/mysqlmanager.pdb" + ProgramDatabaseFile=".\debug/mysqlmanager.pdb" + GenerateMapFile="TRUE" + MapFileName=".\debug/mysqlmanager.map" SubSystem="1" TargetMachine="1"/> <Tool @@ -63,12 +66,15 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="../../client_release" - IntermediateDirectory="Release" + OutputDirectory=".\release_obj" + IntermediateDirectory=".\release_obj" ConfigurationType="1" CharacterSet="2"> <Tool Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + OptimizeForProcessor="2" AdditionalIncludeDirectories="..\..\include,../../extra/yassl/include" PreprocessorDefinitions="MYSQL_INSTANCE_MANAGER;MYSQL_SERVER;_WINDOWS;CONSOLE" ExceptionHandling="FALSE" @@ -82,9 +88,12 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="wsock32.lib" - OutputFile="../../client_release/mysqlmanager.exe" + OutputFile=".\release/mysqlmanager.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" + ProgramDatabaseFile=".\release/mysqlmanager.pdb" + GenerateMapFile="TRUE" + MapFileName=".\release/mysqlmanager.map" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" |