aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-11-26 15:24:18 +0100
committerJustin Lecher <jlec@gentoo.org>2012-11-26 15:24:18 +0100
commit27611d8d32715d80ecc917ba132c8dd258802b78 (patch)
tree22d56f6254efb64f4469e191bd1bb6f7a2b4315f /dev-util/nvidia-cuda-sdk
parentsci-chemistry/vmd: Using new cuda.eclass (diff)
downloadsci-27611d8d32715d80ecc917ba132c8dd258802b78.tar.gz
sci-27611d8d32715d80ecc917ba132c8dd258802b78.tar.bz2
sci-27611d8d32715d80ecc917ba132c8dd258802b78.zip
dev-util/nvidia-cuda-sdk: Version Bump, inclusive cuda.eclass usage
Package-Manager: portage-2.2.0_alpha142 RepoMan-Options: --force
Diffstat (limited to 'dev-util/nvidia-cuda-sdk')
-rw-r--r--dev-util/nvidia-cuda-sdk/ChangeLog4
-rw-r--r--dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-5.0.35-asneeded.patch1220
-rw-r--r--dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild2
3 files changed, 884 insertions, 342 deletions
diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog
index c81719f1c..836e7cef5 100644
--- a/dev-util/nvidia-cuda-sdk/ChangeLog
+++ b/dev-util/nvidia-cuda-sdk/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.30 2012/02/05 16:39:02 spock Exp $
+ 26 Nov 2012; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-5.0.35.ebuild,
+ files/nvidia-cuda-sdk-5.0.35-asneeded.patch:
+ Version Bump, inclusive cuda.eclass usage
+
*nvidia-cuda-sdk-5.0.35 (16 Nov 2012)
16 Nov 2012; Justin Lecher <jlec@gentoo.org> +nvidia-cuda-sdk-5.0.35.ebuild:
diff --git a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-5.0.35-asneeded.patch b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-5.0.35-asneeded.patch
index c83d2f60b..b9b224b2d 100644
--- a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-5.0.35-asneeded.patch
+++ b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-5.0.35-asneeded.patch
@@ -1,121 +1,122 @@
- 0_Simple/asyncAPI/Makefile | 8 ++++----
- 0_Simple/cdpSimplePrint/Makefile | 6 +++---
- 0_Simple/cdpSimpleQuicksort/Makefile | 6 +++---
- 0_Simple/clock/Makefile | 8 ++++----
- 0_Simple/cppIntegration/Makefile | 8 ++++----
- 0_Simple/cudaOpenMP/Makefile | 8 ++++----
- 0_Simple/inlinePTX/Makefile | 8 ++++----
- 0_Simple/matrixMul/Makefile | 8 ++++----
- 0_Simple/matrixMulCUBLAS/Makefile | 8 ++++----
- 0_Simple/matrixMulDrv/Makefile | 8 ++++----
- 0_Simple/matrixMulDynlinkJIT/Makefile | 8 ++++----
- 0_Simple/simpleAssert/Makefile | 8 ++++----
- 0_Simple/simpleAtomicIntrinsics/Makefile | 8 ++++----
- 0_Simple/simpleCallback/Makefile | 8 ++++----
- 0_Simple/simpleCubemapTexture/Makefile | 8 ++++----
- 0_Simple/simpleIPC/Makefile | 8 ++++----
- 0_Simple/simpleLayeredTexture/Makefile | 8 ++++----
- 0_Simple/simpleMPI/Makefile | 8 ++++----
- 0_Simple/simpleMultiCopy/Makefile | 8 ++++----
- 0_Simple/simpleMultiGPU/Makefile | 8 ++++----
- 0_Simple/simpleP2P/Makefile | 8 ++++----
- 0_Simple/simplePitchLinearTexture/Makefile | 8 ++++----
- 0_Simple/simplePrintf/Makefile | 8 ++++----
- 0_Simple/simpleSeparateCompilation/Makefile | 8 ++++----
- 0_Simple/simpleStreams/Makefile | 8 ++++----
- 0_Simple/simpleSurfaceWrite/Makefile | 8 ++++----
- 0_Simple/simpleTemplates/Makefile | 8 ++++----
- 0_Simple/simpleTexture/Makefile | 8 ++++----
- 0_Simple/simpleTextureDrv/Makefile | 8 ++++----
- 0_Simple/simpleVoteIntrinsics/Makefile | 8 ++++----
- 0_Simple/simpleZeroCopy/Makefile | 8 ++++----
- 0_Simple/template/Makefile | 8 ++++----
- 0_Simple/template_runtime/Makefile | 8 ++++----
- 0_Simple/vectorAdd/Makefile | 8 ++++----
- 0_Simple/vectorAddDrv/Makefile | 8 ++++----
- 1_Utilities/bandwidthTest/Makefile | 8 ++++----
- 1_Utilities/deviceQuery/Makefile | 8 ++++----
- 1_Utilities/deviceQueryDrv/Makefile | 8 ++++----
- 2_Graphics/Mandelbrot/Makefile | 8 ++++----
- 2_Graphics/bindlessTexture/Makefile | 8 ++++----
- 2_Graphics/marchingCubes/Makefile | 8 ++++----
- 2_Graphics/simpleGL/Makefile | 8 ++++----
- 2_Graphics/simpleTexture3D/Makefile | 8 ++++----
- 2_Graphics/volumeFiltering/Makefile | 8 ++++----
- 2_Graphics/volumeRender/Makefile | 8 ++++----
- 3_Imaging/HSOpticalFlow/Makefile | 8 ++++----
- 3_Imaging/SobelFilter/Makefile | 8 ++++----
- 3_Imaging/bicubicTexture/Makefile | 8 ++++----
- 3_Imaging/bilateralFilter/Makefile | 8 ++++----
- 3_Imaging/boxFilter/Makefile | 8 ++++----
- 3_Imaging/convolutionFFT2D/Makefile | 8 ++++----
- 3_Imaging/convolutionSeparable/Makefile | 8 ++++----
- 3_Imaging/convolutionTexture/Makefile | 8 ++++----
- 3_Imaging/dct8x8/Makefile | 8 ++++----
- 3_Imaging/dwtHaar1D/Makefile | 8 ++++----
- 3_Imaging/dxtc/Makefile | 8 ++++----
- 3_Imaging/histogram/Makefile | 8 ++++----
- 3_Imaging/imageDenoising/Makefile | 8 ++++----
- 3_Imaging/postProcessGL/Makefile | 8 ++++----
- 3_Imaging/recursiveGaussian/Makefile | 8 ++++----
- 3_Imaging/stereoDisparity/Makefile | 8 ++++----
- 4_Finance/BlackScholes/Makefile | 8 ++++----
- 4_Finance/MonteCarloMultiGPU/Makefile | 8 ++++----
- 4_Finance/SobolQRNG/Makefile | 8 ++++----
- 4_Finance/binomialOptions/Makefile | 8 ++++----
- 4_Finance/quasirandomGenerator/Makefile | 8 ++++----
- 5_Simulations/fluidsGL/Makefile | 8 ++++----
- 5_Simulations/nbody/Makefile | 8 ++++----
- 5_Simulations/oceanFFT/Makefile | 8 ++++----
- 5_Simulations/particles/Makefile | 8 ++++----
- 5_Simulations/smokeParticles/Makefile | 8 ++++----
- 6_Advanced/FDTD3d/Makefile | 8 ++++----
- 6_Advanced/FunctionPointers/Makefile | 8 ++++----
- 6_Advanced/alignedTypes/Makefile | 8 ++++----
- 6_Advanced/cdpAdvancedQuicksort/Makefile | 6 +++---
- 6_Advanced/cdpLUDecomposition/Makefile | 6 +++---
- 6_Advanced/cdpQuadtree/Makefile | 6 +++---
- 6_Advanced/concurrentKernels/Makefile | 8 ++++----
- 6_Advanced/eigenvalues/Makefile | 8 ++++----
- 6_Advanced/fastWalshTransform/Makefile | 8 ++++----
- 6_Advanced/interval/Makefile | 8 ++++----
- 6_Advanced/lineOfSight/Makefile | 8 ++++----
- 6_Advanced/mergeSort/Makefile | 8 ++++----
- 6_Advanced/newdelete/Makefile | 8 ++++----
- 6_Advanced/ptxjit/Makefile | 8 ++++----
- 6_Advanced/radixSortThrust/Makefile | 8 ++++----
- 6_Advanced/reduction/Makefile | 8 ++++----
- 6_Advanced/scalarProd/Makefile | 8 ++++----
- 6_Advanced/scan/Makefile | 8 ++++----
- 6_Advanced/segmentationTreeThrust/Makefile | 8 ++++----
- 6_Advanced/shfl_scan/Makefile | 8 ++++----
- 6_Advanced/simpleHyperQ/Makefile | 8 ++++----
- 6_Advanced/sortingNetworks/Makefile | 8 ++++----
- 6_Advanced/threadFenceReduction/Makefile | 8 ++++----
- 6_Advanced/threadMigration/Makefile | 8 ++++----
- 6_Advanced/transpose/Makefile | 8 ++++----
- 7_CUDALibraries/MC_EstimatePiInlineP/Makefile | 8 ++++----
- 7_CUDALibraries/MC_EstimatePiInlineQ/Makefile | 8 ++++----
- 7_CUDALibraries/MC_EstimatePiP/Makefile | 8 ++++----
- 7_CUDALibraries/MC_EstimatePiQ/Makefile | 8 ++++----
- 7_CUDALibraries/MC_SingleAsianOptionP/Makefile | 8 ++++----
- 7_CUDALibraries/MersenneTwisterGP11213/Makefile | 8 ++++----
- 7_CUDALibraries/batchCUBLAS/Makefile | 8 ++++----
- 7_CUDALibraries/boxFilterNPP/Makefile | 8 ++++----
- 7_CUDALibraries/conjugateGradient/Makefile | 8 ++++----
- 7_CUDALibraries/conjugateGradientPrecond/Makefile | 8 ++++----
- 7_CUDALibraries/freeImageInteropNPP/Makefile | 8 ++++----
- 7_CUDALibraries/grabcutNPP/Makefile | 8 ++++----
- 7_CUDALibraries/histEqualizationNPP/Makefile | 8 ++++----
- 7_CUDALibraries/imageSegmentationNPP/Makefile | 8 ++++----
- 7_CUDALibraries/randomFog/Makefile | 8 ++++----
- 7_CUDALibraries/simpleCUBLAS/Makefile | 8 ++++----
- 7_CUDALibraries/simpleCUFFT/Makefile | 8 ++++----
- 7_CUDALibraries/simpleDevLibCUBLAS/Makefile | 8 ++++----
- 114 files changed, 451 insertions(+), 451 deletions(-)
+ 0_Simple/asyncAPI/Makefile | 8 ++++----
+ 0_Simple/cdpSimplePrint/Makefile | 6 +++---
+ 0_Simple/cdpSimpleQuicksort/Makefile | 6 +++---
+ 0_Simple/clock/Makefile | 8 ++++----
+ 0_Simple/cppIntegration/Makefile | 8 ++++----
+ 0_Simple/cudaOpenMP/Makefile | 8 ++++----
+ 0_Simple/inlinePTX/Makefile | 8 ++++----
+ 0_Simple/matrixMul/Makefile | 8 ++++----
+ 0_Simple/matrixMulCUBLAS/Makefile | 10 +++++-----
+ 0_Simple/matrixMulDrv/Makefile | 8 ++++----
+ 0_Simple/matrixMulDynlinkJIT/Makefile | 8 ++++----
+ 0_Simple/simpleAssert/Makefile | 8 ++++----
+ 0_Simple/simpleAtomicIntrinsics/Makefile | 8 ++++----
+ 0_Simple/simpleCallback/Makefile | 8 ++++----
+ 0_Simple/simpleCubemapTexture/Makefile | 8 ++++----
+ 0_Simple/simpleIPC/Makefile | 8 ++++----
+ 0_Simple/simpleLayeredTexture/Makefile | 8 ++++----
+ 0_Simple/simpleMPI/Makefile | 8 ++++----
+ 0_Simple/simpleMultiCopy/Makefile | 8 ++++----
+ 0_Simple/simpleMultiGPU/Makefile | 8 ++++----
+ 0_Simple/simpleP2P/Makefile | 8 ++++----
+ 0_Simple/simplePitchLinearTexture/Makefile | 8 ++++----
+ 0_Simple/simplePrintf/Makefile | 8 ++++----
+ 0_Simple/simpleSeparateCompilation/Makefile | 10 +++++-----
+ 0_Simple/simpleStreams/Makefile | 8 ++++----
+ 0_Simple/simpleSurfaceWrite/Makefile | 8 ++++----
+ 0_Simple/simpleTemplates/Makefile | 10 +++++-----
+ 0_Simple/simpleTexture/Makefile | 8 ++++----
+ 0_Simple/simpleTextureDrv/Makefile | 8 ++++----
+ 0_Simple/simpleVoteIntrinsics/Makefile | 8 ++++----
+ 0_Simple/simpleZeroCopy/Makefile | 8 ++++----
+ 0_Simple/template/Makefile | 10 +++++-----
+ 0_Simple/template_runtime/Makefile | 10 +++++-----
+ 0_Simple/vectorAdd/Makefile | 8 ++++----
+ 0_Simple/vectorAddDrv/Makefile | 8 ++++----
+ 1_Utilities/bandwidthTest/Makefile | 8 ++++----
+ 1_Utilities/deviceQuery/Makefile | 8 ++++----
+ 1_Utilities/deviceQueryDrv/Makefile | 8 ++++----
+ 2_Graphics/Mandelbrot/Makefile | 10 +++++-----
+ 2_Graphics/bindlessTexture/Makefile | 10 +++++-----
+ 2_Graphics/marchingCubes/Makefile | 10 +++++-----
+ 2_Graphics/simpleGL/Makefile | 10 +++++-----
+ 2_Graphics/simpleTexture3D/Makefile | 10 +++++-----
+ 2_Graphics/volumeFiltering/Makefile | 10 +++++-----
+ 2_Graphics/volumeRender/Makefile | 10 +++++-----
+ 3_Imaging/HSOpticalFlow/Makefile | 8 ++++----
+ 3_Imaging/SobelFilter/Makefile | 10 +++++-----
+ 3_Imaging/bicubicTexture/Makefile | 10 +++++-----
+ 3_Imaging/bilateralFilter/Makefile | 10 +++++-----
+ 3_Imaging/boxFilter/Makefile | 10 +++++-----
+ 3_Imaging/convolutionFFT2D/Makefile | 8 ++++----
+ 3_Imaging/convolutionSeparable/Makefile | 8 ++++----
+ 3_Imaging/convolutionTexture/Makefile | 8 ++++----
+ 3_Imaging/dct8x8/Makefile | 10 +++++-----
+ 3_Imaging/dwtHaar1D/Makefile | 8 ++++----
+ 3_Imaging/dxtc/Makefile | 8 ++++----
+ 3_Imaging/histogram/Makefile | 8 ++++----
+ 3_Imaging/imageDenoising/Makefile | 10 +++++-----
+ 3_Imaging/postProcessGL/Makefile | 10 +++++-----
+ 3_Imaging/recursiveGaussian/Makefile | 10 +++++-----
+ 3_Imaging/stereoDisparity/Makefile | 8 ++++----
+ 4_Finance/BlackScholes/Makefile | 8 ++++----
+ 4_Finance/MonteCarloMultiGPU/Makefile | 8 ++++----
+ 4_Finance/SobolQRNG/Makefile | 8 ++++----
+ 4_Finance/binomialOptions/Makefile | 8 ++++----
+ 4_Finance/quasirandomGenerator/Makefile | 8 ++++----
+ 5_Simulations/fluidsGL/Makefile | 10 +++++-----
+ 5_Simulations/nbody/Makefile | 10 +++++-----
+ 5_Simulations/oceanFFT/Makefile | 10 +++++-----
+ 5_Simulations/oceanFFT/Makefile2 | 4 ++--
+ 5_Simulations/particles/Makefile | 10 +++++-----
+ 5_Simulations/smokeParticles/Makefile | 10 +++++-----
+ 6_Advanced/FDTD3d/Makefile | 10 +++++-----
+ 6_Advanced/FunctionPointers/Makefile | 10 +++++-----
+ 6_Advanced/alignedTypes/Makefile | 8 ++++----
+ 6_Advanced/cdpAdvancedQuicksort/Makefile | 6 +++---
+ 6_Advanced/cdpLUDecomposition/Makefile | 6 +++---
+ 6_Advanced/cdpQuadtree/Makefile | 6 +++---
+ 6_Advanced/concurrentKernels/Makefile | 8 ++++----
+ 6_Advanced/eigenvalues/Makefile | 10 +++++-----
+ 6_Advanced/fastWalshTransform/Makefile | 10 +++++-----
+ 6_Advanced/interval/Makefile | 10 +++++-----
+ 6_Advanced/lineOfSight/Makefile | 8 ++++----
+ 6_Advanced/mergeSort/Makefile | 10 +++++-----
+ 6_Advanced/newdelete/Makefile | 10 +++++-----
+ 6_Advanced/ptxjit/Makefile | 8 ++++----
+ 6_Advanced/radixSortThrust/Makefile | 8 ++++----
+ 6_Advanced/reduction/Makefile | 8 ++++----
+ 6_Advanced/scalarProd/Makefile | 10 +++++-----
+ 6_Advanced/scan/Makefile | 10 +++++-----
+ 6_Advanced/segmentationTreeThrust/Makefile | 10 +++++-----
+ 6_Advanced/shfl_scan/Makefile | 10 +++++-----
+ 6_Advanced/simpleHyperQ/Makefile | 8 ++++----
+ 6_Advanced/sortingNetworks/Makefile | 10 +++++-----
+ 6_Advanced/threadFenceReduction/Makefile | 10 +++++-----
+ 6_Advanced/threadMigration/Makefile | 10 +++++-----
+ 6_Advanced/transpose/Makefile | 8 ++++----
+ 7_CUDALibraries/MC_EstimatePiInlineP/Makefile | 10 +++++-----
+ 7_CUDALibraries/MC_EstimatePiInlineQ/Makefile | 10 +++++-----
+ 7_CUDALibraries/MC_EstimatePiP/Makefile | 10 +++++-----
+ 7_CUDALibraries/MC_EstimatePiQ/Makefile | 10 +++++-----
+ 7_CUDALibraries/MC_SingleAsianOptionP/Makefile | 10 +++++-----
+ 7_CUDALibraries/MersenneTwisterGP11213/Makefile | 10 +++++-----
+ 7_CUDALibraries/batchCUBLAS/Makefile | 10 +++++-----
+ 7_CUDALibraries/boxFilterNPP/Makefile | 10 +++++-----
+ 7_CUDALibraries/conjugateGradient/Makefile | 10 +++++-----
+ 7_CUDALibraries/conjugateGradientPrecond/Makefile | 10 +++++-----
+ 7_CUDALibraries/freeImageInteropNPP/Makefile | 10 +++++-----
+ 7_CUDALibraries/grabcutNPP/Makefile | 10 +++++-----
+ 7_CUDALibraries/histEqualizationNPP/Makefile | 10 +++++-----
+ 7_CUDALibraries/imageSegmentationNPP/Makefile | 10 +++++-----
+ 7_CUDALibraries/randomFog/Makefile | 10 +++++-----
+ 7_CUDALibraries/simpleCUBLAS/Makefile | 10 +++++-----
+ 7_CUDALibraries/simpleCUFFT/Makefile | 10 +++++-----
+ 7_CUDALibraries/simpleDevLibCUBLAS/Makefile | 10 +++++-----
+ 115 files changed, 510 insertions(+), 510 deletions(-)
diff --git a/0_Simple/asyncAPI/Makefile b/0_Simple/asyncAPI/Makefile
-index d99a26b..263c54d 100644
+index d99a26b..9f6a367 100644
--- a/0_Simple/asyncAPI/Makefile
+++ b/0_Simple/asyncAPI/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -141,12 +142,12 @@ index d99a26b..263c54d 100644
asyncAPI: asyncAPI.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/cdpSimplePrint/Makefile b/0_Simple/cdpSimplePrint/Makefile
-index 71a17e4..133514e 100644
+index 71a17e4..b1030e8 100644
--- a/0_Simple/cdpSimplePrint/Makefile
+++ b/0_Simple/cdpSimplePrint/Makefile
@@ -84,9 +84,9 @@ GENCODE_FLAGS := $(GENCODE_SM35)
@@ -166,12 +167,12 @@ index 71a17e4..133514e 100644
cdpSimplePrint: cdpSimplePrint.o
- $(NVCC) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LDFLAGS)
-+ $(NVCC) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBS)
++ $(NVCC) $(LDFLAGS) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/cdpSimpleQuicksort/Makefile b/0_Simple/cdpSimpleQuicksort/Makefile
-index b6cecd3..75e55f6 100644
+index b6cecd3..fac4686 100644
--- a/0_Simple/cdpSimpleQuicksort/Makefile
+++ b/0_Simple/cdpSimpleQuicksort/Makefile
@@ -84,9 +84,9 @@ GENCODE_FLAGS := $(GENCODE_SM35)
@@ -191,12 +192,12 @@ index b6cecd3..75e55f6 100644
cdpSimpleQuicksort: cdpSimpleQuicksort.o
- $(NVCC) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(NVCC) $(CCFLAGS) $(LIBS) $(EXTRA_LDFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBS)
++ $(NVCC) $(LDFLAGS) $(CCFLAGS) $(EXTRA_LDFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/clock/Makefile b/0_Simple/clock/Makefile
-index 2f07117..7919cd8 100644
+index 2f07117..6e0448b 100644
--- a/0_Simple/clock/Makefile
+++ b/0_Simple/clock/Makefile
@@ -77,14 +77,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -222,12 +223,12 @@ index 2f07117..7919cd8 100644
clock: clock.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/cppIntegration/Makefile b/0_Simple/cppIntegration/Makefile
-index 14983e8..0235ce7 100644
+index 14983e8..e17b948 100644
--- a/0_Simple/cppIntegration/Makefile
+++ b/0_Simple/cppIntegration/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -253,12 +254,12 @@ index 14983e8..0235ce7 100644
cppIntegration: cppIntegration.o cppIntegration_gold.o main.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/cudaOpenMP/Makefile b/0_Simple/cudaOpenMP/Makefile
-index cadc41c..c94901e 100644
+index cadc41c..e7f1450 100644
--- a/0_Simple/cudaOpenMP/Makefile
+++ b/0_Simple/cudaOpenMP/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -284,12 +285,12 @@ index cadc41c..c94901e 100644
cudaOpenMP: cudaOpenMP.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/inlinePTX/Makefile b/0_Simple/inlinePTX/Makefile
-index c9f925e..1882219 100644
+index c9f925e..87757ff 100644
--- a/0_Simple/inlinePTX/Makefile
+++ b/0_Simple/inlinePTX/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -315,12 +316,12 @@ index c9f925e..1882219 100644
inlinePTX: inlinePTX.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/matrixMul/Makefile b/0_Simple/matrixMul/Makefile
-index 4444bc3..a7e7c27 100644
+index 4444bc3..1ac8915 100644
--- a/0_Simple/matrixMul/Makefile
+++ b/0_Simple/matrixMul/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -346,12 +347,12 @@ index 4444bc3..a7e7c27 100644
matrixMul: matrixMul.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/matrixMulCUBLAS/Makefile b/0_Simple/matrixMulCUBLAS/Makefile
-index ea84d15..f5461b8 100644
+index ea84d15..a74ebc3 100644
--- a/0_Simple/matrixMulCUBLAS/Makefile
+++ b/0_Simple/matrixMulCUBLAS/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -359,7 +360,7 @@ index ea84d15..f5461b8 100644
# OS-specific build flags
ifneq ($(DARWIN),)
- LDFLAGS := -Xlinker -rpath $(CUDA_LIB_PATH) -L$(CUDA_LIB_PATH) -lcudart
-+ LIBS := -Xlinker -rpath $(CUDA_LIB_PATH) -L$(CUDA_LIB_PATH) -lcudart
++ LIBS := -Xlinker -rpath $(CUDA_LIB_PATH) -L$(CUDA_LIB_PATH) -lcudart -lcublas
CCFLAGS := -arch $(OS_ARCH)
else
ifeq ($(OS_SIZE),32)
@@ -372,17 +373,26 @@ index ea84d15..f5461b8 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += -lcublas
++LIBS += -lcublas
+
+ # Target rules
+ all: build
@@ -128,7 +128,7 @@ matrixMulCUBLAS.o: matrixMulCUBLAS.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
matrixMulCUBLAS: matrixMulCUBLAS.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/matrixMulDrv/Makefile b/0_Simple/matrixMulDrv/Makefile
-index a998e53..9bbdd56 100644
+index a998e53..7a94686 100644
--- a/0_Simple/matrixMulDrv/Makefile
+++ b/0_Simple/matrixMulDrv/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -408,12 +418,12 @@ index a998e53..9bbdd56 100644
matrixMulDrv: matrixMulDrv.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/matrixMulDynlinkJIT/Makefile b/0_Simple/matrixMulDynlinkJIT/Makefile
-index 17fc2f6..8133414 100644
+index 17fc2f6..e8044d2 100644
--- a/0_Simple/matrixMulDynlinkJIT/Makefile
+++ b/0_Simple/matrixMulDynlinkJIT/Makefile
@@ -79,14 +79,14 @@ EXTRA_LDFLAGS ?=
@@ -439,12 +449,12 @@ index 17fc2f6..8133414 100644
matrixMulDynlinkJIT: matrixMulDynlinkJIT.o matrixMul_gold.o matrixMul_kernel_32_ptxdump.o matrixMul_kernel_64_ptxdump.o cuda_drvapi_dynlink.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleAssert/Makefile b/0_Simple/simpleAssert/Makefile
-index 72ade2a..5bbe2a1 100644
+index 72ade2a..1a87a47 100644
--- a/0_Simple/simpleAssert/Makefile
+++ b/0_Simple/simpleAssert/Makefile
@@ -84,14 +84,14 @@ GENCODE_FLAGS := $(GENCODE_SM20) $(GENCODE_SM30)
@@ -470,12 +480,12 @@ index 72ade2a..5bbe2a1 100644
simpleAssert: simpleAssert.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleAtomicIntrinsics/Makefile b/0_Simple/simpleAtomicIntrinsics/Makefile
-index b153932..b962440 100644
+index b153932..8d7d960 100644
--- a/0_Simple/simpleAtomicIntrinsics/Makefile
+++ b/0_Simple/simpleAtomicIntrinsics/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM11) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -501,12 +511,12 @@ index b153932..b962440 100644
simpleAtomicIntrinsics: simpleAtomicIntrinsics.o simpleAtomicIntrinsics_cpu.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleCallback/Makefile b/0_Simple/simpleCallback/Makefile
-index 981127d..54b3772 100644
+index 981127d..40366af 100644
--- a/0_Simple/simpleCallback/Makefile
+++ b/0_Simple/simpleCallback/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -532,12 +542,12 @@ index 981127d..54b3772 100644
simpleCallback: simpleCallback.o multithreading.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleCubemapTexture/Makefile b/0_Simple/simpleCubemapTexture/Makefile
-index 6d9956d..4e3e3c7 100644
+index 6d9956d..2aec1b4 100644
--- a/0_Simple/simpleCubemapTexture/Makefile
+++ b/0_Simple/simpleCubemapTexture/Makefile
@@ -84,14 +84,14 @@ GENCODE_FLAGS := $(GENCODE_SM20) $(GENCODE_SM30)
@@ -563,12 +573,12 @@ index 6d9956d..4e3e3c7 100644
simpleCubemapTexture: simpleCubemapTexture.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleIPC/Makefile b/0_Simple/simpleIPC/Makefile
-index bd2fce8..3687240 100644
+index bd2fce8..12d08bb 100644
--- a/0_Simple/simpleIPC/Makefile
+++ b/0_Simple/simpleIPC/Makefile
@@ -84,14 +84,14 @@ GENCODE_FLAGS := $(GENCODE_SM20) $(GENCODE_SM30)
@@ -594,12 +604,12 @@ index bd2fce8..3687240 100644
simpleIPC: simpleIPC.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleLayeredTexture/Makefile b/0_Simple/simpleLayeredTexture/Makefile
-index 84b8394..4a1a39c 100644
+index 84b8394..e5beed2 100644
--- a/0_Simple/simpleLayeredTexture/Makefile
+++ b/0_Simple/simpleLayeredTexture/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -625,7 +635,7 @@ index 84b8394..4a1a39c 100644
simpleLayeredTexture: simpleLayeredTexture.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
@@ -661,7 +671,7 @@ index 0c94b3f..8ec3b73 100644
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleMultiCopy/Makefile b/0_Simple/simpleMultiCopy/Makefile
-index 97cd76f..b473d5e 100644
+index 97cd76f..4f1279d 100644
--- a/0_Simple/simpleMultiCopy/Makefile
+++ b/0_Simple/simpleMultiCopy/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -687,12 +697,12 @@ index 97cd76f..b473d5e 100644
simpleMultiCopy: simpleMultiCopy.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleMultiGPU/Makefile b/0_Simple/simpleMultiGPU/Makefile
-index d48de7f..8e28c42 100644
+index d48de7f..cd53a32 100644
--- a/0_Simple/simpleMultiGPU/Makefile
+++ b/0_Simple/simpleMultiGPU/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -718,12 +728,12 @@ index d48de7f..8e28c42 100644
simpleMultiGPU: simpleMultiGPU.o
- $(GCC) $(CCFLAGS) -o $@ $< $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $< $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $< $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleP2P/Makefile b/0_Simple/simpleP2P/Makefile
-index f8d760b..9c12714 100644
+index f8d760b..c579a25 100644
--- a/0_Simple/simpleP2P/Makefile
+++ b/0_Simple/simpleP2P/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -749,12 +759,12 @@ index f8d760b..9c12714 100644
simpleP2P: simpleP2P.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simplePitchLinearTexture/Makefile b/0_Simple/simplePitchLinearTexture/Makefile
-index 713ee89..7b97df9 100644
+index 713ee89..8ba983a 100644
--- a/0_Simple/simplePitchLinearTexture/Makefile
+++ b/0_Simple/simplePitchLinearTexture/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -780,12 +790,12 @@ index 713ee89..7b97df9 100644
simplePitchLinearTexture: simplePitchLinearTexture.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simplePrintf/Makefile b/0_Simple/simplePrintf/Makefile
-index 7ea2b5b..2c4aecb 100644
+index 7ea2b5b..b4ae5a2 100644
--- a/0_Simple/simplePrintf/Makefile
+++ b/0_Simple/simplePrintf/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -811,12 +821,12 @@ index 7ea2b5b..2c4aecb 100644
simplePrintf: simplePrintf.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleSeparateCompilation/Makefile b/0_Simple/simpleSeparateCompilation/Makefile
-index 9241c83..b73b44e 100644
+index 9241c83..dcfab4b 100644
--- a/0_Simple/simpleSeparateCompilation/Makefile
+++ b/0_Simple/simpleSeparateCompilation/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM20) $(GENCODE_SM30)
@@ -837,17 +847,26 @@ index 9241c83..b73b44e 100644
CCFLAGS := -m64
endif
endif
+@@ -116,7 +116,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+ # Target rules
+ all: build
+ build: simpleDeviceLibrary.a simpleSeparateCompilation
@@ -129,7 +129,7 @@ simpleSeparateCompilationLink.o: simpleSeparateCompilation.o simpleDeviceLibrary
simpleDeviceLibrary.a: simpleDeviceLibrary.o
$(NVCC) $(NVCCFLAGS) -lib -o $@ $<
simpleSeparateCompilation: simpleSeparateCompilation.o simpleDeviceLibrary.a simpleSeparateCompilationLink.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
run: build
diff --git a/0_Simple/simpleStreams/Makefile b/0_Simple/simpleStreams/Makefile
-index 143f222..37ce37b 100644
+index 143f222..156106e 100644
--- a/0_Simple/simpleStreams/Makefile
+++ b/0_Simple/simpleStreams/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -873,12 +892,12 @@ index 143f222..37ce37b 100644
simpleStreams: simpleStreams.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleSurfaceWrite/Makefile b/0_Simple/simpleSurfaceWrite/Makefile
-index edef03d..8d4d120 100644
+index edef03d..2be711a 100644
--- a/0_Simple/simpleSurfaceWrite/Makefile
+++ b/0_Simple/simpleSurfaceWrite/Makefile
@@ -84,14 +84,14 @@ GENCODE_FLAGS := $(GENCODE_SM20) $(GENCODE_SM30)
@@ -904,12 +923,12 @@ index edef03d..8d4d120 100644
simpleSurfaceWrite: simpleSurfaceWrite.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleTemplates/Makefile b/0_Simple/simpleTemplates/Makefile
-index 42c0714..4521c46 100644
+index 42c0714..e86504f 100644
--- a/0_Simple/simpleTemplates/Makefile
+++ b/0_Simple/simpleTemplates/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -930,17 +949,26 @@ index 42c0714..4521c46 100644
CCFLAGS := -m64
endif
endif
+@@ -116,7 +116,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += -lpthread
++LIBS += -lpthread
+
+ # Target rules
+ all: build
@@ -127,7 +127,7 @@ simpleTemplates.o: simpleTemplates.cu
$(NVCC) $(NVCCFLAGS) $(EXTRA_NVCCFLAGS) $(GENCODE_FLAGS) $(INCLUDES) -o $@ -c $<
simpleTemplates: simpleTemplates.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleTexture/Makefile b/0_Simple/simpleTexture/Makefile
-index d09bdf4..ccb55c5 100644
+index d09bdf4..a4b6396 100644
--- a/0_Simple/simpleTexture/Makefile
+++ b/0_Simple/simpleTexture/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -966,12 +994,12 @@ index d09bdf4..ccb55c5 100644
simpleTexture: simpleTexture.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleTextureDrv/Makefile b/0_Simple/simpleTextureDrv/Makefile
-index c956d71..7ae41e2 100644
+index c956d71..d5c61b1 100644
--- a/0_Simple/simpleTextureDrv/Makefile
+++ b/0_Simple/simpleTextureDrv/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -997,12 +1025,12 @@ index c956d71..7ae41e2 100644
simpleTextureDrv: simpleTextureDrv.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleVoteIntrinsics/Makefile b/0_Simple/simpleVoteIntrinsics/Makefile
-index c15724f..23e567e 100644
+index c15724f..2ac07dd 100644
--- a/0_Simple/simpleVoteIntrinsics/Makefile
+++ b/0_Simple/simpleVoteIntrinsics/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM12) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1028,12 +1056,12 @@ index c15724f..23e567e 100644
simpleVoteIntrinsics: simpleVoteIntrinsics.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/simpleZeroCopy/Makefile b/0_Simple/simpleZeroCopy/Makefile
-index 92b20f7..9c5aaf0 100644
+index 92b20f7..f5f1a55 100644
--- a/0_Simple/simpleZeroCopy/Makefile
+++ b/0_Simple/simpleZeroCopy/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1059,12 +1087,12 @@ index 92b20f7..9c5aaf0 100644
simpleZeroCopy: simpleZeroCopy.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/template/Makefile b/0_Simple/template/Makefile
-index 207241b..44eb8ba 100644
+index 207241b..4fc0e8e 100644
--- a/0_Simple/template/Makefile
+++ b/0_Simple/template/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1085,17 +1113,26 @@ index 207241b..44eb8ba 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -131,7 +131,7 @@ template_cpu.o: template_cpu.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
template: template.o template_cpu.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/template_runtime/Makefile b/0_Simple/template_runtime/Makefile
-index 79faf0b..3130468 100644
+index 79faf0b..26ca132 100644
--- a/0_Simple/template_runtime/Makefile
+++ b/0_Simple/template_runtime/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1116,17 +1153,26 @@ index 79faf0b..3130468 100644
CCFLAGS := -m64
endif
endif
+@@ -120,7 +120,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -131,7 +131,7 @@ template_runtime.o: template_runtime.cu
$(NVCC) $(NVCCFLAGS) $(EXTRA_NVCCFLAGS) $(GENCODE_FLAGS) $(INCLUDES) -o $@ -c $<
template_runtime: template_runtime.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/vectorAdd/Makefile b/0_Simple/vectorAdd/Makefile
-index b00b03b..7e23c21 100644
+index b00b03b..897ba46 100644
--- a/0_Simple/vectorAdd/Makefile
+++ b/0_Simple/vectorAdd/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1152,12 +1198,12 @@ index b00b03b..7e23c21 100644
vectorAdd: vectorAdd.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/0_Simple/vectorAddDrv/Makefile b/0_Simple/vectorAddDrv/Makefile
-index 9b313a8..2fc9538 100644
+index 9b313a8..8976a01 100644
--- a/0_Simple/vectorAddDrv/Makefile
+++ b/0_Simple/vectorAddDrv/Makefile
@@ -79,14 +79,14 @@ EXTRA_LDFLAGS ?=
@@ -1183,12 +1229,12 @@ index 9b313a8..2fc9538 100644
vectorAddDrv: vectorAddDrv.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/1_Utilities/bandwidthTest/Makefile b/1_Utilities/bandwidthTest/Makefile
-index 542aabe..c44c7d0 100644
+index 542aabe..d479c28 100644
--- a/1_Utilities/bandwidthTest/Makefile
+++ b/1_Utilities/bandwidthTest/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1214,12 +1260,12 @@ index 542aabe..c44c7d0 100644
bandwidthTest: bandwidthTest.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/1_Utilities/deviceQuery/Makefile b/1_Utilities/deviceQuery/Makefile
-index d2aae37..d67d72c 100644
+index d2aae37..b85b2da 100644
--- a/1_Utilities/deviceQuery/Makefile
+++ b/1_Utilities/deviceQuery/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1245,12 +1291,12 @@ index d2aae37..d67d72c 100644
deviceQuery: deviceQuery.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/1_Utilities/deviceQueryDrv/Makefile b/1_Utilities/deviceQueryDrv/Makefile
-index b8c2ca0..9f3e0d9 100644
+index b8c2ca0..db11308 100644
--- a/1_Utilities/deviceQueryDrv/Makefile
+++ b/1_Utilities/deviceQueryDrv/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1276,12 +1322,12 @@ index b8c2ca0..9f3e0d9 100644
deviceQueryDrv: deviceQueryDrv.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/2_Graphics/Mandelbrot/Makefile b/2_Graphics/Mandelbrot/Makefile
-index c4ffa10..19b98f5 100644
+index c4ffa10..5d84025 100644
--- a/2_Graphics/Mandelbrot/Makefile
+++ b/2_Graphics/Mandelbrot/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM11) $(GENCODE_SM13) $(GENCODE_SM20) $(GENCODE_SM3
@@ -1302,17 +1348,26 @@ index c4ffa10..19b98f5 100644
CCFLAGS := -m64
endif
endif
+@@ -128,7 +128,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -145,7 +145,7 @@ Mandelbrot.o: Mandelbrot.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
Mandelbrot: Mandelbrot.o Mandelbrot_gold.o Mandelbrot_cuda.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/2_Graphics/bindlessTexture/Makefile b/2_Graphics/bindlessTexture/Makefile
-index 837d53c..0325e88 100644
+index 837d53c..d349d6c 100644
--- a/2_Graphics/bindlessTexture/Makefile
+++ b/2_Graphics/bindlessTexture/Makefile
@@ -83,14 +83,14 @@ GENCODE_SM30 := -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,
@@ -1333,17 +1388,26 @@ index 837d53c..0325e88 100644
CCFLAGS := -m64
endif
endif
+@@ -122,7 +122,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -136,7 +136,7 @@ bindlessTexture.o: bindlessTexture.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
bindlessTexture: bindlessTexture.o bindlessTexture_kernel.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/2_Graphics/marchingCubes/Makefile b/2_Graphics/marchingCubes/Makefile
-index 0480ab6..25967a6 100644
+index 0480ab6..d863ee1 100644
--- a/2_Graphics/marchingCubes/Makefile
+++ b/2_Graphics/marchingCubes/Makefile
@@ -85,14 +85,14 @@ GENCODE_SM30 := -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,
@@ -1364,17 +1428,26 @@ index 0480ab6..25967a6 100644
CCFLAGS := -m64
endif
endif
+@@ -124,7 +124,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -138,7 +138,7 @@ marchingCubes.o: marchingCubes.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
marchingCubes: marchingCubes.o marchingCubes_kernel.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/2_Graphics/simpleGL/Makefile b/2_Graphics/simpleGL/Makefile
-index c6de39a..06739aa 100644
+index c6de39a..716e6ed 100644
--- a/2_Graphics/simpleGL/Makefile
+++ b/2_Graphics/simpleGL/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1395,17 +1468,26 @@ index c6de39a..06739aa 100644
CCFLAGS := -m64
endif
endif
+@@ -125,7 +125,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -136,7 +136,7 @@ simpleGL.o: simpleGL.cu
$(NVCC) $(NVCCFLAGS) $(EXTRA_NVCCFLAGS) $(GENCODE_FLAGS) $(INCLUDES) -o $@ -c $<
simpleGL: simpleGL.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/2_Graphics/simpleTexture3D/Makefile b/2_Graphics/simpleTexture3D/Makefile
-index efd9f4e..73fb364 100644
+index efd9f4e..a28d74a 100644
--- a/2_Graphics/simpleTexture3D/Makefile
+++ b/2_Graphics/simpleTexture3D/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1426,17 +1508,26 @@ index efd9f4e..73fb364 100644
CCFLAGS := -m64
endif
endif
+@@ -125,7 +125,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -139,7 +139,7 @@ simpleTexture3D.o: simpleTexture3D.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
simpleTexture3D: simpleTexture3D.o simpleTexture3D_kernel.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/2_Graphics/volumeFiltering/Makefile b/2_Graphics/volumeFiltering/Makefile
-index eea0465..fe41e1d 100644
+index eea0465..601664f 100644
--- a/2_Graphics/volumeFiltering/Makefile
+++ b/2_Graphics/volumeFiltering/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1457,17 +1548,26 @@ index eea0465..fe41e1d 100644
CCFLAGS := -m64
endif
endif
+@@ -125,7 +125,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -145,7 +145,7 @@ volume.o: volume.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
volumeFiltering: volumeRender_kernel.o volumeFilter_kernel.o volumeFiltering.o volume.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/2_Graphics/volumeRender/Makefile b/2_Graphics/volumeRender/Makefile
-index 099c240..cfba18f 100644
+index 099c240..f508e1d 100644
--- a/2_Graphics/volumeRender/Makefile
+++ b/2_Graphics/volumeRender/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1488,17 +1588,26 @@ index 099c240..cfba18f 100644
CCFLAGS := -m64
endif
endif
+@@ -125,7 +125,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -139,7 +139,7 @@ volumeRender.o: volumeRender.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
volumeRender: volumeRender_kernel.o volumeRender.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/HSOpticalFlow/Makefile b/3_Imaging/HSOpticalFlow/Makefile
-index 801cc3c..81abd39 100644
+index 801cc3c..70db97e 100644
--- a/3_Imaging/HSOpticalFlow/Makefile
+++ b/3_Imaging/HSOpticalFlow/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1524,12 +1633,12 @@ index 801cc3c..81abd39 100644
HSOpticalFlow: flowCUDA.o main.o flowGold.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/SobelFilter/Makefile b/3_Imaging/SobelFilter/Makefile
-index ee33c09..200a770 100644
+index ee33c09..7d28664 100644
--- a/3_Imaging/SobelFilter/Makefile
+++ b/3_Imaging/SobelFilter/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1550,17 +1659,26 @@ index ee33c09..200a770 100644
CCFLAGS := -m64
endif
endif
+@@ -126,7 +126,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -140,7 +140,7 @@ SobelFilter.o: SobelFilter.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
SobelFilter: SobelFilter.o SobelFilter_kernels.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/bicubicTexture/Makefile b/3_Imaging/bicubicTexture/Makefile
-index cc84556..5b79ebe 100644
+index cc84556..90ddc28 100644
--- a/3_Imaging/bicubicTexture/Makefile
+++ b/3_Imaging/bicubicTexture/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1581,17 +1699,26 @@ index cc84556..5b79ebe 100644
CCFLAGS := -m64
endif
endif
+@@ -125,7 +125,7 @@ endif
+
+ # Common includes and paths for CUDA, NPP, and FreeImage Libray
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -139,7 +139,7 @@ bicubicTexture.o: bicubicTexture.cpp
$(GCC) $(CCFLAGS) $(INCLUDES) -o $@ -c $<
bicubicTexture: bicubicTexture.o bicubicTexture_cuda.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/bilateralFilter/Makefile b/3_Imaging/bilateralFilter/Makefile
-index 75394b7..9f7826a 100644
+index 75394b7..7db32d4 100644
--- a/3_Imaging/bilateralFilter/Makefile
+++ b/3_Imaging/bilateralFilter/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1612,17 +1739,26 @@ index 75394b7..9f7826a 100644
CCFLAGS := -m64
endif
endif
+@@ -125,7 +125,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -145,7 +145,7 @@ bmploader.o: bmploader.cpp
$(GCC) $(CCFLAGS) $(INCLUDES) -o $@ -c $<
bilateralFilter: bilateralFilter.o bilateralFilter_cpu.o bilateral_kernel.o bmploader.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/boxFilter/Makefile b/3_Imaging/boxFilter/Makefile
-index 48c6abc..817f4b4 100644
+index 48c6abc..0516c22 100644
--- a/3_Imaging/boxFilter/Makefile
+++ b/3_Imaging/boxFilter/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1643,17 +1779,26 @@ index 48c6abc..817f4b4 100644
CCFLAGS := -m64
endif
endif
+@@ -126,7 +126,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -143,7 +143,7 @@ boxFilter.o: boxFilter.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
boxFilter: boxFilter.o boxFilter_cpu.o boxFilter_kernel.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/convolutionFFT2D/Makefile b/3_Imaging/convolutionFFT2D/Makefile
-index 477bade..84459ff 100644
+index 477bade..91caee5 100644
--- a/3_Imaging/convolutionFFT2D/Makefile
+++ b/3_Imaging/convolutionFFT2D/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1679,12 +1824,12 @@ index 477bade..84459ff 100644
convolutionFFT2D: main.o convolutionFFT2D_gold.o convolutionFFT2D.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/convolutionSeparable/Makefile b/3_Imaging/convolutionSeparable/Makefile
-index 57c964d..724e52d 100644
+index 57c964d..4a3f81b 100644
--- a/3_Imaging/convolutionSeparable/Makefile
+++ b/3_Imaging/convolutionSeparable/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1710,12 +1855,12 @@ index 57c964d..724e52d 100644
convolutionSeparable: main.o convolutionSeparable_gold.o convolutionSeparable.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/convolutionTexture/Makefile b/3_Imaging/convolutionTexture/Makefile
-index dcceab9..7f43fcd 100644
+index dcceab9..3449940 100644
--- a/3_Imaging/convolutionTexture/Makefile
+++ b/3_Imaging/convolutionTexture/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1741,12 +1886,12 @@ index dcceab9..7f43fcd 100644
convolutionTexture: main.o convolutionTexture_gold.o convolutionTexture.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/dct8x8/Makefile b/3_Imaging/dct8x8/Makefile
-index 6631548..1da09c3 100644
+index 6631548..c121894 100644
--- a/3_Imaging/dct8x8/Makefile
+++ b/3_Imaging/dct8x8/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1767,17 +1912,26 @@ index 6631548..1da09c3 100644
CCFLAGS := -m64
endif
endif
+@@ -116,7 +116,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -133,7 +133,7 @@ DCT8x8_Gold.o: DCT8x8_Gold.cpp
$(GCC) $(CCFLAGS) $(INCLUDES) -o $@ -c $<
dct8x8: dct8x8.o BmpUtil.o DCT8x8_Gold.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/dwtHaar1D/Makefile b/3_Imaging/dwtHaar1D/Makefile
-index aa8c9a8..56a3b78 100644
+index aa8c9a8..885e1cd 100644
--- a/3_Imaging/dwtHaar1D/Makefile
+++ b/3_Imaging/dwtHaar1D/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1803,12 +1957,12 @@ index aa8c9a8..56a3b78 100644
dwtHaar1D: dwtHaar1D.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/dxtc/Makefile b/3_Imaging/dxtc/Makefile
-index 4d6b05b..08f5209 100644
+index 4d6b05b..3f48ba5 100644
--- a/3_Imaging/dxtc/Makefile
+++ b/3_Imaging/dxtc/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1834,12 +1988,12 @@ index 4d6b05b..08f5209 100644
dxtc: dxtc.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/histogram/Makefile b/3_Imaging/histogram/Makefile
-index 67ea4d2..2fa0152 100644
+index 67ea4d2..183fa3c 100644
--- a/3_Imaging/histogram/Makefile
+++ b/3_Imaging/histogram/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1865,12 +2019,12 @@ index 67ea4d2..2fa0152 100644
histogram: histogram64.o histogram256.o histogram_gold.o main.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/imageDenoising/Makefile b/3_Imaging/imageDenoising/Makefile
-index 05ef7ef..157acde 100644
+index 05ef7ef..57351f0 100644
--- a/3_Imaging/imageDenoising/Makefile
+++ b/3_Imaging/imageDenoising/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1891,17 +2045,26 @@ index 05ef7ef..157acde 100644
CCFLAGS := -m64
endif
endif
+@@ -126,7 +126,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -143,7 +143,7 @@ bmploader.o: bmploader.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
imageDenoising: imageDenoising.o imageDenoisingGL.o bmploader.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/postProcessGL/Makefile b/3_Imaging/postProcessGL/Makefile
-index 8b089f2..4d3db9a 100644
+index 8b089f2..ea5e62d 100644
--- a/3_Imaging/postProcessGL/Makefile
+++ b/3_Imaging/postProcessGL/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1922,17 +2085,26 @@ index 8b089f2..4d3db9a 100644
CCFLAGS := -m64
endif
endif
+@@ -126,7 +126,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -140,7 +140,7 @@ main.o: main.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
postProcessGL: main.o postProcessGL.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/recursiveGaussian/Makefile b/3_Imaging/recursiveGaussian/Makefile
-index bd37f8e..ad7bdb7 100644
+index bd37f8e..e230068 100644
--- a/3_Imaging/recursiveGaussian/Makefile
+++ b/3_Imaging/recursiveGaussian/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1953,17 +2125,26 @@ index bd37f8e..ad7bdb7 100644
CCFLAGS := -m64
endif
endif
+@@ -126,7 +126,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -140,7 +140,7 @@ main.o: recursiveGaussian.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
recursiveGaussian: recursiveGaussian.o main.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/3_Imaging/stereoDisparity/Makefile b/3_Imaging/stereoDisparity/Makefile
-index 4e78b24..9673024 100644
+index 4e78b24..ea24e6c 100644
--- a/3_Imaging/stereoDisparity/Makefile
+++ b/3_Imaging/stereoDisparity/Makefile
@@ -84,14 +84,14 @@ GENCODE_FLAGS := $(GENCODE_SM20) $(GENCODE_SM30)
@@ -1989,12 +2170,12 @@ index 4e78b24..9673024 100644
stereoDisparity: stereoDisparity.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/4_Finance/BlackScholes/Makefile b/4_Finance/BlackScholes/Makefile
-index fcee3a9..2666b65 100644
+index fcee3a9..af2e0ca 100644
--- a/4_Finance/BlackScholes/Makefile
+++ b/4_Finance/BlackScholes/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2020,12 +2201,12 @@ index fcee3a9..2666b65 100644
BlackScholes: BlackScholes.o BlackScholes_gold.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/4_Finance/MonteCarloMultiGPU/Makefile b/4_Finance/MonteCarloMultiGPU/Makefile
-index 34d5c55..32d7c11 100644
+index 34d5c55..70e1b1e 100644
--- a/4_Finance/MonteCarloMultiGPU/Makefile
+++ b/4_Finance/MonteCarloMultiGPU/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2051,12 +2232,12 @@ index 34d5c55..32d7c11 100644
MonteCarloMultiGPU: MonteCarloMultiGPU.o multithreading.o MonteCarlo_gold.o MonteCarlo_kernel.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/4_Finance/SobolQRNG/Makefile b/4_Finance/SobolQRNG/Makefile
-index fbc7c4c..82f1188 100644
+index fbc7c4c..9717d99 100644
--- a/4_Finance/SobolQRNG/Makefile
+++ b/4_Finance/SobolQRNG/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2082,12 +2263,12 @@ index fbc7c4c..82f1188 100644
SobolQRNG: sobol.o sobol_gold.o sobol_primitives.o sobol_gpu.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/4_Finance/binomialOptions/Makefile b/4_Finance/binomialOptions/Makefile
-index 4b7f1b0..013dd1e 100644
+index 4b7f1b0..fc40e63 100644
--- a/4_Finance/binomialOptions/Makefile
+++ b/4_Finance/binomialOptions/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2113,12 +2294,12 @@ index 4b7f1b0..013dd1e 100644
binomialOptions: binomialOptions.o binomialOptions_gold.o binomialOptions_SM10.o binomialOptions_SM13.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/4_Finance/quasirandomGenerator/Makefile b/4_Finance/quasirandomGenerator/Makefile
-index 7c85a8f..284f2d2 100644
+index 7c85a8f..cddcbea 100644
--- a/4_Finance/quasirandomGenerator/Makefile
+++ b/4_Finance/quasirandomGenerator/Makefile
@@ -85,14 +85,14 @@ GENCODE_SM30 := -gencode arch=compute_30,code=sm_30 -gencode arch=compute_35,
@@ -2144,12 +2325,12 @@ index 7c85a8f..284f2d2 100644
quasirandomGenerator: quasirandomGenerator.o quasirandomGenerator_gold.o quasirandomGenerator_SM10.o quasirandomGenerator_SM13.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/5_Simulations/fluidsGL/Makefile b/5_Simulations/fluidsGL/Makefile
-index 613142b..1a77bf2 100644
+index 613142b..1f4618c 100644
--- a/5_Simulations/fluidsGL/Makefile
+++ b/5_Simulations/fluidsGL/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2170,17 +2351,26 @@ index 613142b..1a77bf2 100644
CCFLAGS := -m64
endif
endif
+@@ -126,7 +126,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -140,7 +140,7 @@ fluidsGL.o: fluidsGL.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
fluidsGL: fluidsGL.o fluidsGL_kernels.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/5_Simulations/nbody/Makefile b/5_Simulations/nbody/Makefile
-index 9064c65..eba4a0f 100644
+index 9064c65..9e6f304 100644
--- a/5_Simulations/nbody/Makefile
+++ b/5_Simulations/nbody/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2201,17 +2391,26 @@ index 9064c65..eba4a0f 100644
CCFLAGS := -m64
endif
endif
+@@ -127,7 +127,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -144,7 +144,7 @@ render_particles.o: render_particles.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
nbody: nbody.o bodysystemcuda.o render_particles.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/5_Simulations/oceanFFT/Makefile b/5_Simulations/oceanFFT/Makefile
-index d20c837..7440f63 100644
+index d20c837..28ad256 100644
--- a/5_Simulations/oceanFFT/Makefile
+++ b/5_Simulations/oceanFFT/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2232,17 +2431,48 @@ index d20c837..7440f63 100644
CCFLAGS := -m64
endif
endif
+@@ -126,7 +126,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -140,7 +140,7 @@ oceanFFT.o: oceanFFT.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
oceanFFT: oceanFFT.o oceanFFT_kernel.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
+diff --git a/5_Simulations/oceanFFT/Makefile2 b/5_Simulations/oceanFFT/Makefile2
+index 48b911c..657e68b 100644
+--- a/5_Simulations/oceanFFT/Makefile2
++++ b/5_Simulations/oceanFFT/Makefile2
+@@ -111,7 +111,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I. -I.. -I../../common/inc -I$(CUDA_INC_PATH)
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
+@@ -125,7 +125,7 @@ oceanFFT.o: oceanFFT.cpp
+ $(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
+
+ oceanFFT: oceanFFT.o oceanFFT_kernels.cu
+- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
+
+ run: build
+ ./oceanFFT
diff --git a/5_Simulations/particles/Makefile b/5_Simulations/particles/Makefile
-index cbf337b..fe6c637 100644
+index cbf337b..54a88fb 100644
--- a/5_Simulations/particles/Makefile
+++ b/5_Simulations/particles/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2263,17 +2493,26 @@ index cbf337b..fe6c637 100644
CCFLAGS := -m64
endif
endif
+@@ -127,7 +127,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -150,7 +150,7 @@ shaders.o: shaders.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
particles: particles.o particleSystem_cuda.o particleSystem.o render_particles.o shaders.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/5_Simulations/smokeParticles/Makefile b/5_Simulations/smokeParticles/Makefile
-index bfc2fff..3d1e247 100644
+index bfc2fff..40ee13c 100644
--- a/5_Simulations/smokeParticles/Makefile
+++ b/5_Simulations/smokeParticles/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2294,17 +2533,26 @@ index bfc2fff..3d1e247 100644
CCFLAGS := -m64
endif
endif
+@@ -127,7 +127,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -159,7 +159,7 @@ GLSLProgram.o: GLSLProgram.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
smokeParticles: particleDemo.o ParticleSystem_cuda.o ParticleSystem.o SmokeRenderer.o SmokeShaders.o framebufferObject.o renderbuffer.o GLSLProgram.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/FDTD3d/Makefile b/6_Advanced/FDTD3d/Makefile
-index f63a33e..bf14f6e 100644
+index f63a33e..33b9f11 100644
--- a/6_Advanced/FDTD3d/Makefile
+++ b/6_Advanced/FDTD3d/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2325,17 +2573,26 @@ index f63a33e..bf14f6e 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I. -I.. -Iinc/ -I../../common/inc -I$(CUDA_INC_PATH)
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -134,7 +134,7 @@ FDTD3d.o: src/FDTD3d.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
FDTD3d: FDTD3d.o FDTD3dReference.o FDTD3dGPU.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/FunctionPointers/Makefile b/6_Advanced/FunctionPointers/Makefile
-index 60e8d32..e26ca99 100644
+index 60e8d32..e626684 100644
--- a/6_Advanced/FunctionPointers/Makefile
+++ b/6_Advanced/FunctionPointers/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2356,17 +2613,26 @@ index 60e8d32..e26ca99 100644
CCFLAGS := -m64
endif
endif
+@@ -125,7 +125,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -139,7 +139,7 @@ FunctionPointers.o: FunctionPointers.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
FunctionPointers: FunctionPointers.o FunctionPointers_kernels.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/alignedTypes/Makefile b/6_Advanced/alignedTypes/Makefile
-index 8dbee0f..04b79ff 100644
+index 8dbee0f..1348875 100644
--- a/6_Advanced/alignedTypes/Makefile
+++ b/6_Advanced/alignedTypes/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2392,12 +2658,12 @@ index 8dbee0f..04b79ff 100644
alignedTypes: alignedTypes.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/cdpAdvancedQuicksort/Makefile b/6_Advanced/cdpAdvancedQuicksort/Makefile
-index 4ac691c..1cb8a07 100644
+index 4ac691c..6861d1a 100644
--- a/6_Advanced/cdpAdvancedQuicksort/Makefile
+++ b/6_Advanced/cdpAdvancedQuicksort/Makefile
@@ -83,10 +83,10 @@ GENCODE_FLAGS := $(GENCODE_SM35)
@@ -2418,12 +2684,12 @@ index 4ac691c..1cb8a07 100644
cdpAdvancedQuicksort: cdpAdvancedQuicksort.o cdpBitonicSort.o
- $(NVCC) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(NVCC) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(NVCC) $(LDFLAGS) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/cdpLUDecomposition/Makefile b/6_Advanced/cdpLUDecomposition/Makefile
-index 9312fc4..3525728 100644
+index 9312fc4..c22a63b 100644
--- a/6_Advanced/cdpLUDecomposition/Makefile
+++ b/6_Advanced/cdpLUDecomposition/Makefile
@@ -83,10 +83,10 @@ GENCODE_FLAGS := $(GENCODE_SM35)
@@ -2444,12 +2710,12 @@ index 9312fc4..3525728 100644
cdpLUDecomposition: dlaswp.o dgetf2.o dgetrf.o cdp_lu.o cdp_lu_main.o
- $(NVCC) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(NVCC) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(NVCC) $(LDFLAGS) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/cdpQuadtree/Makefile b/6_Advanced/cdpQuadtree/Makefile
-index 185e63a..c7aa9db 100644
+index 185e63a..e9aaf77 100644
--- a/6_Advanced/cdpQuadtree/Makefile
+++ b/6_Advanced/cdpQuadtree/Makefile
@@ -84,10 +84,10 @@ GENCODE_FLAGS := $(GENCODE_SM35)
@@ -2470,12 +2736,12 @@ index 185e63a..c7aa9db 100644
cdpQuadtree: cdpQuadtree.o
- $(NVCC) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(NVCC) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(NVCC) $(LDFLAGS) $(CCFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/concurrentKernels/Makefile b/6_Advanced/concurrentKernels/Makefile
-index 61f7a8c..59915cf 100644
+index 61f7a8c..96259bf 100644
--- a/6_Advanced/concurrentKernels/Makefile
+++ b/6_Advanced/concurrentKernels/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2501,12 +2767,12 @@ index 61f7a8c..59915cf 100644
concurrentKernels: concurrentKernels.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/eigenvalues/Makefile b/6_Advanced/eigenvalues/Makefile
-index be3bcc9..d456bd3 100644
+index be3bcc9..b55885c 100644
--- a/6_Advanced/eigenvalues/Makefile
+++ b/6_Advanced/eigenvalues/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2527,17 +2793,26 @@ index be3bcc9..d456bd3 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -143,7 +143,7 @@ matlab.o: matlab.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
eigenvalues: main.o bisect_small.o bisect_large.o bisect_util.o gerschgorin.o matlab.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/fastWalshTransform/Makefile b/6_Advanced/fastWalshTransform/Makefile
-index 5d13a7f..ff20d43 100644
+index 5d13a7f..6ce7b68 100644
--- a/6_Advanced/fastWalshTransform/Makefile
+++ b/6_Advanced/fastWalshTransform/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2558,17 +2833,26 @@ index 5d13a7f..ff20d43 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -131,7 +131,7 @@ fastWalshTransform_gold.o: fastWalshTransform_gold.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
fastWalshTransform: fastWalshTransform.o fastWalshTransform_gold.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/interval/Makefile b/6_Advanced/interval/Makefile
-index c0c5542..0389818 100644
+index c0c5542..2b847bc 100644
--- a/6_Advanced/interval/Makefile
+++ b/6_Advanced/interval/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM13) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2589,17 +2873,26 @@ index c0c5542..0389818 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -128,7 +128,7 @@ interval.o: interval.cu interval.h cpu_interval.h cuda_interval.h cuda_interval_
$(NVCC) $(NVCCFLAGS) $(EXTRA_NVCCFLAGS) $(GENCODE_FLAGS) $(INCLUDES) -o $@ -c $<
interval: interval.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/lineOfSight/Makefile b/6_Advanced/lineOfSight/Makefile
-index 33aa71d..f243a14 100644
+index 33aa71d..9020d6e 100644
--- a/6_Advanced/lineOfSight/Makefile
+++ b/6_Advanced/lineOfSight/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2625,12 +2918,12 @@ index 33aa71d..f243a14 100644
lineOfSight: lineOfSight.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/mergeSort/Makefile b/6_Advanced/mergeSort/Makefile
-index b234948..daca946 100644
+index b234948..da903d4 100644
--- a/6_Advanced/mergeSort/Makefile
+++ b/6_Advanced/mergeSort/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2651,17 +2944,26 @@ index b234948..daca946 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -140,7 +140,7 @@ main.o: main.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
mergeSort: main.o mergeSort_validate.o mergeSort_host.o bitonic.o mergeSort.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/newdelete/Makefile b/6_Advanced/newdelete/Makefile
-index 3e4e1f5..163f951 100644
+index 3e4e1f5..a0cd2b8 100644
--- a/6_Advanced/newdelete/Makefile
+++ b/6_Advanced/newdelete/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2682,17 +2984,26 @@ index 3e4e1f5..163f951 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -128,7 +128,7 @@ newdelete.o: newdelete.cu
$(NVCC) $(NVCCFLAGS) $(EXTRA_NVCCFLAGS) $(GENCODE_SM20) $(GENCODE_SM30) $(INCLUDES) -o $@ -c $<
newdelete: newdelete.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/ptxjit/Makefile b/6_Advanced/ptxjit/Makefile
-index 6629483..5e3f032 100644
+index 6629483..b9225ef 100644
--- a/6_Advanced/ptxjit/Makefile
+++ b/6_Advanced/ptxjit/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2718,12 +3029,12 @@ index 6629483..5e3f032 100644
ptxjit: ptxjit.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/radixSortThrust/Makefile b/6_Advanced/radixSortThrust/Makefile
-index a7da345..d27c4be 100644
+index a7da345..4ce697a 100644
--- a/6_Advanced/radixSortThrust/Makefile
+++ b/6_Advanced/radixSortThrust/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2749,12 +3060,12 @@ index a7da345..d27c4be 100644
radixSortThrust: radixSortThrust.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/reduction/Makefile b/6_Advanced/reduction/Makefile
-index 7c929e4..e40891a 100644
+index 7c929e4..7b2275e 100644
--- a/6_Advanced/reduction/Makefile
+++ b/6_Advanced/reduction/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM13) $(GENCODE_SM20) $(GENCODE_SM3
@@ -2780,12 +3091,12 @@ index 7c929e4..e40891a 100644
reduction: reduction.o reduction_kernel.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/scalarProd/Makefile b/6_Advanced/scalarProd/Makefile
-index b2557a3..b5aaab4 100644
+index b2557a3..116df9f 100644
--- a/6_Advanced/scalarProd/Makefile
+++ b/6_Advanced/scalarProd/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2806,17 +3117,26 @@ index b2557a3..b5aaab4 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -131,7 +131,7 @@ scalarProd_cpu.o: scalarProd_cpu.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
scalarProd: scalarProd.o scalarProd_cpu.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/scan/Makefile b/6_Advanced/scan/Makefile
-index 5ef4018..1cb58bf 100644
+index 5ef4018..21849fb 100644
--- a/6_Advanced/scan/Makefile
+++ b/6_Advanced/scan/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2837,17 +3157,26 @@ index 5ef4018..1cb58bf 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -134,7 +134,7 @@ main.o: main.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
scan: scan.o scan_gold.o main.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/segmentationTreeThrust/Makefile b/6_Advanced/segmentationTreeThrust/Makefile
-index f051050..b3e1428 100644
+index f051050..cf64b51 100644
--- a/6_Advanced/segmentationTreeThrust/Makefile
+++ b/6_Advanced/segmentationTreeThrust/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM13) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2868,17 +3197,26 @@ index f051050..b3e1428 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -128,7 +128,7 @@ segmentationTree.o: segmentationTree.cu kernels.cuh common.cuh
$(NVCC) $(NVCCFLAGS) $(EXTRA_NVCCFLAGS) $(GENCODE_SM13) $(GENCODE_SM20) $(GENCODE_SM30) $(INCLUDES) -o $@ -c $<
segmentationTreeThrust: segmentationTree.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/shfl_scan/Makefile b/6_Advanced/shfl_scan/Makefile
-index 90d2bb8..731c467 100644
+index 90d2bb8..663a40d 100644
--- a/6_Advanced/shfl_scan/Makefile
+++ b/6_Advanced/shfl_scan/Makefile
@@ -84,14 +84,14 @@ GENCODE_FLAGS := $(GENCODE_SM30)
@@ -2899,17 +3237,26 @@ index 90d2bb8..731c467 100644
CCFLAGS := -m64
endif
endif
+@@ -115,7 +115,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -126,7 +126,7 @@ shfl_scan.o: shfl_scan.cu
$(NVCC) $(NVCCFLAGS) $(EXTRA_NVCCFLAGS) $(GENCODE_FLAGS) $(INCLUDES) -o $@ -c $<
shfl_scan: shfl_scan.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/simpleHyperQ/Makefile b/6_Advanced/simpleHyperQ/Makefile
-index 4e3aef8..6da8b52 100644
+index 4e3aef8..098856c 100644
--- a/6_Advanced/simpleHyperQ/Makefile
+++ b/6_Advanced/simpleHyperQ/Makefile
@@ -77,14 +77,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2935,12 +3282,12 @@ index 4e3aef8..6da8b52 100644
simpleHyperQ: simpleHyperQ.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/sortingNetworks/Makefile b/6_Advanced/sortingNetworks/Makefile
-index 1f41677..3884eee 100644
+index 1f41677..be92370 100644
--- a/6_Advanced/sortingNetworks/Makefile
+++ b/6_Advanced/sortingNetworks/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2961,17 +3308,26 @@ index 1f41677..3884eee 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -137,7 +137,7 @@ sortingNetworks_validate.o: sortingNetworks_validate.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
sortingNetworks: bitonicSort.o oddEvenMergeSort.o main.o sortingNetworks_validate.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/threadFenceReduction/Makefile b/6_Advanced/threadFenceReduction/Makefile
-index ee1d519..7f17243 100644
+index ee1d519..f4df7f9 100644
--- a/6_Advanced/threadFenceReduction/Makefile
+++ b/6_Advanced/threadFenceReduction/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM11) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -2992,17 +3348,26 @@ index ee1d519..7f17243 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -128,7 +128,7 @@ threadFenceReduction.o: threadFenceReduction.cu threadFenceReduction_kernel.cuh
$(NVCC) $(NVCCFLAGS) $(EXTRA_NVCCFLAGS) $(GENCODE_FLAGS) $(INCLUDES) -o $@ -c $<
threadFenceReduction: threadFenceReduction.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/threadMigration/Makefile b/6_Advanced/threadMigration/Makefile
-index 9993842..907d352 100644
+index 9993842..d0f0775 100644
--- a/6_Advanced/threadMigration/Makefile
+++ b/6_Advanced/threadMigration/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3023,17 +3388,26 @@ index 9993842..907d352 100644
CCFLAGS := -m64
endif
endif
+@@ -119,7 +119,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -Iinc/ -I../../common/inc
+-LDFLAGS += $(LIBPATH_OPENGL)
++LIBS += $(LIBPATH_OPENGL)
+
+ # Target rules
+ all: build
@@ -135,7 +135,7 @@ threadMigration.o: threadMigration.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
threadMigration: threadMigration.o
- $(GCC) $(CCFLAGS) -o $@ $< $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $< $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $< $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/6_Advanced/transpose/Makefile b/6_Advanced/transpose/Makefile
-index fa4ab92..04f5daf 100644
+index fa4ab92..fda0ebd 100644
--- a/6_Advanced/transpose/Makefile
+++ b/6_Advanced/transpose/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3059,12 +3433,12 @@ index fa4ab92..04f5daf 100644
transpose: transpose.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/MC_EstimatePiInlineP/Makefile b/7_CUDALibraries/MC_EstimatePiInlineP/Makefile
-index c3592ee..1e1e141 100644
+index c3592ee..ae152aa 100644
--- a/7_CUDALibraries/MC_EstimatePiInlineP/Makefile
+++ b/7_CUDALibraries/MC_EstimatePiInlineP/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM13) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3085,17 +3459,26 @@ index c3592ee..1e1e141 100644
CCFLAGS := -m64
endif
endif
+@@ -119,7 +119,7 @@ endif
+
+ # Common includes and paths for CUDA, CURAND
+ INCLUDES := -Iinc/ -I$(CUDA_INC_PATH) -I../../common/inc
+-LDFLAGS += -lcurand
++LIBS += -lcurand
+
+ # Target rules
+ all: build
@@ -136,7 +136,7 @@ test.o: src/test.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
MC_EstimatePiInlineP: piestimator.o main.o test.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/MC_EstimatePiInlineQ/Makefile b/7_CUDALibraries/MC_EstimatePiInlineQ/Makefile
-index d95628e..557ed91 100644
+index d95628e..e883d92 100644
--- a/7_CUDALibraries/MC_EstimatePiInlineQ/Makefile
+++ b/7_CUDALibraries/MC_EstimatePiInlineQ/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM13) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3116,17 +3499,26 @@ index d95628e..557ed91 100644
CCFLAGS := -m64
endif
endif
+@@ -119,7 +119,7 @@ endif
+
+ # Common includes and paths for CUDA, CURAND
+ INCLUDES := -Iinc/ -I$(CUDA_INC_PATH) -I../../common/inc
+-LDFLAGS += -lcurand
++LIBS += -lcurand
+
+ # Target rules
+ all: build
@@ -136,7 +136,7 @@ test.o: src/test.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
MC_EstimatePiInlineQ: piestimator.o main.o test.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/MC_EstimatePiP/Makefile b/7_CUDALibraries/MC_EstimatePiP/Makefile
-index b4ceb02..ca36a15 100644
+index b4ceb02..576e0f0 100644
--- a/7_CUDALibraries/MC_EstimatePiP/Makefile
+++ b/7_CUDALibraries/MC_EstimatePiP/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM13) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3147,17 +3539,26 @@ index b4ceb02..ca36a15 100644
CCFLAGS := -m64
endif
endif
+@@ -119,7 +119,7 @@ endif
+
+ # Common includes and paths for CUDA, CURAND
+ INCLUDES := -Iinc/ -I$(CUDA_INC_PATH) -I../../common/inc
+-LDFLAGS += -lcurand
++LIBS += -lcurand
+
+ # Target rules
+ all: build
@@ -136,7 +136,7 @@ test.o: src/test.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
MC_EstimatePiP: piestimator.o main.o test.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/MC_EstimatePiQ/Makefile b/7_CUDALibraries/MC_EstimatePiQ/Makefile
-index 6ba6a31..961c375 100644
+index 6ba6a31..160a1d2 100644
--- a/7_CUDALibraries/MC_EstimatePiQ/Makefile
+++ b/7_CUDALibraries/MC_EstimatePiQ/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM13) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3178,17 +3579,26 @@ index 6ba6a31..961c375 100644
CCFLAGS := -m64
endif
endif
+@@ -119,7 +119,7 @@ endif
+
+ # Common includes and paths for CUDA, CURAND
+ INCLUDES := -Iinc/ -I$(CUDA_INC_PATH) -I../../common/inc
+-LDFLAGS += -lcurand
++LIBS += -lcurand
+
+ # Target rules
+ all: build
@@ -136,7 +136,7 @@ test.o: src/test.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
MC_EstimatePiQ: piestimator.o main.o test.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/MC_SingleAsianOptionP/Makefile b/7_CUDALibraries/MC_SingleAsianOptionP/Makefile
-index f53835f..948262a 100644
+index f53835f..a74a6fd 100644
--- a/7_CUDALibraries/MC_SingleAsianOptionP/Makefile
+++ b/7_CUDALibraries/MC_SingleAsianOptionP/Makefile
@@ -87,14 +87,14 @@ GENCODE_FLAGS := $(GENCODE_SM13) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3209,17 +3619,26 @@ index f53835f..948262a 100644
CCFLAGS := -m64
endif
endif
+@@ -119,7 +119,7 @@ endif
+
+ # Common includes and paths for CUDA, CURAND
+ INCLUDES := -Iinc/ -I$(CUDA_INC_PATH) -I../../common/inc
+-LDFLAGS += -lcurand
++LIBS += -lcurand
+
+ # Target rules
+ all: build
@@ -136,7 +136,7 @@ test.o: src/test.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
MC_SingleAsianOptionP: pricingengine.o main.o test.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/MersenneTwisterGP11213/Makefile b/7_CUDALibraries/MersenneTwisterGP11213/Makefile
-index cfb9055..5e51728 100644
+index cfb9055..b9297ef 100644
--- a/7_CUDALibraries/MersenneTwisterGP11213/Makefile
+++ b/7_CUDALibraries/MersenneTwisterGP11213/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM13) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3240,17 +3659,26 @@ index cfb9055..5e51728 100644
CCFLAGS := -m64
endif
endif
+@@ -115,7 +115,7 @@ endif
+
+ # Common includes and paths for CUDA, CURAND
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I../../common/inc
+-LDFLAGS += -lcurand
++LIBS += -lcurand
+
+ # Target rules
+ all: build
@@ -126,7 +126,7 @@ MersenneTwister.o: MersenneTwister.cpp
$(GCC) $(CCFLAGS) $(INCLUDES) -o $@ -c $<
MersenneTwisterGP11213: MersenneTwister.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/batchCUBLAS/Makefile b/7_CUDALibraries/batchCUBLAS/Makefile
-index fce5d59..f43e6a2 100644
+index fce5d59..86492c6 100644
--- a/7_CUDALibraries/batchCUBLAS/Makefile
+++ b/7_CUDALibraries/batchCUBLAS/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3271,17 +3699,26 @@ index fce5d59..f43e6a2 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += -lcublas
++LIBS += -lcublas
+
+ # Target rules
+ all: build
@@ -128,7 +128,7 @@ batchCUBLAS.o: batchCUBLAS.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
batchCUBLAS: batchCUBLAS.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/boxFilterNPP/Makefile b/7_CUDALibraries/boxFilterNPP/Makefile
-index 30fdd74..2e7370c 100644
+index 30fdd74..d792f24 100644
--- a/7_CUDALibraries/boxFilterNPP/Makefile
+++ b/7_CUDALibraries/boxFilterNPP/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3302,17 +3739,26 @@ index 30fdd74..2e7370c 100644
CCFLAGS := -m64
endif
endif
+@@ -124,7 +124,7 @@ endif
+
+ # Common includes and paths for CUDA, NPP
+ INCLUDES := -I. -I.. -I../../common/inc -I../common/UtilNPP/ -I../common/FreeImage/include -I$(CUDA_INC_PATH)
+-LDFLAGS += $(LIBPATH_OPENGL) -lnpp
++LIBS += $(LIBPATH_OPENGL) -lnpp
+
+ # Miscellenous libraries (FreeImage Library)
+ ifneq ($(DARWIN),)
@@ -142,7 +142,7 @@ boxFilterNPP.o: boxFilterNPP.cpp
$(GCC) $(CCFLAGS) $(INCLUDES) -o $@ -c $<
boxFilterNPP: boxFilterNPP.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/conjugateGradient/Makefile b/7_CUDALibraries/conjugateGradient/Makefile
-index d3fca0a..51690b6 100644
+index d3fca0a..8b1cd6f 100644
--- a/7_CUDALibraries/conjugateGradient/Makefile
+++ b/7_CUDALibraries/conjugateGradient/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3333,17 +3779,26 @@ index d3fca0a..51690b6 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += -lcublas -lcusparse
++LIBS += -lcublas -lcusparse
+
+ # Target rules
+ all: build
@@ -128,7 +128,7 @@ main.o: main.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
conjugateGradient: main.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/conjugateGradientPrecond/Makefile b/7_CUDALibraries/conjugateGradientPrecond/Makefile
-index c124bc2..458d403 100644
+index c124bc2..b84db36 100644
--- a/7_CUDALibraries/conjugateGradientPrecond/Makefile
+++ b/7_CUDALibraries/conjugateGradientPrecond/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3364,17 +3819,26 @@ index c124bc2..458d403 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += -lcublas -lcusparse
++LIBS += -lcublas -lcusparse
+
+ # Target rules
+ all: build
@@ -128,7 +128,7 @@ main.o: main.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
conjugateGradientPrecond: main.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/freeImageInteropNPP/Makefile b/7_CUDALibraries/freeImageInteropNPP/Makefile
-index dfd5a3c..65859c0 100644
+index dfd5a3c..79830e0 100644
--- a/7_CUDALibraries/freeImageInteropNPP/Makefile
+++ b/7_CUDALibraries/freeImageInteropNPP/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3395,17 +3859,26 @@ index dfd5a3c..65859c0 100644
CCFLAGS := -m64
endif
endif
+@@ -124,7 +124,7 @@ endif
+
+ # Common includes and paths for CUDA, NPP
+ INCLUDES := -I. -I.. -I../../common/inc -I../common/UtilNPP/ -I../common/FreeImage/include -I$(CUDA_INC_PATH)
+-LDFLAGS += $(LIBPATH_OPENGL) -lnpp
++LIBS += $(LIBPATH_OPENGL) -lnpp
+
+ # Miscellenous libraries (FreeImage Library)
+ ifneq ($(DARWIN),)
@@ -142,7 +142,7 @@ freeImageInteropNPP.o: freeImageInteropNPP.cpp
$(GCC) $(CCFLAGS) $(INCLUDES) -o $@ -c $<
freeImageInteropNPP: freeImageInteropNPP.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/grabcutNPP/Makefile b/7_CUDALibraries/grabcutNPP/Makefile
-index 02e0b05..8cb0237 100644
+index 02e0b05..c1f5c0d 100644
--- a/7_CUDALibraries/grabcutNPP/Makefile
+++ b/7_CUDALibraries/grabcutNPP/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM11) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3426,17 +3899,26 @@ index 02e0b05..8cb0237 100644
CCFLAGS := -m64
endif
endif
+@@ -125,7 +125,7 @@ endif
+
+ # Common includes and paths for CUDA, NPP
+ INCLUDES := -I. -I.. -I../../common/inc -I../common/UtilNPP -I../common/FreeImage/include -I$(CUDA_INC_PATH)
+-LDFLAGS += $(LIBPATH_OPENGL) -lnpp
++LIBS += $(LIBPATH_OPENGL) -lnpp
+
+ # Miscellenous libraries (FreeImage Library)
+ ifneq ($(DARWIN),)
@@ -155,7 +155,7 @@ GrabcutMain.o: GrabcutMain.cpp
$(GCC) $(CCFLAGS) $(INCLUDES) -o $@ -c $<
grabcutNPP: GrabcutGMM.o GrabcutHistogram.o GrabcutUtil.o GrabCut.o GrabcutMain.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/histEqualizationNPP/Makefile b/7_CUDALibraries/histEqualizationNPP/Makefile
-index a90f4d7..2efff41 100644
+index a90f4d7..e6077d1 100644
--- a/7_CUDALibraries/histEqualizationNPP/Makefile
+++ b/7_CUDALibraries/histEqualizationNPP/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3457,17 +3939,26 @@ index a90f4d7..2efff41 100644
CCFLAGS := -m64
endif
endif
+@@ -124,7 +124,7 @@ endif
+
+ # Common includes and paths for CUDA, NPP
+ INCLUDES := -I. -I.. -I../../common/inc -I../common/UtilNPP/ -I../common/FreeImage/include -I$(CUDA_INC_PATH)
+-LDFLAGS += $(LIBPATH_OPENGL) -lnpp
++LIBS += $(LIBPATH_OPENGL) -lnpp
+
+ # Miscellenous libraries (FreeImage Library)
+ ifneq ($(DARWIN),)
@@ -142,7 +142,7 @@ histEqualizationNPP.o: histEqualizationNPP.cpp
$(GCC) $(CCFLAGS) $(INCLUDES) -o $@ -c $<
histEqualizationNPP: histEqualizationNPP.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/imageSegmentationNPP/Makefile b/7_CUDALibraries/imageSegmentationNPP/Makefile
-index b280e62..4c3e005 100644
+index b280e62..8161e5b 100644
--- a/7_CUDALibraries/imageSegmentationNPP/Makefile
+++ b/7_CUDALibraries/imageSegmentationNPP/Makefile
@@ -85,14 +85,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3488,17 +3979,26 @@ index b280e62..4c3e005 100644
CCFLAGS := -m64
endif
endif
+@@ -124,7 +124,7 @@ endif
+
+ # Common includes and paths for CUDA, NPP
+ INCLUDES := -I. -I.. -I../../common/inc -I../common/UtilNPP/ -I../common/FreeImage/include -I$(CUDA_INC_PATH)
+-LDFLAGS += $(LIBPATH_OPENGL) -lnpp
++LIBS += $(LIBPATH_OPENGL) -lnpp
+
+ # Miscellenous libraries (FreeImage Library)
+ ifneq ($(DARWIN),)
@@ -142,7 +142,7 @@ imageSegmentationNPP.o: imageSegmentationNPP.cpp
$(GCC) $(CCFLAGS) $(INCLUDES) -o $@ -c $<
imageSegmentationNPP: imageSegmentationNPP.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/randomFog/Makefile b/7_CUDALibraries/randomFog/Makefile
-index 23a19a3..fda966a 100644
+index 23a19a3..e66a511 100644
--- a/7_CUDALibraries/randomFog/Makefile
+++ b/7_CUDALibraries/randomFog/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3519,17 +4019,26 @@ index 23a19a3..fda966a 100644
CCFLAGS := -m64
endif
endif
+@@ -125,7 +125,7 @@ endif
+
+ # Common includes and paths for CUDA, CURAND
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc -I../common/FreeImage/include
+-LDFLAGS += $(LIBPATH_OPENGL) -lcurand
++LIBS += $(LIBPATH_OPENGL) -lcurand
+
+ # Target rules
+ all: build
@@ -139,7 +139,7 @@ randomFog.o: randomFog.cpp
$(GCC) $(CCFLAGS) $(INCLUDES) -o $@ -c $<
randomFog: randomFog.o rng.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/simpleCUBLAS/Makefile b/7_CUDALibraries/simpleCUBLAS/Makefile
-index 02b11ca..44a8002 100644
+index 02b11ca..5dffa7d 100644
--- a/7_CUDALibraries/simpleCUBLAS/Makefile
+++ b/7_CUDALibraries/simpleCUBLAS/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3550,17 +4059,26 @@ index 02b11ca..44a8002 100644
CCFLAGS := -m64
endif
endif
+@@ -117,7 +117,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += -lcublas
++LIBS += -lcublas
+
+ # Target rules
+ all: build
@@ -128,7 +128,7 @@ simpleCUBLAS.o: simpleCUBLAS.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
simpleCUBLAS: simpleCUBLAS.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/simpleCUFFT/Makefile b/7_CUDALibraries/simpleCUFFT/Makefile
-index 3eb3abe..30b1207 100644
+index 3eb3abe..0aa7a47 100644
--- a/7_CUDALibraries/simpleCUFFT/Makefile
+++ b/7_CUDALibraries/simpleCUFFT/Makefile
@@ -86,14 +86,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30)
@@ -3581,17 +4099,26 @@ index 3eb3abe..30b1207 100644
CCFLAGS := -m64
endif
endif
+@@ -118,7 +118,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += -lcudart -lcufft
++LIBS += -lcudart -lcufft
+
+ # Target rules
+ all: build
@@ -129,7 +129,7 @@ simpleCUFFT.o: simpleCUFFT.cu
$(NVCC) $(NVCCFLAGS) $(EXTRA_NVCCFLAGS) $(INCLUDES) $(GENCODE_FLAGS) -o $@ -c $<
simpleCUFFT: simpleCUFFT.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/7_CUDALibraries/simpleDevLibCUBLAS/Makefile b/7_CUDALibraries/simpleDevLibCUBLAS/Makefile
-index 84bd444..370a78c 100644
+index 84bd444..4dea500 100644
--- a/7_CUDALibraries/simpleDevLibCUBLAS/Makefile
+++ b/7_CUDALibraries/simpleDevLibCUBLAS/Makefile
@@ -78,14 +78,14 @@ GENCODE_FLAGS := $(GENCODE_SM10) $(GENCODE_SM20) $(GENCODE_SM30) $(GENCODE_SM3
@@ -3612,12 +4139,21 @@ index 84bd444..370a78c 100644
CCFLAGS := -m64
endif
endif
+@@ -109,7 +109,7 @@ endif
+
+ # Common includes and paths for CUDA
+ INCLUDES := -I$(CUDA_INC_PATH) -I. -I.. -I../../common/inc
+-LDFLAGS += -lcudart -lcublas
++LIBS += -lcudart -lcublas
+ # Target rules
+ all: build
+
@@ -125,7 +125,7 @@ simpleDevLibCUBLAS.o: simpleDevLibCUBLAS.cpp
$(GCC) $(CCFLAGS) $(EXTRA_CCFLAGS) $(INCLUDES) -o $@ -c $<
simpleDevLibCUBLAS: simpleDevLibCUBLAS.o kernels.o kernelsLink.o
- $(GCC) $(CCFLAGS) -o $@ $+ $(LDFLAGS) $(EXTRA_LDFLAGS)
-+ $(GCC) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
++ $(GCC) $(LDFLAGS) $(CCFLAGS) -o $@ $+ $(LIBS) $(EXTRA_LDFLAGS)
mkdir -p ../../bin/$(OSLOWER)/$(TARGET)
cp $@ ../../bin/$(OSLOWER)/$(TARGET)
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild
index 7b2556485..d68eea85b 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild
@@ -63,6 +63,8 @@ src_prepare() {
-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-i $(find . -type f -name "Makefile") || die
+ export LDFLAGS="$(raw-ldflags)"
+
find common/inc/GL -delete || die
find . -type f -name "*\.a" -delete || die
}