From: Good Guy Date: Wed, 26 Jun 2019 13:08:23 +0000 (-0600) Subject: fix a few missed CUDA_PATH refs X-Git-Tag: 2019-08~31 X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=7e96ffcf048e3adb8a63fc1e01957d3300ef888f;p=goodguy%2Fcinelerra.git fix a few missed CUDA_PATH refs --- diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 77fe5cac..9bb63424 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -691,7 +691,7 @@ CHECK_WANT([LV2], [auto], [use lv2], [ CFLAGS="$saved_CFLAGS"]) CHECK_WANT([CUDA], [auto], [build cuda plugins], [ - CHECK_HEADERS([CUDA], [cuda sdk], [/usr/local/cuda/include/cuda.h])]) + CHECK_HEADERS([CUDA], [cuda sdk], [${CUDA_PATH:-/usr/local/cuda}/include/cuda.h])]) CHECK_WANT([DL], [auto], [system has libdl], [ CHECK_LIB([DL], [dl], [dlopen])]) diff --git a/cinelerra-5.1/plugin_cuda b/cinelerra-5.1/plugin_cuda index f649113e..7e227acf 100644 --- a/cinelerra-5.1/plugin_cuda +++ b/cinelerra-5.1/plugin_cuda @@ -14,7 +14,7 @@ GENCODE_FLAGS += -gencode arch=compute_$(HIGHEST_SM),code=compute_$(HIGHEST_SM) # samples source access BEWARE! # contains includes which conflict: search /usr/include first -CFLAGS += -I/usr/include -I/usr/local/cuda/samples +CFLAGS += -I/usr/include -I$(CUDA_PATH)/samples CFLAGS += -I$(CUDA_PATH)/samples/common/inc CFLAGS += -I$(CUDA_PATH)/targets/x86_64-linux/include CFLAGS += -Wno-unused-function