diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-03-12 20:55:34 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-03-12 20:55:34 +0000 |
| commit | b2c842c1b7361bc9754a9883e82ae360093f11a8 (patch) | |
| tree | a1d8d7f84ac53c5857ad964ad500e69704f669e5 /qpid/cpp/src/common.vcproj | |
| parent | 6a644249ba25e38dfa6852dac3377e62aa7386df (diff) | |
| download | qpid-python-b2c842c1b7361bc9754a9883e82ae360093f11a8.tar.gz | |
Changes to build DLLs instead of static libs on Windows; primarily added decorators to exported names. Fixes QPID-1673
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@753014 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/common.vcproj')
| -rw-r--r-- | qpid/cpp/src/common.vcproj | 100 |
1 files changed, 71 insertions, 29 deletions
diff --git a/qpid/cpp/src/common.vcproj b/qpid/cpp/src/common.vcproj index 931afdec36..5ab2dbafde 100644 --- a/qpid/cpp/src/common.vcproj +++ b/qpid/cpp/src/common.vcproj @@ -24,7 +24,7 @@ ProjectType="Visual C++"
Version="9.00"
Name="common"
- ProjectGUID="{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}"
+ ProjectGUID="{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}"
RootNamespace="common"
Keyword="Win32Proj"
SignManifests="true"
@@ -43,8 +43,8 @@ <Configuration
Name="Debug|Win32"
OutputDirectory="."
- IntermediateDirectory="Static_Debug\common\I386"
- ConfigurationType="4"
+ IntermediateDirectory="Debug\common\I386"
+ ConfigurationType="2"
CharacterSet="0"
>
@@ -73,10 +73,10 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+ PreprocessorDefinitions="COMMON_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"
MinimalRebuild="false"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
RuntimeTypeInfo="true"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
@@ -88,7 +88,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+ PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"
Culture="1033"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
@@ -96,8 +96,16 @@ Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
- OutputFile=".\qpidcommonsd.lib"
+ Name="VCLinkerTool"
+ AdditionalDependencies=" ws2_32.lib rpcrt4.lib"
+ OutputFile="$(OutDir)\qpidcommond.dll"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ ImportLibrary=".\qpidcommond.lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -113,13 +121,14 @@ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid mkdir deploy\include\qpid
@if not exist deploy\include\qpid\amqp_0_10 mkdir deploy\include\qpid\amqp_0_10
@if not exist deploy\include\qpid\framing mkdir deploy\include\qpid\framing
@if not exist deploy\include\qpid\sys\windows mkdir deploy\include\qpid\sys\windows
@if not exist deploy\include\qpid\log\windows mkdir deploy\include\qpid\log\windows
@if not exist deploy\include\qpid\management mkdir deploy\include\qpid\management
@if not exist deploy\lib mkdir deploy\lib

@copy /Y qpid\*.h deploy\include\qpid\
@copy /Y qpid\amqp_0_10\*.h deploy\include\qpid\amqp_0_10\
@copy /Y qpid\framing\*.h deploy\include\qpid\framing\
@copy /Y qpid\sys\*.h deploy\include\qpid\sys\
@copy /Y qpid\sys\windows\*.h deploy\include\qpid\sys\windows\
@copy /Y qpid\log\*.h deploy\include\qpid\log\
@copy /Y qpid\log\windows\*.h deploy\include\qpid\log\windows\
@copy /Y qpid\management\*.h deploy\include\qpid\management\

@copy /Y $(OutDir)\qpidcommond.dll deploy\lib\
@copy /Y .\qpidcommond.lib deploy\lib\
"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="."
- IntermediateDirectory="Static_Release\common\I386"
- ConfigurationType="4"
+ IntermediateDirectory="Release\common\I386"
+ ConfigurationType="2"
CharacterSet="0"
>
@@ -148,8 +157,8 @@ Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="COMMON_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"
+ RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
@@ -160,7 +169,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+ PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"
Culture="1033"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
@@ -168,8 +177,18 @@ Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
- OutputFile=".\qpidcommons.lib"
+ Name="VCLinkerTool"
+ AdditionalDependencies=" ws2_32.lib rpcrt4.lib"
+ OutputFile="$(OutDir)\qpidcommon.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary=".\qpidcommon.lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -185,13 +204,14 @@ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid mkdir deploy\include\qpid
@if not exist deploy\include\qpid\amqp_0_10 mkdir deploy\include\qpid\amqp_0_10
@if not exist deploy\include\qpid\framing mkdir deploy\include\qpid\framing
@if not exist deploy\include\qpid\sys\windows mkdir deploy\include\qpid\sys\windows
@if not exist deploy\include\qpid\log\windows mkdir deploy\include\qpid\log\windows
@if not exist deploy\include\qpid\management mkdir deploy\include\qpid\management
@if not exist deploy\lib mkdir deploy\lib

