summaryrefslogtreecommitdiff
path: root/libopencl
diff options
context:
space:
mode:
Diffstat (limited to 'libopencl')
-rw-r--r--libopencl/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libopencl/Makefile b/libopencl/Makefile
index ae72115..d597a0d 100644
--- a/libopencl/Makefile
+++ b/libopencl/Makefile
@@ -60,7 +60,7 @@
# Vancouver, BC V6T 1Z4
-CUDART_VERSION:=$(shell $(CUDA_INSTALL_PATH)/bin/nvcc --version | awk '/release/ {print $$5;}' | sed 's/,//' | sed 's/\./ /' | awk '{printf("%02u%02u", 10*int($$1), 10*$$2);}')
+include ../version_detection.mk
ifeq ($(OPENGL_SUPPORT),1)
GL = -DOPENGL_SUPPORT
@@ -74,7 +74,7 @@ CCFLAGS = -O3 -g -Wall -fPIC $(GL)
ifeq ($(DEBUG),1)
CCFLAGS = -Wall -g -fPIC $(GL)
endif
-GNUC_CPP0X := $(shell gcc --version | perl -ne 'if (/gcc\s+\(.*\)\s+([0-9.]+)/){ if($$1 >= 4.3) {$$n=1} else {$$n=0;} } END { print $$n; }')
+
ifeq ($(GNUC_CPP0X), 1)
CCFLAGS += -std=c++0x
endif