From e2be96ff7626cdf6def4793e23fe67fabcde4cff Mon Sep 17 00:00:00 2001
From: Tuan Le <tuanle86@berkeley.edu>
Date: Mon, 26 Jul 2010 21:18:37 +0000
Subject: [PATCH] - add some linking to cuda oclUtils library

svn path=/trunk/boinc/; revision=22065
---
 win_build/example_app_nvopencl.vcproj | 151 +++++++++++++-------------
 1 file changed, 77 insertions(+), 74 deletions(-)

diff --git a/win_build/example_app_nvopencl.vcproj b/win_build/example_app_nvopencl.vcproj
index 1746206144..0cdda6fda5 100644
--- a/win_build/example_app_nvopencl.vcproj
+++ b/win_build/example_app_nvopencl.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="example_app_nvopencl"
 	ProjectGUID="{BDC69EE0-033E-4AE1-B6AD-670E26FC117B}"
 	RootNamespace="nvopencl"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -41,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;$(CUDA_INC_PATH)"
+				AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;$(CUDA_INC_PATH);/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK/OpenCL/common/inc/;C:/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK/shared/inc/"
 				PreprocessorDefinitions="NV_OS_WIN"
 				RuntimeLibrary="1"
 			/>
@@ -56,8 +57,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opencl.lib"
-				AdditionalLibraryDirectories="$(CUDA_LIB_PATH)\..\lib"
+				AdditionalDependencies="oclUtils32D.lib OpenCL.lib shrUtils32D.lib"
+				AdditionalLibraryDirectories="$(CUDA_LIB_PATH)\..\lib;/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK/OpenCL/common/lib/;/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK/shared/lib;/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK/OpenCL/OpenCL/common/lib/$(PlatformName)/"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -78,7 +81,72 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCPostBuildEventTool"
+				CommandLine="copy ..\samples\nvopencl\*.cl &quot;$(OUTDIR)&quot;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;$(CUDA_INC_PATH);/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK/OpenCL/common/inc/;C:/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK/shared/inc/"
+				PreprocessorDefinitions="NV_OS_WIN"
+				RuntimeLibrary="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="oclUtils32D.lib OpenCL.lib shrUtils32D.lib"
+				AdditionalLibraryDirectories="$(CUDA_LIB_PATH)\..\lib;/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK/OpenCL/common/lib/;/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK/shared/lib;/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK/OpenCL/OpenCL/common/lib/$(PlatformName)/"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -154,75 +222,6 @@
 				CommandLine="copy ..\samples\nvopencl\*.cl &quot;$(OUTDIR)&quot;"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName)\obj"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;$(CUDA_INC_PATH)"
-				PreprocessorDefinitions="NV_OS_WIN"
-				RuntimeLibrary="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="opencl.lib"
-				AdditionalLibraryDirectories="$(CUDA_LIB_PATH)\..\lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\samples\nvopencl\*.cl &quot;$(OUTDIR)&quot;"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory=".\Build\$(PlatformName)\$(ConfigurationName)"
@@ -306,6 +305,10 @@
 				RelativePath="..\samples\nvopencl\nvopencl.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\samples\nvopencl\nvopencl_kernels.cl"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"