OSDN Git Service

Fixed: ticket #33385
authorTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Thu, 6 Mar 2014 10:26:57 +0000 (19:26 +0900)
committerTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Thu, 6 Mar 2014 10:26:57 +0000 (19:26 +0900)
modified:   hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageFTest
modified:   hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFTest/src/X86LINUX64/Makefile
modified:   hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageFTest/src/X86LINUX64/mrcImageFTest
modified:   src/Tools/mrcImage/mrcImageFTest/src/mrcImageFTest.c

bin/X86LINUX64/mrcImageFTest
src/Tools/mrcImage/mrcImageFTest/src/X86LINUX64/Makefile
src/Tools/mrcImage/mrcImageFTest/src/X86LINUX64/mrcImageFTest

index 84cd1ec..2c0b641 100755 (executable)
Binary files a/bin/X86LINUX64/mrcImageFTest and b/bin/X86LINUX64/mrcImageFTest differ
index 2a9beb5..ec61247 100755 (executable)
@@ -78,8 +78,8 @@ $(OBJECTNAME): $(MODULES) $(LIBFILES)
        fi
        @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
        then \
-               echo $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
-               $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
+               echo $(NVCC) $(NVCCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) $(CUDALIB) $(CUDAINC) -o $@ ;  \
+               $(NVCC) $(NVCCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) $(CUDALIB) $(CUDAINC) -o $@ ;  \
        fi
 
 
index 84cd1ec..2c0b641 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImageFTest/src/X86LINUX64/mrcImageFTest and b/src/Tools/mrcImage/mrcImageFTest/src/X86LINUX64/mrcImageFTest differ