Flex 1.2.0 release

4 files changed, 23 insertions, 415 deletions

diff --git a/demo/compiler/makelinux64/Makefile.flexCUDA.mk b/demo/compiler/makelinux64/Makefile.flexCUDA.mk
deleted file mode 100644
index 3d3b9cd..0000000
--- a/demo/compiler/makelinux64/Makefile.flexCUDA.mk
+++ /dev/null
@@ -1,217 +0,0 @@
-# Makefile generated by XPJ for linux64
--include Makefile.custom
-ProjectName = flexCUDA
-flexCUDA_cppfiles   += ./../../../src/cuda/util.cpp
-flexCUDA_cuda_src_cuda_bvh_cu   += ./../../../src/cuda/bvh.cu
-flexCUDA_cuda_src_cuda_flex_cu   += ./../../../src/cuda/flex.cu
-flexCUDA_cuda_src_cuda_sort_cu   += ./../../../src/cuda/sort.cu
-
-flexCUDA_cpp_release_dep    = $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexCUDA_cppfiles)))))
-flexCUDA_cc_release_dep    = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexCUDA_ccfiles)))))
-flexCUDA_c_release_dep      = $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexCUDA_cfiles)))))
-flexCUDA_release_dep      = $(flexCUDA_cpp_release_dep) $(flexCUDA_cc_release_dep) $(flexCUDA_c_release_dep)
--include $(flexCUDA_release_dep)
-flexCUDA_cpp_debug_dep    = $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexCUDA_cppfiles)))))
-flexCUDA_cc_debug_dep    = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.debug.P, $(flexCUDA_ccfiles)))))
-flexCUDA_c_debug_dep      = $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexCUDA_cfiles)))))
-flexCUDA_debug_dep      = $(flexCUDA_cpp_debug_dep) $(flexCUDA_cc_debug_dep) $(flexCUDA_c_debug_dep)
--include $(flexCUDA_debug_dep)
-flexCUDA_release_hpaths    := 
-flexCUDA_release_hpaths    += ./../../../../../../external/CUDA/8.0.44-linux/include
-flexCUDA_release_hpaths    += ./../../../../../../external/CUDA/8.0.44-linux/extras/cupti/include
-flexCUDA_release_hpaths    += ./../../..
-flexCUDA_release_lpaths    := 
-flexCUDA_release_lpaths    += ./../../../../../../external/CUDA/8.0.44-linux/lib64
-flexCUDA_release_defines   := $(flexCUDA_custom_defines)
-flexCUDA_release_libraries := 
-flexCUDA_release_libraries += ./../../../lib/linux64/NvFlexDevice_x64.a
-flexCUDA_release_common_cflags	:= $(flexCUDA_custom_cflags)
-flexCUDA_release_common_cflags    += -MMD
-flexCUDA_release_common_cflags    += $(addprefix -D, $(flexCUDA_release_defines))
-flexCUDA_release_common_cflags    += $(addprefix -I, $(flexCUDA_release_hpaths))
-flexCUDA_release_common_cflags  += -m64
-flexCUDA_release_cflags	:= $(flexCUDA_release_common_cflags)
-flexCUDA_release_cflags  += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing
-flexCUDA_release_cflags  += -O3 -ffast-math -DNDEBUG
-flexCUDA_release_cppflags	:= $(flexCUDA_release_common_cflags)
-flexCUDA_release_cppflags  += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing
-flexCUDA_release_cppflags  += -O3 -ffast-math -DNDEBUG
-flexCUDA_release_lflags    := $(flexCUDA_custom_lflags)
-flexCUDA_release_lflags    += $(addprefix -L, $(flexCUDA_release_lpaths))
-flexCUDA_release_lflags    += -Wl,--start-group $(addprefix -l, $(flexCUDA_release_libraries)) -Wl,--end-group
-flexCUDA_release_lflags  += -m64
-flexCUDA_release_objsdir  = $(OBJS_DIR)/flexCUDA_release
-flexCUDA_release_cpp_o    = $(addprefix $(flexCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexCUDA_cppfiles)))))
-flexCUDA_release_cc_o    = $(addprefix $(flexCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexCUDA_ccfiles)))))
-flexCUDA_release_c_o      = $(addprefix $(flexCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexCUDA_cfiles)))))
-flexCUDA_release_cuda_src_cuda_bvh_cu_o += $(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o
-flexCUDA_release_cuda_src_cuda_flex_cu_o += $(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o
-flexCUDA_release_cuda_src_cuda_sort_cu_o += $(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o
-flexCUDA_release_obj      = $(flexCUDA_release_cpp_o) $(flexCUDA_release_cc_o) $(flexCUDA_release_c_o) $(flexCUDA_release_cuda_src_cuda_bvh_cu_o) $(flexCUDA_release_cuda_src_cuda_flex_cu_o) $(flexCUDA_release_cuda_src_cuda_sort_cu_o)
-flexCUDA_release_bin      := ./../../../lib/linux64/NvFlexReleaseCUDA_x64.a
-
-clean_flexCUDA_release: 
-	@$(ECHO) clean flexCUDA release
-	@$(RMDIR) $(flexCUDA_release_objsdir)
-	@$(RMDIR) $(flexCUDA_release_bin)
-	@$(RMDIR) $(DEPSDIR)/flexCUDA/release
-
-build_flexCUDA_release: postbuild_flexCUDA_release
-postbuild_flexCUDA_release: mainbuild_flexCUDA_release
-mainbuild_flexCUDA_release: prebuild_flexCUDA_release $(flexCUDA_release_bin)
-prebuild_flexCUDA_release:
-
-$(flexCUDA_release_bin): $(flexCUDA_release_obj) 
-	mkdir -p `dirname ./../../../lib/linux64/NvFlexReleaseCUDA_x64.a`
-	@$(AR) rcs $(flexCUDA_release_bin) $(flexCUDA_release_obj)
-	$(ECHO) building $@ complete!
-
-$(flexCUDA_release_cuda_src_cuda_bvh_cu_o): $(flexCUDA_cuda_src_cuda_bvh_cu) 
-	@mkdir -p `dirname $(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o`
-	$(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o"
-	../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o"
-
-$(flexCUDA_release_cuda_src_cuda_flex_cu_o): $(flexCUDA_cuda_src_cuda_flex_cu) 
-	@mkdir -p `dirname $(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o`
-	$(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o"
-	../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o"
-
-$(flexCUDA_release_cuda_src_cuda_sort_cu_o): $(flexCUDA_cuda_src_cuda_sort_cu) 
-	@mkdir -p `dirname $(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o`
-	$(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o"
-	../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o"
-
-flexCUDA_release_DEPDIR = $(dir $(@))/$(*F)
-$(flexCUDA_release_cpp_o): $(flexCUDA_release_objsdir)/%.o:
-	$(ECHO) flexCUDA: compiling release $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexCUDA_release_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles)) -o $@
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles))))))
-	cp $(flexCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \
-	  rm -f $(flexCUDA_release_DEPDIR).d
-
-$(flexCUDA_release_cc_o): $(flexCUDA_release_objsdir)/%.o:
-	$(ECHO) flexCUDA: compiling release $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexCUDA_release_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles)) -o $@
-	mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles))))))
-	cp $(flexCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles))))).release.P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles))))).release.P; \
-	  rm -f $(flexCUDA_release_DEPDIR).d
-
-$(flexCUDA_release_c_o): $(flexCUDA_release_objsdir)/%.o:
-	$(ECHO) flexCUDA: compiling release $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles))...
-	mkdir -p $(dir $(@))
-	$(CC) $(flexCUDA_release_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles)) -o $@ 
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles))))))
-	cp $(flexCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \
-	  rm -f $(flexCUDA_release_DEPDIR).d
-
-flexCUDA_debug_hpaths    := 
-flexCUDA_debug_hpaths    += ./../../../../../../external/CUDA/8.0.44-linux/include
-flexCUDA_debug_hpaths    += ./../../../../../../external/CUDA/8.0.44-linux/extras/cupti/include
-flexCUDA_debug_hpaths    += ./../../..
-flexCUDA_debug_lpaths    := 
-flexCUDA_debug_lpaths    += ./../../../../../../external/CUDA/8.0.44-linux/lib64
-flexCUDA_debug_defines   := $(flexCUDA_custom_defines)
-flexCUDA_debug_libraries := 
-flexCUDA_debug_libraries += ./../../../lib/linux64/NvFlexDevice_x64.a
-flexCUDA_debug_common_cflags	:= $(flexCUDA_custom_cflags)
-flexCUDA_debug_common_cflags    += -MMD
-flexCUDA_debug_common_cflags    += $(addprefix -D, $(flexCUDA_debug_defines))
-flexCUDA_debug_common_cflags    += $(addprefix -I, $(flexCUDA_debug_hpaths))
-flexCUDA_debug_common_cflags  += -m64
-flexCUDA_debug_cflags	:= $(flexCUDA_debug_common_cflags)
-flexCUDA_debug_cflags  += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing
-flexCUDA_debug_cflags  += -g -O0
-flexCUDA_debug_cppflags	:= $(flexCUDA_debug_common_cflags)
-flexCUDA_debug_cppflags  += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing
-flexCUDA_debug_cppflags  += -g -O0
-flexCUDA_debug_lflags    := $(flexCUDA_custom_lflags)
-flexCUDA_debug_lflags    += $(addprefix -L, $(flexCUDA_debug_lpaths))
-flexCUDA_debug_lflags    += -Wl,--start-group $(addprefix -l, $(flexCUDA_debug_libraries)) -Wl,--end-group
-flexCUDA_debug_lflags  += -m64
-flexCUDA_debug_objsdir  = $(OBJS_DIR)/flexCUDA_debug
-flexCUDA_debug_cpp_o    = $(addprefix $(flexCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexCUDA_cppfiles)))))
-flexCUDA_debug_cc_o    = $(addprefix $(flexCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexCUDA_ccfiles)))))
-flexCUDA_debug_c_o      = $(addprefix $(flexCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexCUDA_cfiles)))))
-flexCUDA_debug_cuda_src_cuda_bvh_cu_o += $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o
-flexCUDA_debug_cuda_src_cuda_flex_cu_o += $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o
-flexCUDA_debug_cuda_src_cuda_sort_cu_o += $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o
-flexCUDA_debug_obj      = $(flexCUDA_debug_cpp_o) $(flexCUDA_debug_cc_o) $(flexCUDA_debug_c_o) $(flexCUDA_debug_cuda_src_cuda_bvh_cu_o) $(flexCUDA_debug_cuda_src_cuda_flex_cu_o) $(flexCUDA_debug_cuda_src_cuda_sort_cu_o)
-flexCUDA_debug_bin      := ./../../../lib/linux64/NvFlexDebugCUDA_x64.a
-
-clean_flexCUDA_debug: 
-	@$(ECHO) clean flexCUDA debug
-	@$(RMDIR) $(flexCUDA_debug_objsdir)
-	@$(RMDIR) $(flexCUDA_debug_bin)
-	@$(RMDIR) $(DEPSDIR)/flexCUDA/debug
-
-build_flexCUDA_debug: postbuild_flexCUDA_debug
-postbuild_flexCUDA_debug: mainbuild_flexCUDA_debug
-mainbuild_flexCUDA_debug: prebuild_flexCUDA_debug $(flexCUDA_debug_bin)
-prebuild_flexCUDA_debug:
-
-$(flexCUDA_debug_bin): $(flexCUDA_debug_obj) 
-	mkdir -p `dirname ./../../../lib/linux64/NvFlexDebugCUDA_x64.a`
-	@$(AR) rcs $(flexCUDA_debug_bin) $(flexCUDA_debug_obj)
-	$(ECHO) building $@ complete!
-
-$(flexCUDA_debug_cuda_src_cuda_bvh_cu_o): $(flexCUDA_cuda_src_cuda_bvh_cu) 
-	@mkdir -p `dirname $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o`
-	$(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o"
-	../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o"
-
-$(flexCUDA_debug_cuda_src_cuda_flex_cu_o): $(flexCUDA_cuda_src_cuda_flex_cu) 
-	@mkdir -p `dirname $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o`
-	$(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o"
-	../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o"
-
-$(flexCUDA_debug_cuda_src_cuda_sort_cu_o): $(flexCUDA_cuda_src_cuda_sort_cu) 
-	@mkdir -p `dirname $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o`
-	$(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o"
-	../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2  --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o"
-
-flexCUDA_debug_DEPDIR = $(dir $(@))/$(*F)
-$(flexCUDA_debug_cpp_o): $(flexCUDA_debug_objsdir)/%.o:
-	$(ECHO) flexCUDA: compiling debug $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexCUDA_debug_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles)) -o $@
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles))))))
-	cp $(flexCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \
-	  rm -f $(flexCUDA_debug_DEPDIR).d
-
-$(flexCUDA_debug_cc_o): $(flexCUDA_debug_objsdir)/%.o:
-	$(ECHO) flexCUDA: compiling debug $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexCUDA_debug_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles)) -o $@
-	mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles))))))
-	cp $(flexCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles))))).debug.P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles))))).debug.P; \
-	  rm -f $(flexCUDA_debug_DEPDIR).d
-
-$(flexCUDA_debug_c_o): $(flexCUDA_debug_objsdir)/%.o:
-	$(ECHO) flexCUDA: compiling debug $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles))...
-	mkdir -p $(dir $(@))
-	$(CC) $(flexCUDA_debug_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles)) -o $@ 
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles))))))
-	cp $(flexCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \
-	  rm -f $(flexCUDA_debug_DEPDIR).d
-
-clean_flexCUDA:  clean_flexCUDA_release clean_flexCUDA_debug
-	rm -rf $(DEPSDIR)
-
-export VERBOSE
-ifndef VERBOSE
-.SILENT:
-endif
diff --git a/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk b/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk
index f37fc83..5737c66 100644
--- a/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk
+++ b/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk
@@ -3,9 +3,7 @@
 ProjectName = flexDemoCUDA
 flexDemoCUDA_cppfiles   += ./../../imgui.cpp
 flexDemoCUDA_cppfiles   += ./../../main.cpp
-flexDemoCUDA_cppfiles   += ./../../opengl/imguiRenderGL.cpp
-flexDemoCUDA_cppfiles   += ./../../opengl/shader.cpp
-flexDemoCUDA_cppfiles   += ./../../opengl/shadersGL.cpp
+flexDemoCUDA_cppfiles   += ./../../shadersDemoContext.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/aabbtree.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/core.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/extrude.cpp
@@ -14,9 +12,13 @@ flexDemoCUDA_cppfiles   += ./../../../core/mesh.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/perlin.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/pfm.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/platform.cpp
+flexDemoCUDA_cppfiles   += ./../../../core/png.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/sdf.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/tga.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/voxelize.cpp
+flexDemoCUDA_cppfiles   += ./../../opengl/imguiRenderGL.cpp
+flexDemoCUDA_cppfiles   += ./../../opengl/shader.cpp
+flexDemoCUDA_cppfiles   += ./../../opengl/shadersGL.cpp
 
 flexDemoCUDA_cpp_release_dep    = $(addprefix $(DEPSDIR)/flexDemoCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexDemoCUDA_cppfiles)))))
 flexDemoCUDA_cc_release_dep    = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexDemoCUDA_ccfiles)))))
