From a9990a3446f04503d8acb4b3abf5f88c14295b46 Mon Sep 17 00:00:00 2001 From: Josh Vermaas Date: Tue, 26 Apr 2022 14:49:40 -0400 Subject: [PATCH] Update Makefile Make OSPRAY optional. --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 836f29e..f3622f8 100755 --- a/Makefile +++ b/Makefile @@ -2,9 +2,11 @@ DESTDIR=$(shell pwd) ARCH=$(shell getconf LONG_BIT) VMDVER="1.9.4a55" OPTIX="" +OSPRAY="" ifeq ($(ARCH),64) PLUGINTEXT=LINUXAMD64 #OPTIX=LIBOPTIX #Uncomment this if you want to add in the OptiX renderer. + #OSPRAY=LIBOSPRAY2 #Uncomment this if you want to add in the OSPRAY renderer. else PLUGINTEXT=LINUX endif @@ -27,10 +29,10 @@ copyvmd: compilevmd: copyvmd cd vmd; \ - ./configure $(PLUGINTEXT) OPENGL TK FLTK IMD ACTC XINERAMA LIBTACHYON ZLIB LIBPNG NETCDF TCL PYTHON PTHREADS NUMPY COLVARS LIBOSPRAY2 ; \ + ./configure $(PLUGINTEXT) OPENGL TK FLTK IMD ACTC XINERAMA LIBTACHYON ZLIB LIBPNG NETCDF TCL PYTHON PTHREADS NUMPY COLVARS $(OSPRAY) ; \ cd src ; make -j cd vmd-cuda; \ - ./configure $(PLUGINTEXT) OPENGL TK FLTK IMD ACTC XINERAMA LIBTACHYON ZLIB LIBPNG NETCDF TCL PYTHON PTHREADS NUMPY COLVARS LIBOSPRAY2 CUDA $(OPTIX); \ + ./configure $(PLUGINTEXT) OPENGL TK FLTK IMD ACTC XINERAMA LIBTACHYON ZLIB LIBPNG NETCDF TCL PYTHON PTHREADS NUMPY COLVARS $(OSPRAY) CUDA $(OPTIX); \ cd src ; make -j installplugins: