some fixes

2014-01-30 11:32:27 +01:00
parent eb57852f2e
commit e93c2b88ba
4 changed files with 31 additions and 6 deletions
--- a/examples_ptx/mergeSort/Makefile_gpu
+++ b/examples_ptx/mergeSort/Makefile_gpu
@@ -1,9 +1,10 @@
 PROG=mergeSort
 ISPC_SRC=mergeSort.ispc
-#CU_SRC=mergeSort.cu
+CU_SRC=mergeSort.cu
 CXX_SRC=mergeSort.cpp  mergeSort.cpp
 PTXCC_REGMAX=64
 #PTXCC_FLAGS= -Xptxas=-O3
+#NVCC_FLAGS=-Xptxas=-O0

 # LLVM_GPU=1
 NVVM_GPU=1