@@ -29,11 +31,11 @@ flexDemoCUDA_c_debug_dep      = $(addprefix $(DEPSDIR)/flexDemoCUDA/debug/, $(su
 flexDemoCUDA_debug_dep      = $(flexDemoCUDA_cpp_debug_dep) $(flexDemoCUDA_cc_debug_dep) $(flexDemoCUDA_c_debug_dep)
 -include $(flexDemoCUDA_debug_dep)
 flexDemoCUDA_release_hpaths    := 
-flexDemoCUDA_release_hpaths    += $(CUDA_PATH)/include
-flexDemoCUDA_release_hpaths    += $(CUDA_PATH)/extras/cupti/include
+flexDemoCUDA_release_hpaths    += /usr/local/cuda/include
+flexDemoCUDA_release_hpaths    += /usr/local/cuda/extras/cupti/include
 flexDemoCUDA_release_hpaths    += ./../../..
 flexDemoCUDA_release_lpaths    := 
-flexDemoCUDA_release_lpaths    += $(CUDA_PATH)/lib64
+flexDemoCUDA_release_lpaths    += /usr/local/cuda/lib64
 flexDemoCUDA_release_lpaths    += ./../../../lib/linux64
 flexDemoCUDA_release_defines   := $(flexDemoCUDA_custom_defines)
 flexDemoCUDA_release_libraries := 
@@ -54,7 +56,7 @@ flexDemoCUDA_release_cppflags	:= $(flexDemoCUDA_release_common_cflags)
 flexDemoCUDA_release_lflags    := $(flexDemoCUDA_custom_lflags)
 flexDemoCUDA_release_lflags    += $(addprefix -L, $(flexDemoCUDA_release_lpaths))
 flexDemoCUDA_release_lflags    += -Wl,--start-group $(addprefix -l, $(flexDemoCUDA_release_libraries)) -Wl,--end-group
-flexDemoCUDA_release_lflags  += -g -L../../../external/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L$(CUDA_PATH)/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl -lrt -pthread
+flexDemoCUDA_release_lflags  += -g -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L/usr/local/cuda/lib64 -lGL -lglut -lGLU -lcudart_static -ldl -lrt -pthread
 flexDemoCUDA_release_lflags  += -m64
 flexDemoCUDA_release_objsdir  = $(OBJS_DIR)/flexDemoCUDA_release
 flexDemoCUDA_release_cpp_o    = $(addprefix $(flexDemoCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDemoCUDA_cppfiles)))))