@copy /Y qpid\*.h deploy\include\qpid\
@copy /Y qpid\amqp_0_10\*.h deploy\include\qpid\amqp_0_10\
@copy /Y qpid\framing\*.h deploy\include\qpid\framing\
@copy /Y qpid\sys\*.h deploy\include\qpid\sys\
@copy /Y qpid\sys\windows\*.h deploy\include\qpid\sys\windows\
@copy /Y qpid\log\*.h deploy\include\qpid\log\
@copy /Y qpid\log\windows\*.h deploy\include\qpid\log\windows\
@copy /Y qpid\management\*.h deploy\include\qpid\management\

@copy /Y $(OutDir)\qpidcommon.dll deploy\lib\
@copy /Y .\qpidcommon.lib deploy\lib\
"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="."
- IntermediateDirectory="Static_Debug\common\AMD64"
- ConfigurationType="4"
+ IntermediateDirectory="Debug\common\AMD64"
+ ConfigurationType="2"
CharacterSet="0"
>
@@ -220,10 +240,10 @@ Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+ PreprocessorDefinitions="COMMON_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"
MinimalRebuild="false"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
RuntimeTypeInfo="true"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
@@ -235,7 +255,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_WIN64"
+ PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK;_WIN64"
Culture="1033"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
@@ -243,8 +263,17 @@ Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
- OutputFile=".\qpidcommonsd.lib"
+ Name="VCLinkerTool"
+ AdditionalOptions="/machine:AMD64"
+ AdditionalDependencies=" ws2_32.lib rpcrt4.lib"
+ OutputFile="$(OutDir)\qpidcommond.dll"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ ImportLibrary=".\qpidcommond.lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -260,13 +289,14 @@ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid mkdir deploy\include\qpid
@if not exist deploy\include\qpid\amqp_0_10 mkdir deploy\include\qpid\amqp_0_10
@if not exist deploy\include\qpid\framing mkdir deploy\include\qpid\framing
@if not exist deploy\include\qpid\sys\windows mkdir deploy\include\qpid\sys\windows
@if not exist deploy\include\qpid\log\windows mkdir deploy\include\qpid\log\windows
@if not exist deploy\include\qpid\management mkdir deploy\include\qpid\management
@if not exist deploy\lib mkdir deploy\lib

@copy /Y qpid\*.h deploy\include\qpid\
@copy /Y qpid\amqp_0_10\*.h deploy\include\qpid\amqp_0_10\
@copy /Y qpid\framing\*.h deploy\include\qpid\framing\
@copy /Y qpid\sys\*.h deploy\include\qpid\sys\
@copy /Y qpid\sys\windows\*.h deploy\include\qpid\sys\windows\
@copy /Y qpid\log\*.h deploy\include\qpid\log\
@copy /Y qpid\log\windows\*.h deploy\include\qpid\log\windows\
@copy /Y qpid\management\*.h deploy\include\qpid\management\

@copy /Y $(OutDir)\qpidcommond.dll deploy\lib\
@copy /Y .\qpidcommond.lib deploy\lib\
"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="."
- IntermediateDirectory="Static_Release\common\AMD64"
- ConfigurationType="4"
+ IntermediateDirectory="Release\common\AMD64"
+ ConfigurationType="2"
CharacterSet="0"
>
@@ -295,8 +325,8 @@ Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="COMMON_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"
+ RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
@@ -307,7 +337,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_WIN64"
+ PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK;_WIN64"
Culture="1033"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
/>
@@ -315,8 +345,19 @@ Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
- OutputFile=".\qpidcommons.lib"
+ Name="VCLinkerTool"
+ AdditionalOptions="/machine:AMD64"
+ AdditionalDependencies=" ws2_32.lib rpcrt4.lib"
+ OutputFile="$(OutDir)\qpidcommon.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary=".\qpidcommon.lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -332,6 +373,7 @@ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid mkdir deploy\include\qpid
@if not exist deploy\include\qpid\amqp_0_10 mkdir deploy\include\qpid\amqp_0_10
@if not exist deploy\include\qpid\framing mkdir deploy\include\qpid\framing
@if not exist deploy\include\qpid\sys\windows mkdir deploy\include\qpid\sys\windows
@if not exist deploy\include\qpid\log\windows mkdir deploy\include\qpid\log\windows
@if not exist deploy\include\qpid\management mkdir deploy\include\qpid\management
@if not exist deploy\lib mkdir deploy\lib

@copy /Y qpid\*.h deploy\include\qpid\
@copy /Y qpid\amqp_0_10\*.h deploy\include\qpid\amqp_0_10\
@copy /Y qpid\framing\*.h deploy\include\qpid\framing\
@copy /Y qpid\sys\*.h deploy\include\qpid\sys\
@copy /Y qpid\sys\windows\*.h deploy\include\qpid\sys\windows\
@copy /Y qpid\log\*.h deploy\include\qpid\log\
@copy /Y qpid\log\windows\*.h deploy\include\qpid\log\windows\
@copy /Y qpid\management\*.h deploy\include\qpid\management\

@copy /Y $(OutDir)\qpidcommon.dll deploy\lib\
@copy /Y .\qpidcommon.lib deploy\lib\
"
/>
</Configuration>
</Configurations>
|