maintain current version externally with a symlink

Xpra-org · Jan 6, 2023 · d790cb9 · d790cb9
1 parent 14311ae
commit d790cb9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packaging/MSWindows/BUILD_CUDA_KERNEL.BAT b/packaging/MSWindows/BUILD_CUDA_KERNEL.BAT
@@ -5,7 +5,7 @@ SET KERNEL=%1
 SET CUDA_SRC=fs\share\xpra\cuda\%KERNEL%.cu
 SET CUDA_BIN=fs\share\xpra\cuda\%KERNEL%.fatbin
 
-SET NVCC_DIR=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.8\bin\
+SET NVCC_DIR=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\current\bin\
 SET NVCC=%NVCC_DIR%\nvcc.exe
 
 CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64

diff --git a/packaging/MSWindows/MINGW_SETUP.sh b/packaging/MSWindows/MINGW_SETUP.sh
@@ -63,9 +63,10 @@ echo
 echo "to support NVIDIA hardware accelerated encoders NVENC, NVJPEG"
 echo "and NVFBC screen capture:"
 echo "* install CUDA in its default location"
-echo "* install python-setuptools python-numpy python-pip"
-echo "* create a symbolic link so the build system can find CUDA more easily:"
-echo " `ln -sf /c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v*/ ./cuda`"
+echo "* create symbolic links so the build system can find CUDA more easily:"
+echo " `pushd /c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/;ln -sf v12.0 current;popd`"
+echo " `ln -sf /c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/current ./cuda`"
 echo "* install `NVidia_Capture` into `$MINGW_PREFIX/lib/nvenc`"
 echo "* add the pkg-config files:"
 echo " `cp pkgconfig/*.pc $MINGW_PREFIX/lib/pkgconfig/`"
+echo "* install python-setuptools python-numpy python-pip"