@@ -111,11 +113,11 @@ $(flexDemoCUDA_release_c_o): $(flexDemoCUDA_release_objsdir)/%.o:
 	  rm -f $(flexDemoCUDA_release_DEPDIR).d
 
 flexDemoCUDA_debug_hpaths    := 
-flexDemoCUDA_debug_hpaths    += $(CUDA_PATH)/include
-flexDemoCUDA_debug_hpaths    += $(CUDA_PATH)/extras/cupti/include
+flexDemoCUDA_debug_hpaths    += /usr/local/cuda/include
+flexDemoCUDA_debug_hpaths    += /usr/local/cuda/extras/cupti/include
 flexDemoCUDA_debug_hpaths    += ./../../..
 flexDemoCUDA_debug_lpaths    := 
-flexDemoCUDA_debug_lpaths    += $(CUDA_PATH)/lib64
+flexDemoCUDA_debug_lpaths    += /usr/local/cuda/lib64
 flexDemoCUDA_debug_lpaths    += ./../../../lib/linux64
 flexDemoCUDA_debug_defines   := $(flexDemoCUDA_custom_defines)
 flexDemoCUDA_debug_libraries := 
@@ -136,7 +138,7 @@ flexDemoCUDA_debug_cppflags	:= $(flexDemoCUDA_debug_common_cflags)
 flexDemoCUDA_debug_lflags    := $(flexDemoCUDA_custom_lflags)
 flexDemoCUDA_debug_lflags    += $(addprefix -L, $(flexDemoCUDA_debug_lpaths))
 flexDemoCUDA_debug_lflags    += -Wl,--start-group $(addprefix -l, $(flexDemoCUDA_debug_libraries)) -Wl,--end-group
