diff options
| author | Ted Ross <tross@apache.org> | 2010-06-03 14:14:50 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2010-06-03 14:14:50 +0000 |
| commit | 910203e835d9f58a0079b9318e2bcb8dc15cd22e (patch) | |
| tree | f9ab52c39254c6190808d8063c631f7d73b6feeb /cpp/bindings/qpid/dotnet/src | |
| parent | c54cf4f33f8c44fe96e41e3733d64efb07f614c4 (diff) | |
| download | qpid-python-910203e835d9f58a0079b9318e2bcb8dc15cd22e.tar.gz | |
QPID-2589 - Build DLLs and EXEs usable on both 32 and 64-bit architectures.
Patch from Chuck Rolke.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@951003 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/bindings/qpid/dotnet/src')
| -rw-r--r-- | cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj | 14 | ||||
| -rw-r--r-- | cpp/bindings/qpid/dotnet/src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj | 18 |
2 files changed, 24 insertions, 8 deletions
diff --git a/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj b/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj index 3f5861b7fe..7c31781f40 100644 --- a/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj +++ b/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj @@ -18,8 +18,8 @@ <Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)\bin\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)\obj\$(ConfigurationName)"
+ OutputDirectory="$(ProjectDir)\bin\$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectDir)\obj\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="1"
@@ -96,8 +96,8 @@ </Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)\bin\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)\obj\$(ConfigurationName)"
+ OutputDirectory="$(ProjectDir)\bin\$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectDir)\obj\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
ManagedExtensions="1"
@@ -122,7 +122,7 @@ Name="VCCLCompilerTool"
AdditionalOptions=" /Zm1000 /wd4244 /wd4800 /wd4355"
Optimization="0"
- AdditionalIncludeDirectories=""$(QPID_BUILD_ROOT)\include";"$(QPID_BUILD_ROOT)\src""
+ AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\..\include";"$(ProjectDir)..\..\..\..\src""
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;WIN32_LEAN_AND_MEAN"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -141,8 +141,8 @@ <Tool
Name="VCLinkerTool"
AdditionalOptions=" /STACK:10000000 /machine:I386"
- AdditionalDependencies="$(QPID_BUILD_ROOT)\src\Release\qpidclient.lib $(QPID_BUILD_ROOT)\src\Release\qpidcommon.lib"
- OutputFile="$(OutDir)\org.apache.qpid.messaging.dll"
+ AdditionalDependencies="$(ProjectDir)..\..\..\..\src\$(ConfigurationName)\qpidclient.lib $(ProjectDir)..\..\..\..\src\$(ConfigurationName)\qpidcommon.lib $(ProjectDir)..\..\..\..\src\$(ConfigurationName)\qpidmessaging.lib"
+ OutputFile="$(ProjectDir)..\..\..\..\src\$(ConfigurationName)\org.apache.qpid.messaging.dll"
LinkIncremental="1"
GenerateDebugInformation="true"
AssemblyDebug="1"
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj b/cpp/bindings/qpid/dotnet/src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj index 0021a15908..04ddc17720 100644 --- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj +++ b/cpp/bindings/qpid/dotnet/src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj @@ -25,11 +25,27 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\..\..\..\..\src\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>..\..\..\..\..\src\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <OutputPath>..\..\..\..\..\src\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core">
|