summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-11-26 21:09:58 +0100
committerJose <jose@zeroc.com>2014-11-26 21:09:58 +0100
commit40e1447e234fb50f64bf0268ffe3ddf386e8b941 (patch)
tree13015db51978db973b815723e58a17251645d615 /cpp
parentICE-5983 Update Gradle to 2.2.1 to get latest bug fix (diff)
downloadice-40e1447e234fb50f64bf0268ffe3ddf386e8b941.tar.bz2
ice-40e1447e234fb50f64bf0268ffe3ddf386e8b941.tar.xz
ice-40e1447e234fb50f64bf0268ffe3ddf386e8b941.zip
Fixed (ICE-5992) - IceGrid/customLoadBalancing fails to load plug-in when build from VS
Diffstat (limited to 'cpp')
-rwxr-xr-xcpp/demo/IceGrid/customLoadBalancing/IceGrid.customLoadBalancing.plugin.vcxproj24
1 files changed, 12 insertions, 12 deletions
diff --git a/cpp/demo/IceGrid/customLoadBalancing/IceGrid.customLoadBalancing.plugin.vcxproj b/cpp/demo/IceGrid/customLoadBalancing/IceGrid.customLoadBalancing.plugin.vcxproj
index 6a6e8646974..ce467ea6364 100755
--- a/cpp/demo/IceGrid/customLoadBalancing/IceGrid.customLoadBalancing.plugin.vcxproj
+++ b/cpp/demo/IceGrid/customLoadBalancing/IceGrid.customLoadBalancing.plugin.vcxproj
@@ -78,10 +78,10 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\$(PlatformName)\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">registryplugin35d</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">registryplugin35d</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">registryplugin35</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">registryplugin35</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">registryplugin36bd</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">registryplugin36bd</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">registryplugin36b</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">registryplugin36b</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -107,13 +107,13 @@
<Link>
<AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>setargv.obj;glacier2d.lib;icegridd.lib;iced.lib;iceutild.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>registryplugin35d.dll</OutputFile>
+ <OutputFile>registryplugin36bd.dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>registryplugin35d.lib</ImportLibrary>
+ <ImportLibrary>registryplugin36bd.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -145,13 +145,13 @@
<Link>
<AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>setargv.obj;glacier2d.lib;icegridd.lib;iced.lib;iceutild.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>registryplugin35d.dll</OutputFile>
+ <OutputFile>registryplugin36bd.dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>registryplugin35d.lib</ImportLibrary>
+ <ImportLibrary>registryplugin36bd.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -179,12 +179,12 @@
<Link>
<AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>setargv.obj;glacier2.lib;icegrid.lib;ice.lib;iceutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>registryplugin35.dll</OutputFile>
+ <OutputFile>registryplugin36b.dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>registryplugin35.lib</ImportLibrary>
+ <ImportLibrary>registryplugin36b.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -216,12 +216,12 @@
<Link>
<AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>setargv.obj;glacier2.lib;icegrid.lib;ice.lib;iceutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>registryplugin35.dll</OutputFile>
+ <OutputFile>registryplugin36b.dll</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>registryplugin35.lib</ImportLibrary>
+ <ImportLibrary>registryplugin36b.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>