-flexDemoCUDA_debug_lflags  += -g -L../../../external/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L$(CUDA_PATH)/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl -lrt -pthread
+flexDemoCUDA_debug_lflags  += -g -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L/usr/local/cuda/lib64 -lGL -lglut -lGLU -lcudart_static -ldl -lrt -pthread
 flexDemoCUDA_debug_lflags  += -m64
 flexDemoCUDA_debug_objsdir  = $(OBJS_DIR)/flexDemoCUDA_debug
 flexDemoCUDA_debug_cpp_o    = $(addprefix $(flexDemoCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDemoCUDA_cppfiles)))))
diff --git a/demo/compiler/makelinux64/Makefile.flexDevice.mk b/demo/compiler/makelinux64/Makefile.flexDevice.mk
deleted file mode 100644
index 6bea080..0000000
--- a/demo/compiler/makelinux64/Makefile.flexDevice.mk
+++ /dev/null
@@ -1,177 +0,0 @@
-# Makefile generated by XPJ for linux64
--include Makefile.custom
-ProjectName = flexDevice
-flexDevice_cppfiles   += ./../../../src/device/PhysXDevice.cpp
-flexDevice_cppfiles   += ./../../../src/device/flexDevice.cpp
-
-flexDevice_cpp_release_dep    = $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexDevice_cppfiles)))))
-flexDevice_cc_release_dep    = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexDevice_ccfiles)))))
-flexDevice_c_release_dep      = $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexDevice_cfiles)))))
-flexDevice_release_dep      = $(flexDevice_cpp_release_dep) $(flexDevice_cc_release_dep) $(flexDevice_c_release_dep)
--include $(flexDevice_release_dep)
-flexDevice_cpp_debug_dep    = $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexDevice_cppfiles)))))
-flexDevice_cc_debug_dep    = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.debug.P, $(flexDevice_ccfiles)))))
-flexDevice_c_debug_dep      = $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexDevice_cfiles)))))
-flexDevice_debug_dep      = $(flexDevice_cpp_debug_dep) $(flexDevice_cc_debug_dep) $(flexDevice_c_debug_dep)
--include $(flexDevice_debug_dep)
-flexDevice_release_hpaths    := 
-flexDevice_release_hpaths    += ./../../../../../../external/CUDA/8.0.44-linux/include
-flexDevice_release_hpaths    += ./../../../../../../external/CUDA/8.0.44-linux/extras/cupti/include
-flexDevice_release_hpaths    += ./../../..
-flexDevice_release_lpaths    := 
-flexDevice_release_lpaths    += ./../../../../../../external/CUDA/8.0.44-linux/lib64
-flexDevice_release_defines   := $(flexDevice_custom_defines)
-flexDevice_release_libraries := 
-flexDevice_release_common_cflags	:= $(flexDevice_custom_cflags)
-flexDevice_release_common_cflags    += -MMD
-flexDevice_release_common_cflags    += $(addprefix -D, $(flexDevice_release_defines))
-flexDevice_release_common_cflags    += $(addprefix -I, $(flexDevice_release_hpaths))
-flexDevice_release_common_cflags  += -m64
-flexDevice_release_cflags	:= $(flexDevice_release_common_cflags)
-flexDevice_release_cflags  += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing
-flexDevice_release_cflags  += -O3 -ffast-math -DNDEBUG
-flexDevice_release_cppflags	:= $(flexDevice_release_common_cflags)
-flexDevice_release_cppflags  += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing
-flexDevice_release_cppflags  += -O3 -ffast-math -DNDEBUG
-flexDevice_release_lflags    := $(flexDevice_custom_lflags)
-flexDevice_release_lflags    += $(addprefix -L, $(flexDevice_release_lpaths))
-flexDevice_release_lflags    += -Wl,--start-group $(addprefix -l, $(flexDevice_release_libraries)) -Wl,--end-group
-flexDevice_release_lflags  += -m64
-flexDevice_release_objsdir  = $(OBJS_DIR)/flexDevice_release
-flexDevice_release_cpp_o    = $(addprefix $(flexDevice_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDevice_cppfiles)))))
-flexDevice_release_cc_o    = $(addprefix $(flexDevice_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexDevice_ccfiles)))))
-flexDevice_release_c_o      = $(addprefix $(flexDevice_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexDevice_cfiles)))))
-flexDevice_release_obj      = $(flexDevice_release_cpp_o) $(flexDevice_release_cc_o) $(flexDevice_release_c_o)
-flexDevice_release_bin      := ./../../../lib/linux64/NvFlexDeviceRelease_x64.a
-
-clean_flexDevice_release: 
-	@$(ECHO) clean flexDevice release
-	@$(RMDIR) $(flexDevice_release_objsdir)
-	@$(RMDIR) $(flexDevice_release_bin)
-	@$(RMDIR) $(DEPSDIR)/flexDevice/release
-
-build_flexDevice_release: postbuild_flexDevice_release
-postbuild_flexDevice_release: mainbuild_flexDevice_release
-mainbuild_flexDevice_release: prebuild_flexDevice_release $(flexDevice_release_bin)
-prebuild_flexDevice_release:
-
-$(flexDevice_release_bin): $(flexDevice_release_obj) 
-	mkdir -p `dirname ./../../../lib/linux64/NvFlexDeviceRelease_x64.a`
-	@$(AR) rcs $(flexDevice_release_bin) $(flexDevice_release_obj)
-	$(ECHO) building $@ complete!
-
-flexDevice_release_DEPDIR = $(dir $(@))/$(*F)
-$(flexDevice_release_cpp_o): $(flexDevice_release_objsdir)/%.o:
-	$(ECHO) flexDevice: compiling release $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexDevice_release_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles)) -o $@
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles))))))
-	cp $(flexDevice_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles))))).P; \
-	  rm -f $(flexDevice_release_DEPDIR).d
-
-$(flexDevice_release_cc_o): $(flexDevice_release_objsdir)/%.o:
-	$(ECHO) flexDevice: compiling release $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexDevice_release_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles)) -o $@
-	mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles))))))
-	cp $(flexDevice_release_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles))))).release.P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles))))).release.P; \
-	  rm -f $(flexDevice_release_DEPDIR).d
-
-$(flexDevice_release_c_o): $(flexDevice_release_objsdir)/%.o:
-	$(ECHO) flexDevice: compiling release $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles))...
-	mkdir -p $(dir $(@))
-	$(CC) $(flexDevice_release_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles)) -o $@ 
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles))))))
-	cp $(flexDevice_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles))))).P; \
-	  rm -f $(flexDevice_release_DEPDIR).d
-
-flexDevice_debug_hpaths    := 
-flexDevice_debug_hpaths    += ./../../../../../../external/CUDA/8.0.44-linux/include
-flexDevice_debug_hpaths    += ./../../../../../../external/CUDA/8.0.44-linux/extras/cupti/include
-flexDevice_debug_hpaths    += ./../../..
-flexDevice_debug_lpaths    := 
-flexDevice_debug_lpaths    += ./../../../../../../external/CUDA/8.0.44-linux/lib64
-flexDevice_debug_defines   := $(flexDevice_custom_defines)
-flexDevice_debug_libraries := 
-flexDevice_debug_common_cflags	:= $(flexDevice_custom_cflags)
-flexDevice_debug_common_cflags    += -MMD
-flexDevice_debug_common_cflags    += $(addprefix -D, $(flexDevice_debug_defines))
-flexDevice_debug_common_cflags    += $(addprefix -I, $(flexDevice_debug_hpaths))
-flexDevice_debug_common_cflags  += -m64
-flexDevice_debug_cflags	:= $(flexDevice_debug_common_cflags)
-flexDevice_debug_cflags  += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing
-flexDevice_debug_cflags  += -g -O0
-flexDevice_debug_cppflags	:= $(flexDevice_debug_common_cflags)
-flexDevice_debug_cppflags  += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing
-flexDevice_debug_cppflags  += -g -O0
-flexDevice_debug_lflags    := $(flexDevice_custom_lflags)
-flexDevice_debug_lflags    += $(addprefix -L, $(flexDevice_debug_lpaths))
-flexDevice_debug_lflags    += -Wl,--start-group $(addprefix -l, $(flexDevice_debug_libraries)) -Wl,--end-group
-flexDevice_debug_lflags  += -m64
-flexDevice_debug_objsdir  = $(OBJS_DIR)/flexDevice_debug
-flexDevice_debug_cpp_o    = $(addprefix $(flexDevice_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDevice_cppfiles)))))
-flexDevice_debug_cc_o    = $(addprefix $(flexDevice_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexDevice_ccfiles)))))
-flexDevice_debug_c_o      = $(addprefix $(flexDevice_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexDevice_cfiles)))))
-flexDevice_debug_obj      = $(flexDevice_debug_cpp_o) $(flexDevice_debug_cc_o) $(flexDevice_debug_c_o)
-flexDevice_debug_bin      := ./../../../lib/linux64/NvFlexDeviceDebug_x64.a
-
-clean_flexDevice_debug: 
-	@$(ECHO) clean flexDevice debug
-	@$(RMDIR) $(flexDevice_debug_objsdir)
-	@$(RMDIR) $(flexDevice_debug_bin)
-	@$(RMDIR) $(DEPSDIR)/flexDevice/debug
-
-build_flexDevice_debug: postbuild_flexDevice_debug
-postbuild_flexDevice_debug: mainbuild_flexDevice_debug
-mainbuild_flexDevice_debug: prebuild_flexDevice_debug $(flexDevice_debug_bin)
-prebuild_flexDevice_debug:
-
-$(flexDevice_debug_bin): $(flexDevice_debug_obj) 
-	mkdir -p `dirname ./../../../lib/linux64/NvFlexDeviceDebug_x64.a`
-	@$(AR) rcs $(flexDevice_debug_bin) $(flexDevice_debug_obj)
-	$(ECHO) building $@ complete!
-
-flexDevice_debug_DEPDIR = $(dir $(@))/$(*F)
-$(flexDevice_debug_cpp_o): $(flexDevice_debug_objsdir)/%.o:
-	$(ECHO) flexDevice: compiling debug $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cppfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexDevice_debug_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cppfiles)) -o $@
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cppfiles))))))
-	cp $(flexDevice_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cppfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cppfiles))))).P; \
-	  rm -f $(flexDevice_debug_DEPDIR).d
-
-$(flexDevice_debug_cc_o): $(flexDevice_debug_objsdir)/%.o:
-	$(ECHO) flexDevice: compiling debug $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_ccfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexDevice_debug_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_ccfiles)) -o $@
-	mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_ccfiles))))))
-	cp $(flexDevice_debug_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_ccfiles))))).debug.P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_ccfiles))))).debug.P; \
-	  rm -f $(flexDevice_debug_DEPDIR).d
-
-$(flexDevice_debug_c_o): $(flexDevice_debug_objsdir)/%.o:
-	$(ECHO) flexDevice: compiling debug $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cfiles))...
-	mkdir -p $(dir $(@))
-	$(CC) $(flexDevice_debug_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cfiles)) -o $@ 
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cfiles))))))
-	cp $(flexDevice_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cfiles))))).P; \
-	  rm -f $(flexDevice_debug_DEPDIR).d
-
-clean_flexDevice:  clean_flexDevice_release clean_flexDevice_debug
-	rm -rf $(DEPSDIR)
-
-export VERBOSE
-ifndef VERBOSE
-.SILENT:
-endif
diff --git a/demo/compiler/makelinux64/Makefile.flexExtCUDA.mk b/demo/compiler/makelinux64/Makefile.flexExtCUDA.mk
index 78dd100..c0c766e 100644
--- a/demo/compiler/makelinux64/Makefile.flexExtCUDA.mk
+++ b/demo/compiler/makelinux64/Makefile.flexExtCUDA.mk
@@ -23,12 +23,12 @@ flexExtCUDA_c_debug_dep      = $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subs
 flexExtCUDA_debug_dep      = $(flexExtCUDA_cpp_debug_dep) $(flexExtCUDA_cc_debug_dep) $(flexExtCUDA_c_debug_dep)
 -include $(flexExtCUDA_debug_dep)
 flexExtCUDA_release_hpaths    := 
