Do not rely on ICE_HOME being set in projects

2 files changed, 101 insertions, 109 deletions

diff --git a/cpp/demo/cookbook/compression/cookbook.compression.client.vcproj b/cpp/demo/cookbook/compression/cookbook.compression.client.vcproj
index 6e1cc787edb..0e61ae31f29 100755
--- a/cpp/demo/cookbook/compression/cookbook.compression.client.vcproj
+++ b/cpp/demo/cookbook/compression/cookbook.compression.client.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="dummyinclude ; . ; ..\..\..\..\cpp\include"

+				AdditionalIncludeDirectories="dummyinclude ; . ; C:\Program Files\ZeroC\Ice-3.4b\include"

 				PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -80,7 +80,7 @@
 				OutputFile="client.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="..\..\..\..\cpp\lib"

+				AdditionalLibraryDirectories="C:\Program Files\ZeroC\Ice-3.4b\lib"

 				ProgramDatabaseFile=".\Release/client.pdb"

 				SubSystem="1"

 				RandomizedBaseAddress="1"

@@ -112,9 +112,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			Name="Debug|Win32"

+			OutputDirectory=".\Debug"

+			IntermediateDirectory=".\Debug"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -134,34 +134,33 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\Release/cookbook.compression.client.tlb"

+				TypeLibraryName=".\Debug/cookbook.compression.client.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="dummyinclude ; . ; ..\..\..\..\cpp\include"

-				PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

+				Optimization="0"

+				AdditionalIncludeDirectories=". ; C:\Program Files\ZeroC\Ice-3.4b\include"

+				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

 				RuntimeTypeInfo="true"

-				PrecompiledHeaderFile=".\Release/cookbook.compression.client.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

+				PrecompiledHeaderFile=".\Debug/cookbook.compression.client.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

 				WarningLevel="3"

 				WarnAsError="true"

 				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="_DEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -169,17 +168,18 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions="/FIXED:NO /IGNORE:4089"

-				AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"

+				AdditionalOptions="/FIXED:NO"

+				AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"

 				OutputFile="client.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="..\..\..\..\cpp\lib"

-				ProgramDatabaseFile=".\Release/client.pdb"

+				AdditionalLibraryDirectories="C:\Program Files\ZeroC\Ice-3.4b\lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\Debug/client.pdb"

 				SubSystem="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

-				TargetMachine="17"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -193,7 +193,7 @@
 			<Tool

 				Name="VCBscMakeTool"

 				SuppressStartupBanner="true"

-				OutputFile=".\Release/cookbook.compression.client.bsc"

+				OutputFile=".\Debug/cookbook.compression.client.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -206,9 +206,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

@@ -228,33 +228,34 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug/cookbook.compression.client.tlb"

+				TargetEnvironment="3"

+				TypeLibraryName=".\Release/cookbook.compression.client.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=". ; ..\..\..\..\cpp\include"

-				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="dummyinclude ; . ; ..\..\..\..\cpp\include"

+				PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

 				RuntimeTypeInfo="true"

-				PrecompiledHeaderFile=".\Debug/cookbook.compression.client.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

+				PrecompiledHeaderFile=".\Release/cookbook.compression.client.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

 				WarningLevel="3"

 				WarnAsError="true"

 				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="NDEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -262,18 +263,17 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions="/FIXED:NO"

-				AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"

+				AdditionalOptions="/FIXED:NO /IGNORE:4089"

+				AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"

 				OutputFile="client.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\cpp\lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug/client.pdb"

+				ProgramDatabaseFile=".\Release/client.pdb"

 				SubSystem="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

-				TargetMachine="1"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -287,7 +287,7 @@
 			<Tool

 				Name="VCBscMakeTool"

 				SuppressStartupBanner="true"

-				OutputFile=".\Debug/cookbook.compression.client.bsc"

+				OutputFile=".\Release/cookbook.compression.client.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -415,19 +415,19 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|x64"

+					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32"

+					Name="Release|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""

 						PreprocessorDefinitions=""

 					/>

 				</FileConfiguration>

@@ -477,12 +477,8 @@
 			Value="True"

 		/>

 		<Global

-			Name="ZerocIce_Home"

-			Value="$(ICE_HOME)"

-		/>

-		<Global

 			Name="ZerocIce_HomeExpanded"

-			Value="..\..\..\.."

