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 | 0398410e8894287da530cfb63d6344817445bfc2 (patch) | |
| tree | e4d789cd965f25c8fb0a51e1cf71df0a5330e73b /cpp/src/client.vcproj | |
| parent | 47db7ebfc533d2dc8a3dfc3b9d1273730b8779e6 (diff) | |
| download | qpid-python-0398410e8894287da530cfb63d6344817445bfc2.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/qpid@753014 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/client.vcproj')
| -rw-r--r-- | cpp/src/client.vcproj | 100 |
1 files changed, 71 insertions, 29 deletions
diff --git a/cpp/src/client.vcproj b/cpp/src/client.vcproj index e724e04d98..76f4e44a6c 100644 --- a/cpp/src/client.vcproj +++ b/cpp/src/client.vcproj @@ -24,7 +24,7 @@ ProjectType="Visual C++"
Version="9.00"
Name="client"
- ProjectGUID="{6961DBA3-FECA-1BAD-F396-8C394564ADCF}"
+ ProjectGUID="{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}"
RootNamespace="client"
Keyword="Win32Proj"
SignManifests="true"
@@ -43,8 +43,8 @@ <Configuration
Name="Debug|Win32"
OutputDirectory="."
- IntermediateDirectory="Static_Debug\client\I386"
- ConfigurationType="4"
+ IntermediateDirectory="Debug\client\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;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="CLIENT_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;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;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="_DEBUG;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;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=".\qpidclientsd.lib"
+ Name="VCLinkerTool"
+ AdditionalDependencies="qpidcommond.lib"
+ OutputFile="$(OutDir)\qpidclientd.dll"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ ImportLibrary=".\qpidclientd.lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -113,13 +121,14 @@ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\client\no_keyword mkdir deploy\include\qpid\client\no_keyword
@if not exist deploy\lib mkdir deploy\lib

@copy /Y qpid\client\*.h deploy\include\qpid\client\
@copy /Y gen\qpid\client\*.h deploy\include\qpid\client\
@copy /Y gen\qpid\client\no_keyword\*.h deploy\include\qpid\client\no_keyword\

@copy /Y $(OutDir)\qpidclientd.dll deploy\lib\
@copy /Y .\qpidclientd.lib deploy\lib\
"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="."
- IntermediateDirectory="Static_Release\client\I386"
- ConfigurationType="4"
+ IntermediateDirectory="Release\client\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;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="CLIENT_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;BOOST_ALL_DYN_LINK"
+ RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
@@ -160,7 +169,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="NDEBUG;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;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=".\qpidclients.lib"
+ Name="VCLinkerTool"
+ AdditionalDependencies="qpidcommon.lib"
+ OutputFile="$(OutDir)\qpidclient.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary=".\qpidclient.lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -185,13 +204,14 @@ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\client\no_keyword mkdir deploy\include\qpid\client\no_keyword
@if not exist deploy\lib mkdir deploy\lib

@copy /Y qpid\client\*.h deploy\include\qpid\client\
@copy /Y gen\qpid\client\*.h deploy\include\qpid\client\
@copy /Y gen\qpid\client\no_keyword\*.h deploy\include\qpid\client\no_keyword\

@copy /Y $(OutDir)\qpidclient.dll deploy\lib\
@copy /Y .\qpidclient.lib deploy\lib\
"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="."
- IntermediateDirectory="Static_Debug\client\AMD64"
- ConfigurationType="4"
+ IntermediateDirectory="Debug\client\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;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="CLIENT_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;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;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;_WIN64"
+ PreprocessorDefinitions="_DEBUG;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;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=".\qpidclientsd.lib"
+ Name="VCLinkerTool"
+ AdditionalOptions="/machine:AMD64"
+ AdditionalDependencies="qpidcommond.lib"
+ OutputFile="$(OutDir)\qpidclientd.dll"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ ImportLibrary=".\qpidclientd.lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -260,13 +289,14 @@ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\client\no_keyword mkdir deploy\include\qpid\client\no_keyword
@if not exist deploy\lib mkdir deploy\lib

@copy /Y qpid\client\*.h deploy\include\qpid\client\
@copy /Y gen\qpid\client\*.h deploy\include\qpid\client\
@copy /Y gen\qpid\client\no_keyword\*.h deploy\include\qpid\client\no_keyword\

@copy /Y $(OutDir)\qpidclientd.dll deploy\lib\
@copy /Y .\qpidclientd.lib deploy\lib\
"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="."
- IntermediateDirectory="Static_Release\client\AMD64"
- ConfigurationType="4"
+ IntermediateDirectory="Release\client\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;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="CLIENT_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;BOOST_ALL_DYN_LINK"
+ RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
@@ -307,7 +337,7 @@ />
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;_WIN64"
+ PreprocessorDefinitions="NDEBUG;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN;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=".\qpidclients.lib"
+ Name="VCLinkerTool"
+ AdditionalOptions="/machine:AMD64"
+ AdditionalDependencies="qpidcommon.lib"
+ OutputFile="$(OutDir)\qpidclient.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary=".\qpidclient.lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -332,6 +373,7 @@ />
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="@if not exist deploy\include\qpid\client\no_keyword mkdir deploy\include\qpid\client\no_keyword
@if not exist deploy\lib mkdir deploy\lib

@copy /Y qpid\client\*.h deploy\include\qpid\client\
@copy /Y gen\qpid\client\*.h deploy\include\qpid\client\
@copy /Y gen\qpid\client\no_keyword\*.h deploy\include\qpid\client\no_keyword\

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