-flexExtCUDA_release_hpaths    += $(CUDA_PATH)/include
-flexExtCUDA_release_hpaths    += $(CUDA_PATH)/extras/cupti/include
+flexExtCUDA_release_hpaths    += /usr/local/cuda/include
+flexExtCUDA_release_hpaths    += /usr/local/cuda/extras/cupti/include
 flexExtCUDA_release_hpaths    += ./../../..
 flexExtCUDA_release_hpaths    += ./../../../external/freeglut/include
 flexExtCUDA_release_lpaths    := 
-flexExtCUDA_release_lpaths    += $(CUDA_PATH)/lib64
+flexExtCUDA_release_lpaths    += /usr/local/cuda/lib64
 flexExtCUDA_release_defines   := $(flexExtCUDA_custom_defines)
 flexExtCUDA_release_libraries := 
 flexExtCUDA_release_libraries += ./../../../lib/linux64/NvFlexReleaseCUDA_x64.a
@@ -71,8 +71,8 @@ $(flexExtCUDA_release_bin): $(flexExtCUDA_release_obj)
 
 $(flexExtCUDA_release_cuda_extensions_cuda_flexExt_cu_o): $(flexExtCUDA_cuda_extensions_cuda_flexExt_cu) 
 	@mkdir -p `dirname $(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o`