+			Value="C:\Program Files\ZeroC\Ice-3.4b"

 		/>

 	</Globals>

 </VisualStudioProject>

diff --git a/cpp/demo/cookbook/compression/cookbook.compression.server.vcproj b/cpp/demo/cookbook/compression/cookbook.compression.server.vcproj
index f480ca8670d..8f30b638d51 100755
--- a/cpp/demo/cookbook/compression/cookbook.compression.server.vcproj
+++ b/cpp/demo/cookbook/compression/cookbook.compression.server.vcproj
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories=". ; ..\..\..\..\cpp\include"

+				AdditionalIncludeDirectories=". ; C:\Program Files\ZeroC\Ice-3.4b\include"

 				PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -81,7 +81,7 @@
 				OutputFile="server.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="..\..\..\..\cpp\lib"

+				AdditionalLibraryDirectories="C:\Program Files\ZeroC\Ice-3.4b\lib"

 				ProgramDatabaseFile=".\Release/server.pdb"

 				SubSystem="1"

 				RandomizedBaseAddress="1"

@@ -113,14 +113,13 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|x64"

-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			Name="Debug|Win32"

+			OutputDirectory=".\Debug"

+			IntermediateDirectory=".\Debug"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -136,34 +135,33 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

-				TypeLibraryName=".\Release/cookbook.compression.server.tlb"

+				TypeLibraryName=".\Debug/cookbook.compression.server.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories=". ; ..\..\..\..\cpp\include"

-				PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

+				Optimization="0"

+				AdditionalIncludeDirectories=". ; C:\Program Files\ZeroC\Ice-3.4b\include"

+				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

 				RuntimeTypeInfo="true"

-				PrecompiledHeaderFile=".\Release/cookbook.compression.server.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

+				PrecompiledHeaderFile=".\Debug/cookbook.compression.server.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

 				WarningLevel="3"

 				WarnAsError="true"

 				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="_DEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -171,17 +169,18 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions="/FIXED:NO /IGNORE:4089"

-				AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"

+				AdditionalOptions="/FIXED:NO"

+				AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"

 				OutputFile="server.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="..\..\..\..\cpp\lib"

-				ProgramDatabaseFile=".\Release/server.pdb"

+				AdditionalLibraryDirectories="C:\Program Files\ZeroC\Ice-3.4b\lib"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\Debug/server.pdb"

 				SubSystem="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

-				TargetMachine="17"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -195,7 +194,7 @@
 			<Tool

 				Name="VCBscMakeTool"

 				SuppressStartupBanner="true"

-				OutputFile=".\Release/cookbook.compression.server.bsc"

+				OutputFile=".\Debug/cookbook.compression.server.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -208,13 +207,14 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -230,33 +230,34 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug/cookbook.compression.server.tlb"

+				TargetEnvironment="3"

+				TypeLibraryName=".\Release/cookbook.compression.server.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

+				Optimization="2"

+				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories=". ; ..\..\..\..\cpp\include"

-				PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

+				PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

 				RuntimeTypeInfo="true"

-				PrecompiledHeaderFile=".\Debug/cookbook.compression.server.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

+				PrecompiledHeaderFile=".\Release/cookbook.compression.server.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

 				WarningLevel="3"

 				WarnAsError="true"

 				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="NDEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -264,18 +265,17 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions="/FIXED:NO"

-				AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"

+				AdditionalOptions="/FIXED:NO /IGNORE:4089"

+				AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"

 				OutputFile="server.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="..\..\..\..\cpp\lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug/server.pdb"

+				ProgramDatabaseFile=".\Release/server.pdb"

 				SubSystem="1"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

-				TargetMachine="1"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -289,7 +289,7 @@
 			<Tool

 				Name="VCBscMakeTool"

 				SuppressStartupBanner="true"

-				OutputFile=".\Debug/cookbook.compression.server.bsc"

+				OutputFile=".\Release/cookbook.compression.server.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -420,7 +420,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|x64"

+					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -428,7 +428,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32"

+					Name="Release|x64"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -478,12 +478,8 @@
 			Value="True"

 		/>

 		<Global

-			Name="ZerocIce_Home"

-			Value="$(ICE_HOME)"

-		/>

-		<Global

 			Name="ZerocIce_HomeExpanded"

-			Value="..\..\..\.."

+			Value="C:\Program Files\ZeroC\Ice-3.4b"

 		/>

 	</Globals>

 </VisualStudioProject>