-	$(ECHO) $(CUDA_PATH)/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I$(CUDA_PATH)/include -I../../../external/cub-1.3.2  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o"
-	$(CUDA_PATH)/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I$(CUDA_PATH)/include -I../../../external/cub-1.3.2  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o"
+	$(ECHO) /usr/local/cuda/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I/usr/local/cuda/include -I../../../external/cub-1.3.2  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o"
+	/usr/local/cuda/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I/usr/local/cuda/include -I../../../external/cub-1.3.2  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o"
 
 flexExtCUDA_release_DEPDIR = $(dir $(@))/$(*F)
 $(flexExtCUDA_release_cpp_o): $(flexExtCUDA_release_objsdir)/%.o:
@@ -106,12 +106,12 @@ $(flexExtCUDA_release_c_o): $(flexExtCUDA_release_objsdir)/%.o:
 	  rm -f $(flexExtCUDA_release_DEPDIR).d
 
 flexExtCUDA_debug_hpaths    := 
-flexExtCUDA_debug_hpaths    += $(CUDA_PATH)/include
-flexExtCUDA_debug_hpaths    += $(CUDA_PATH)/extras/cupti/include
+flexExtCUDA_debug_hpaths    += /usr/local/cuda/include
+flexExtCUDA_debug_hpaths    += /usr/local/cuda/extras/cupti/include
 flexExtCUDA_debug_hpaths    += ./../../..
 flexExtCUDA_debug_hpaths    += ./../../../external/freeglut/include
 flexExtCUDA_debug_lpaths    := 
-flexExtCUDA_debug_lpaths    += $(CUDA_PATH)/lib64
+flexExtCUDA_debug_lpaths    += /usr/local/cuda/lib64
 flexExtCUDA_debug_defines   := $(flexExtCUDA_custom_defines)
 flexExtCUDA_debug_libraries := 
 flexExtCUDA_debug_libraries += ./../../../lib/linux64/NvFlexDebugCUDA_x64.a
@@ -154,8 +154,8 @@ $(flexExtCUDA_debug_bin): $(flexExtCUDA_debug_obj)
 
 $(flexExtCUDA_debug_cuda_extensions_cuda_flexExt_cu_o): $(flexExtCUDA_cuda_extensions_cuda_flexExt_cu) 
 	@mkdir -p `dirname $(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o`
-	$(ECHO) $(CUDA_PATH)/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I$(CUDA_PATH)/include -I../../../external/cub-1.3.2  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o"
-	$(CUDA_PATH)/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I$(CUDA_PATH)/include -I../../../external/cub-1.3.2  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o"
+	$(ECHO) /usr/local/cuda/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I/usr/local/cuda/include -I../../../external/cub-1.3.2  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o"
+	/usr/local/cuda/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES  -I../../.. -I../../../external -I/usr/local/cuda/include -I../../../external/cub-1.3.2  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o"
 
 flexExtCUDA_debug_DEPDIR = $(dir $(@))/$(*F)
 $(flexExtCUDA_debug_cpp_o): $(flexExtCUDA_debug_objsdir)/%.o: