Flex 1.2.0 release

23 files changed, 199 insertions, 2234 deletions

diff --git a/extensions/compiler/makeandroid/Makefile b/extensions/compiler/makeandroid/Makefile
deleted file mode 100644
index 865fd94..0000000
--- a/extensions/compiler/makeandroid/Makefile
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/make
-# Makefile generated by XPJ for android
-
-DEPSDIR = .deps
-NDKROOT = ./../../../../../../external/android-ndk/android-ndk-r10e-linux
-NDK_BIN_DIR = ./../../../../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin
-NDK_PREFIX = arm-linux-androideabi-
-JAVA_HOME  = ./../../../../../../external/java/jdk1.8.0_20
-ANT_TOOL = ./../../../../../../external/ant/apache-ant-1.8.2/bin/ant
-#default defines
-OBJS_DIR  = build
-RMDIR     = rm -fr
-ECHO      = echo
-CCLD      =  $(NDK_BIN_DIR)/$(NDK_PREFIX)g++
-CXX       =  $(NDK_BIN_DIR)/$(NDK_PREFIX)g++
-CC        =  $(NDK_BIN_DIR)/$(NDK_PREFIX)gcc
-RANLIB    = $(NDK_BIN_DIR)/$(NDK_PREFIX)ranlib
-AR		 = $(NDK_BIN_DIR)/$(NDK_PREFIX)ar
-STRIP     = $(NDK_BIN_DIR)/$(NDK_PREFIX)strip
-OBJDUMP   = $(NDK_BIN_DIR)/$(NDK_PREFIX)objdump
-OBJCOPY   = $(NDK_BIN_DIR)/$(NDK_PREFIX)objcopy
--include Makedefs.ANDROID.mk
-
-all: debug release 
-
-debug: build_flexCUDA_debug build_flexExtCUDA_debug 
-
-release: build_flexCUDA_release build_flexExtCUDA_release 
-
-clean: clean_flexCUDA_release clean_flexCUDA_debug clean_flexExtCUDA_release clean_flexExtCUDA_debug 
-	rm -rf $(DEPSDIR)
-
-
-clean_release: clean_flexCUDA_release clean_flexExtCUDA_release 
-	rm -rf $(DEPSDIR)
-
-
-clean_debug: clean_flexCUDA_debug clean_flexExtCUDA_debug 
-	rm -rf $(DEPSDIR)
-
-
-include Makefile.flexCUDA.mk
-include Makefile.flexExtCUDA.mk
-
-
-# Disable implicit rules to speedup build
-.SUFFIXES:
-SUFFIXES :=
-%.out:
-%.a:
-%.ln:
-%.o:
-%: %.o
-%.c:
-%: %.c
-%.ln: %.c
-%.o: %.c
-%.cc:
-%: %.cc
-%.o: %.cc
-%.C:
-%: %.C
-%.o: %.C
-%.cpp:
-%: %.cpp
-%.o: %.cpp
-%.p:
-%: %.p
-%.o: %.p
-%.f:
-%:
- %.f%.o: %.f
-%.F:
-%: %.F
-%.o: %.F
-%.f: %.F
-%.r:
-%: %.r
-%.o: %.r
-%.f: %.r
-%.y:
-%.ln: %.y
-%.c: %.y
-%.l:
-%.ln: %.l
-%.c: %.l
-%.r: %.l
-%.s:
-%: %.s
-%.o: %.s
-%.S:
-%: %.S
-%.o: %.S
-%.s: %.S
-%.mod:
-%: %.mod
-%.o: %.mod
-%.sym:
-%.def:
-%.sym: %.def
-%.h:
-%.info:
-%.dvi:
-%.tex:
-%.dvi: %.tex
-%.texinfo:
-%.info: %.texinfo
-%.dvi: %.texinfo
-%.texi:
-%.info: %.texi
-%.dvi: %.texi
-%.txinfo:
-%.info: %.txinfo
-%.dvi: %.txinfo
-%.w:
-%.c: %.w
-%.tex: %.w
-%.ch:
-%.web:
-%.p: %.web
-%.tex: %.web
-%.sh:
-%: %.sh
-%.elc:
-%.el:
-(%): %
-%.out: %
-%.c: %.w %.ch
-%.tex: %.w %.ch
-%: %,v
-%: RCS/%,v
-%: RCS/%
-%: s.%
-%: SCCS/s.%
-.web.p:
-.l.r:
-.dvi:
-.F.o:
-.l:
-.y.ln:
-.o:
-.y:
-.def.sym:
-.p.o:
-.p:
-.txinfo.dvi:
-.a:
-.l.ln:
-.w.c:
-.texi.dvi:
-.sh:
-.cc:
-.cc.o:
-.def:
-.c.o:
-.r.o:
-.r:
-.info:
-.elc:
-.l.c:
-.out:
-.C:
-.r.f:
-.S:
-.texinfo.info:
-.c:
-.w.tex:
-.c.ln:
-.s.o:
-.s:
-.texinfo.dvi:
-.el:
-.texinfo:
-.y.c:
-.web.tex:
-.texi.info:
-.DEFAULT:
-.h:
-.tex.dvi:
-.cpp.o:
-.cpp:
-.C.o:
-.ln:
-.texi:
-.txinfo:
-.tex:
-.txinfo.info:
-.ch:
-.S.s:
-.mod:
-.mod.o:
-.F.f:
-.w:
-.S.o:
-.F:
-.web:
-.sym:
-.f:
-.f.o:
-export VERBOSE
-ifndef VERBOSE
-.SILENT:
-endif
diff --git a/extensions/compiler/makeandroid/Makefile.flexCUDA.mk b/extensions/compiler/makeandroid/Makefile.flexCUDA.mk
deleted file mode 100644
index 2f9e44a..0000000
--- a/extensions/compiler/makeandroid/Makefile.flexCUDA.mk
+++ /dev/null
@@ -1,225 +0,0 @@
-# Makefile generated by XPJ for android
--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    += ./../../..
-flexCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include
-flexCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport
-flexCUDA_release_hpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include
-flexCUDA_release_lpaths    := 
-flexCUDA_release_lpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib
-flexCUDA_release_lpaths    += ./../../../lib/android
-flexCUDA_release_lpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/libs/armeabi-v7a
-flexCUDA_release_defines   := $(flexCUDA_custom_defines)
-flexCUDA_release_defines   += android
-flexCUDA_release_defines   += ANDROID=1
-flexCUDA_release_defines   += ANDROID_PLAT=1
-flexCUDA_release_defines   += DISABLE_IMPORTGL
-flexCUDA_release_libraries := 
-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_cflags	:= $(flexCUDA_release_common_cflags)
-flexCUDA_release_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexCUDA_release_cflags  += -O3 -ffast-math
-flexCUDA_release_cppflags	:= $(flexCUDA_release_common_cflags)
-flexCUDA_release_cppflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexCUDA_release_cppflags  += -O3 -ffast-math
-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_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/android/libNvFlexReleaseCUDA_armv7l.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/android/libNvFlexReleaseCUDA_armv7l.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/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o"
-	"../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --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/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o"
-	"../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --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/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o"
-	"../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --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    += ./../../..
-flexCUDA_debug_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include
-flexCUDA_debug_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport
-flexCUDA_debug_hpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include
-flexCUDA_debug_lpaths    := 
-flexCUDA_debug_lpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib
-flexCUDA_debug_lpaths    += ./../../../lib/android
-flexCUDA_debug_lpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/libs/armeabi-v7a
-flexCUDA_debug_defines   := $(flexCUDA_custom_defines)
-flexCUDA_debug_defines   += android
-flexCUDA_debug_defines   += ANDROID=1
-flexCUDA_debug_defines   += ANDROID_PLAT=1
-flexCUDA_debug_defines   += DISABLE_IMPORTGL
-flexCUDA_debug_libraries := 
-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_cflags	:= $(flexCUDA_debug_common_cflags)
-flexCUDA_debug_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexCUDA_debug_cflags  += -g -O0
-flexCUDA_debug_cppflags	:= $(flexCUDA_debug_common_cflags)
-flexCUDA_debug_cppflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-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_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/android/libNvFlexDebugCUDA_armv7l.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/android/libNvFlexDebugCUDA_armv7l.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/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o"
-	"../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --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/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o"
-	"../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --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/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o"
-	"../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --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/extensions/compiler/makeandroid/Makefile.flexExtCUDA.mk b/extensions/compiler/makeandroid/Makefile.flexExtCUDA.mk
deleted file mode 100644
index cffe816..0000000
--- a/extensions/compiler/makeandroid/Makefile.flexExtCUDA.mk
+++ /dev/null
@@ -1,213 +0,0 @@
-# Makefile generated by XPJ for android
--include Makefile.custom
-ProjectName = flexExtCUDA
-flexExtCUDA_cppfiles   += ./../../flexExtCloth.cpp
-flexExtCUDA_cppfiles   += ./../../flexExtContainer.cpp
-flexExtCUDA_cppfiles   += ./../../flexExtMovingFrame.cpp
-flexExtCUDA_cppfiles   += ./../../flexExtRigid.cpp
-flexExtCUDA_cppfiles   += ./../../flexExtSoft.cpp
-flexExtCUDA_cuda_cuda_flexExt_cu   += ./../../cuda/flexExt.cu
-flexExtCUDA_cppfiles   += ./../../../core/sdf.cpp
-flexExtCUDA_cppfiles   += ./../../../core/voxelize.cpp
-flexExtCUDA_cppfiles   += ./../../../core/maths.cpp
-flexExtCUDA_cppfiles   += ./../../../core/aabbtree.cpp
-
-flexExtCUDA_cpp_release_dep    = $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexExtCUDA_cppfiles)))))
-flexExtCUDA_cc_release_dep    = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexExtCUDA_ccfiles)))))
-flexExtCUDA_c_release_dep      = $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexExtCUDA_cfiles)))))
-flexExtCUDA_release_dep      = $(flexExtCUDA_cpp_release_dep) $(flexExtCUDA_cc_release_dep) $(flexExtCUDA_c_release_dep)
--include $(flexExtCUDA_release_dep)
-flexExtCUDA_cpp_debug_dep    = $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexExtCUDA_cppfiles)))))
-flexExtCUDA_cc_debug_dep    = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.debug.P, $(flexExtCUDA_ccfiles)))))
-flexExtCUDA_c_debug_dep      = $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexExtCUDA_cfiles)))))
-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    += ./../../..
-flexExtCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include
-flexExtCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport
-flexExtCUDA_release_hpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include
-flexExtCUDA_release_lpaths    := 
-flexExtCUDA_release_lpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib
-flexExtCUDA_release_lpaths    += ./../../../lib/android
-flexExtCUDA_release_lpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/libs/armeabi-v7a
-flexExtCUDA_release_lpaths    += ./../../../lib/android
-flexExtCUDA_release_defines   := $(flexExtCUDA_custom_defines)
-flexExtCUDA_release_defines   += android
-flexExtCUDA_release_defines   += ANDROID=1
-flexExtCUDA_release_defines   += ANDROID_PLAT=1
-flexExtCUDA_release_defines   += DISABLE_IMPORTGL
-flexExtCUDA_release_libraries := 
-flexExtCUDA_release_libraries += NvFlexReleaseCUDA_armv7l
-flexExtCUDA_release_libraries += ./../../../lib/android/libNvFlexRelease_armv7l.a
-flexExtCUDA_release_common_cflags	:= $(flexExtCUDA_custom_cflags)
-flexExtCUDA_release_common_cflags    += -MMD
-flexExtCUDA_release_common_cflags    += $(addprefix -D, $(flexExtCUDA_release_defines))
-flexExtCUDA_release_common_cflags    += $(addprefix -I, $(flexExtCUDA_release_hpaths))
-flexExtCUDA_release_cflags	:= $(flexExtCUDA_release_common_cflags)
-flexExtCUDA_release_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexExtCUDA_release_cflags  += -O3 -ffast-math
-flexExtCUDA_release_cppflags	:= $(flexExtCUDA_release_common_cflags)
-flexExtCUDA_release_cppflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexExtCUDA_release_cppflags  += -O3 -ffast-math
-flexExtCUDA_release_lflags    := $(flexExtCUDA_custom_lflags)
-flexExtCUDA_release_lflags    += $(addprefix -L, $(flexExtCUDA_release_lpaths))
-flexExtCUDA_release_lflags    += -Wl,--start-group $(addprefix -l, $(flexExtCUDA_release_libraries)) -Wl,--end-group
-flexExtCUDA_release_objsdir  = $(OBJS_DIR)/flexExtCUDA_release
-flexExtCUDA_release_cpp_o    = $(addprefix $(flexExtCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexExtCUDA_cppfiles)))))
-flexExtCUDA_release_cc_o    = $(addprefix $(flexExtCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexExtCUDA_ccfiles)))))
-flexExtCUDA_release_c_o      = $(addprefix $(flexExtCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexExtCUDA_cfiles)))))
-flexExtCUDA_release_cuda_cuda_flexExt_cu_o += $(OBJS_DIR)/flexExtCUDA_release/cuda/cudaflexExt.o
-flexExtCUDA_release_obj      = $(flexExtCUDA_release_cpp_o) $(flexExtCUDA_release_cc_o) $(flexExtCUDA_release_c_o) $(flexExtCUDA_release_cuda_cuda_flexExt_cu_o)
-flexExtCUDA_release_bin      := ./../../../lib/android/libflexExt_cuda_release_armv7l.a
-
-clean_flexExtCUDA_release: 
-	@$(ECHO) clean flexExtCUDA release
-	@$(RMDIR) $(flexExtCUDA_release_objsdir)
-	@$(RMDIR) $(flexExtCUDA_release_bin)
-	@$(RMDIR) $(DEPSDIR)/flexExtCUDA/release
-
-build_flexExtCUDA_release: postbuild_flexExtCUDA_release
-postbuild_flexExtCUDA_release: mainbuild_flexExtCUDA_release
-mainbuild_flexExtCUDA_release: prebuild_flexExtCUDA_release $(flexExtCUDA_release_bin)
-prebuild_flexExtCUDA_release:
-
-$(flexExtCUDA_release_bin): $(flexExtCUDA_release_obj) build_flexCUDA_release 
-	mkdir -p `dirname ./../../../lib/android/libflexExt_cuda_release_armv7l.a`
-	@$(AR) rcs $(flexExtCUDA_release_bin) $(flexExtCUDA_release_obj)
-	$(ECHO) building $@ complete!
-
-$(flexExtCUDA_release_cuda_cuda_flexExt_cu_o): $(flexExtCUDA_cuda_cuda_flexExt_cu) 
-	@mkdir -p `dirname $(OBJS_DIR)/flexExtCUDA_release/cuda/cudaflexExt.o`
-	$(ECHO) "../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/cudaflexExt.o"
-	"../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/cudaflexExt.o"
-
-flexExtCUDA_release_DEPDIR = $(dir $(@))/$(*F)
-$(flexExtCUDA_release_cpp_o): $(flexExtCUDA_release_objsdir)/%.o:
-	$(ECHO) flexExtCUDA: compiling release $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cppfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexExtCUDA_release_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cppfiles)) -o $@
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cppfiles))))))
-	cp $(flexExtCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cppfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cppfiles))))).P; \
-	  rm -f $(flexExtCUDA_release_DEPDIR).d
-
-$(flexExtCUDA_release_cc_o): $(flexExtCUDA_release_objsdir)/%.o:
-	$(ECHO) flexExtCUDA: compiling release $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_ccfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexExtCUDA_release_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_ccfiles)) -o $@
-	mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_ccfiles))))))
-	cp $(flexExtCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_ccfiles))))).release.P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_ccfiles))))).release.P; \
-	  rm -f $(flexExtCUDA_release_DEPDIR).d
-
-$(flexExtCUDA_release_c_o): $(flexExtCUDA_release_objsdir)/%.o:
-	$(ECHO) flexExtCUDA: compiling release $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cfiles))...
-	mkdir -p $(dir $(@))
-	$(CC) $(flexExtCUDA_release_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cfiles)) -o $@ 
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cfiles))))))
-	cp $(flexExtCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cfiles))))).P; \
-	  rm -f $(flexExtCUDA_release_DEPDIR).d
-
-flexExtCUDA_debug_hpaths    := 
-flexExtCUDA_debug_hpaths    += ./../../..
-flexExtCUDA_debug_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include
-flexExtCUDA_debug_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport
-flexExtCUDA_debug_hpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include
-flexExtCUDA_debug_lpaths    := 
-flexExtCUDA_debug_lpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib
-flexExtCUDA_debug_lpaths    += ./../../../lib/android
-flexExtCUDA_debug_lpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/libs/armeabi-v7a
-flexExtCUDA_debug_lpaths    += ./../../../lib/android
-flexExtCUDA_debug_defines   := $(flexExtCUDA_custom_defines)
-flexExtCUDA_debug_defines   += android
-flexExtCUDA_debug_defines   += ANDROID=1
-flexExtCUDA_debug_defines   += ANDROID_PLAT=1
-flexExtCUDA_debug_defines   += DISABLE_IMPORTGL
-flexExtCUDA_debug_libraries := 
-flexExtCUDA_debug_libraries += NvFlexDebugCUDA_armv7l
-flexExtCUDA_debug_libraries += ./../../../lib/android/libNvFlexDebug_armv7l.a
-flexExtCUDA_debug_common_cflags	:= $(flexExtCUDA_custom_cflags)
-flexExtCUDA_debug_common_cflags    += -MMD
-flexExtCUDA_debug_common_cflags    += $(addprefix -D, $(flexExtCUDA_debug_defines))
-flexExtCUDA_debug_common_cflags    += $(addprefix -I, $(flexExtCUDA_debug_hpaths))
-flexExtCUDA_debug_cflags	:= $(flexExtCUDA_debug_common_cflags)
-flexExtCUDA_debug_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexExtCUDA_debug_cflags  += -g -O0
-flexExtCUDA_debug_cppflags	:= $(flexExtCUDA_debug_common_cflags)
-flexExtCUDA_debug_cppflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexExtCUDA_debug_cppflags  += -g -O0
-flexExtCUDA_debug_lflags    := $(flexExtCUDA_custom_lflags)
-flexExtCUDA_debug_lflags    += $(addprefix -L, $(flexExtCUDA_debug_lpaths))
-flexExtCUDA_debug_lflags    += -Wl,--start-group $(addprefix -l, $(flexExtCUDA_debug_libraries)) -Wl,--end-group
-flexExtCUDA_debug_objsdir  = $(OBJS_DIR)/flexExtCUDA_debug
-flexExtCUDA_debug_cpp_o    = $(addprefix $(flexExtCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexExtCUDA_cppfiles)))))
-flexExtCUDA_debug_cc_o    = $(addprefix $(flexExtCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexExtCUDA_ccfiles)))))
-flexExtCUDA_debug_c_o      = $(addprefix $(flexExtCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexExtCUDA_cfiles)))))
-flexExtCUDA_debug_cuda_cuda_flexExt_cu_o += $(OBJS_DIR)/flexExtCUDA_debug/cuda/cudaflexExt.o
-flexExtCUDA_debug_obj      = $(flexExtCUDA_debug_cpp_o) $(flexExtCUDA_debug_cc_o) $(flexExtCUDA_debug_c_o) $(flexExtCUDA_debug_cuda_cuda_flexExt_cu_o)
-flexExtCUDA_debug_bin      := ./../../../lib/android/libflexExt_cuda_debug_armv7l.a
-
-clean_flexExtCUDA_debug: 
-	@$(ECHO) clean flexExtCUDA debug
-	@$(RMDIR) $(flexExtCUDA_debug_objsdir)
-	@$(RMDIR) $(flexExtCUDA_debug_bin)
-	@$(RMDIR) $(DEPSDIR)/flexExtCUDA/debug
-
-build_flexExtCUDA_debug: postbuild_flexExtCUDA_debug
-postbuild_flexExtCUDA_debug: mainbuild_flexExtCUDA_debug
-mainbuild_flexExtCUDA_debug: prebuild_flexExtCUDA_debug $(flexExtCUDA_debug_bin)
-prebuild_flexExtCUDA_debug:
-
-$(flexExtCUDA_debug_bin): $(flexExtCUDA_debug_obj) build_flexCUDA_debug 
-	mkdir -p `dirname ./../../../lib/android/libflexExt_cuda_debug_armv7l.a`
-	@$(AR) rcs $(flexExtCUDA_debug_bin) $(flexExtCUDA_debug_obj)
-	$(ECHO) building $@ complete!
-
-$(flexExtCUDA_debug_cuda_cuda_flexExt_cu_o): $(flexExtCUDA_cuda_cuda_flexExt_cu) 
-	@mkdir -p `dirname $(OBJS_DIR)/flexExtCUDA_debug/cuda/cudaflexExt.o`
-	$(ECHO) "../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/cudaflexExt.o"
-	"../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/cudaflexExt.o"
-
-flexExtCUDA_debug_DEPDIR = $(dir $(@))/$(*F)
-$(flexExtCUDA_debug_cpp_o): $(flexExtCUDA_debug_objsdir)/%.o:
-	$(ECHO) flexExtCUDA: compiling debug $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cppfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexExtCUDA_debug_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cppfiles)) -o $@
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cppfiles))))))
-	cp $(flexExtCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cppfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cppfiles))))).P; \
-	  rm -f $(flexExtCUDA_debug_DEPDIR).d
-
-$(flexExtCUDA_debug_cc_o): $(flexExtCUDA_debug_objsdir)/%.o:
-	$(ECHO) flexExtCUDA: compiling debug $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_ccfiles))...
-	mkdir -p $(dir $(@))
-	$(CXX) $(flexExtCUDA_debug_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_ccfiles)) -o $@
-	mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_ccfiles))))))
-	cp $(flexExtCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_ccfiles))))).debug.P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_ccfiles))))).debug.P; \
-	  rm -f $(flexExtCUDA_debug_DEPDIR).d
-
-$(flexExtCUDA_debug_c_o): $(flexExtCUDA_debug_objsdir)/%.o:
-	$(ECHO) flexExtCUDA: compiling debug $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cfiles))...
-	mkdir -p $(dir $(@))
-	$(CC) $(flexExtCUDA_debug_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cfiles)) -o $@ 
-	@mkdir -p $(dir $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cfiles))))))
-	cp $(flexExtCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cfiles))))).P; \
-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-		-e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cfiles))))).P; \
-	  rm -f $(flexExtCUDA_debug_DEPDIR).d
-
-clean_flexExtCUDA:  clean_flexExtCUDA_release clean_flexExtCUDA_debug
-	rm -rf $(DEPSDIR)
-
-export VERBOSE
-ifndef VERBOSE
-.SILENT:
-endif
diff --git a/extensions/compiler/makeandroid_aarch64/Makefile.flexCUDA.mk b/extensions/compiler/makeandroid_aarch64/Makefile.flexCUDA.mk
deleted file mode 100644
index bdfb113..0000000
--- a/extensions/compiler/makeandroid_aarch64/Makefile.flexCUDA.mk
+++ /dev/null
@@ -1,227 +0,0 @@
-# Makefile generated by XPJ for android_aarch64
--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    += ./../../..
-flexCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include
-flexCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include
-flexCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include
-flexCUDA_release_hpaths    += ./../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include
-flexCUDA_release_lpaths    := 
-flexCUDA_release_lpaths    += ./../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/lib
-flexCUDA_release_lpaths    += ./../../../lib/android
-flexCUDA_release_lpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a
-flexCUDA_release_defines   := $(flexCUDA_custom_defines)
-flexCUDA_release_defines   += android
-flexCUDA_release_defines   += ANDROID=1
-flexCUDA_release_defines   += ANDROID_PLAT=1
-flexCUDA_release_defines   += DISABLE_IMPORTGL
-flexCUDA_release_libraries := 
-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_cflags	:= $(flexCUDA_release_common_cflags)
-flexCUDA_release_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexCUDA_release_cflags  += -O3 -ffast-math
-flexCUDA_release_cppflags	:= $(flexCUDA_release_common_cflags)
-flexCUDA_release_cppflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexCUDA_release_cppflags  += -O3 -ffast-math
-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_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/android_aarch64/libNvFlexReleaseCUDA_aarch64.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/android_aarch64/libNvFlexReleaseCUDA_aarch64.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/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o"
-	"../../../../../../external/CUDA/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --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/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o"
-	"../../../../../../external/CUDA/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --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/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o"
-	"../../../../../../external/CUDA/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --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    += ./../../..
-flexCUDA_debug_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include
-flexCUDA_debug_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include
-flexCUDA_debug_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include
-flexCUDA_debug_hpaths    += ./../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include
-flexCUDA_debug_lpaths    := 
-flexCUDA_debug_lpaths    += ./../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/lib
-flexCUDA_debug_lpaths    += ./../../../lib/android
-flexCUDA_debug_lpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a
-flexCUDA_debug_defines   := $(flexCUDA_custom_defines)
-flexCUDA_debug_defines   += android
-flexCUDA_debug_defines   += ANDROID=1
-flexCUDA_debug_defines   += ANDROID_PLAT=1
-flexCUDA_debug_defines   += DISABLE_IMPORTGL
-flexCUDA_debug_libraries := 
-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_cflags	:= $(flexCUDA_debug_common_cflags)
-flexCUDA_debug_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexCUDA_debug_cflags  += -g -O0
-flexCUDA_debug_cppflags	:= $(flexCUDA_debug_common_cflags)
-flexCUDA_debug_cppflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-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_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/android_aarch64/libNvFlexDebugCUDA_aarch64.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/android_aarch64/libNvFlexDebugCUDA_aarch64.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/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o"
-	"../../../../../../external/CUDA/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --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/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o"
-	"../../../../../../external/CUDA/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --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/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o"
-	"../../../../../../external/CUDA/cuda-7.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-g++ -target-cpu-arch=ARM -m64 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-7.0-linux/targets/aarch64-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-21/arch-arm64/usr/include"  --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/extensions/compiler/makelinux64/Makefile.flexCUDA.mk b/extensions/compiler/makelinux64/Makefile.flexCUDA.mk
deleted file mode 100644
index 3d3b9cd..0000000
--- a/extensions/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/extensions/compiler/makelinux64/Makefile.flexExtCUDA.mk b/extensions/compiler/makelinux64/Makefile.flexExtCUDA.mk
index cf13501..71fa3a5 100644
--- a/extensions/compiler/makelinux64/Makefile.flexExtCUDA.mk
+++ b/extensions/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_cuda_flexExt_cu_o): $(flexExtCUDA_cuda_cuda_flexExt_cu) 
 	@mkdir -p `dirname $(OBJS_DIR)/flexExtCUDA_release/cuda/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 "./../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/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 "./../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/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 "./../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/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 "./../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/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_cuda_flexExt_cu_o): $(flexExtCUDA_cuda_cuda_flexExt_cu) 
 	@mkdir -p `dirname $(OBJS_DIR)/flexExtCUDA_debug/cuda/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 "./../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/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 "./../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/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 "./../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/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 "./../../cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/cudaflexExt.o"
 
 flexExtCUDA_debug_DEPDIR = $(dir $(@))/$(*F)
 $(flexExtCUDA_debug_cpp_o): $(flexExtCUDA_debug_objsdir)/%.o:
diff --git a/extensions/compiler/vc12win32/flexExtCUDA.vcxproj b/extensions/compiler/vc12win32/flexExtCUDA.vcxproj
index 43efc87..de0e3a5 100644
--- a/extensions/compiler/vc12win32/flexExtCUDA.vcxproj
+++ b/extensions/compiler/vc12win32/flexExtCUDA.vcxproj
@@ -56,6 +56,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win32/NvFlexDebugCUDA_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtDebugCUDA_x86.dll</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -97,6 +98,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win32/NvFlexReleaseCUDA_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtReleaseCUDA_x86.dll</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/extensions/compiler/vc12win32/flexExtD3D.vcxproj b/extensions/compiler/vc12win32/flexExtD3D.vcxproj
index db0828b..6be1973 100644
--- a/extensions/compiler/vc12win32/flexExtD3D.vcxproj
+++ b/extensions/compiler/vc12win32/flexExtD3D.vcxproj
@@ -56,7 +56,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll</AdditionalOptions>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtDebugD3D_x86.dll</OutputFile>
 			<AdditionalLibraryDirectories>./../../../external/D3D11/libs/x86;./../../../external/D3D12/libs/x86;./../../../lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -97,7 +97,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll</AdditionalOptions>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtReleaseD3D_x86.dll</OutputFile>
 			<AdditionalLibraryDirectories>./../../../external/D3D11/libs/x86;./../../../external/D3D12/libs/x86;./../../../lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/extensions/compiler/vc12win32/vc120.pdb b/extensions/compiler/vc12win32/vc120.pdb
deleted file mode 100644
index 6d5215f..0000000
--- a/extensions/compiler/vc12win32/vc120.pdb
+++ /dev/null
diff --git a/extensions/compiler/vc12win64/flexExtCUDA.vcxproj b/extensions/compiler/vc12win64/flexExtCUDA.vcxproj
index 630fc57..0638778 100644
--- a/extensions/compiler/vc12win64/flexExtCUDA.vcxproj
+++ b/extensions/compiler/vc12win64/flexExtCUDA.vcxproj
@@ -56,6 +56,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win64/NvFlexDebugCUDA_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtDebugCUDA_x64.dll</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -97,6 +98,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win64/NvFlexReleaseCUDA_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtReleaseCUDA_x64.dll</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/extensions/compiler/vc12win64/flexExtD3D.vcxproj b/extensions/compiler/vc12win64/flexExtD3D.vcxproj
index 8379d5a..6080da0 100644
--- a/extensions/compiler/vc12win64/flexExtD3D.vcxproj
+++ b/extensions/compiler/vc12win64/flexExtD3D.vcxproj
@@ -56,7 +56,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll</AdditionalOptions>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib;./../../../lib/win64/NvFlexDebugD3D_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtDebugD3D_x64.dll</OutputFile>
 			<AdditionalLibraryDirectories>./../../../external/D3D11/libs/x64;./../../../external/D3D12/libs/x64;./../../../lib/win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -97,7 +97,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll</AdditionalOptions>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib;./../../../lib/win64/NvFlexReleaseD3D_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtReleaseD3D_x64.dll</OutputFile>
 			<AdditionalLibraryDirectories>./../../../external/D3D11/libs/x64;./../../../external/D3D12/libs/x64;./../../../lib/win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/extensions/compiler/vc12win64/vc120.pdb b/extensions/compiler/vc12win64/vc120.pdb
deleted file mode 100644
index 93c4692..0000000
--- a/extensions/compiler/vc12win64/vc120.pdb
+++ /dev/null
diff --git a/extensions/compiler/vc14win32/flexExtCUDA.vcxproj b/extensions/compiler/vc14win32/flexExtCUDA.vcxproj
index 871676c..e0e7088 100644
--- a/extensions/compiler/vc14win32/flexExtCUDA.vcxproj
+++ b/extensions/compiler/vc14win32/flexExtCUDA.vcxproj
@@ -56,6 +56,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win32/NvFlexDebugCUDA_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtDebugCUDA_x86.dll</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -97,6 +98,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win32/NvFlexReleaseCUDA_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtReleaseCUDA_x86.dll</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/extensions/compiler/vc14win32/flexExtD3D.vcxproj b/extensions/compiler/vc14win32/flexExtD3D.vcxproj
index ae0a1b2..d87abae 100644
--- a/extensions/compiler/vc14win32/flexExtD3D.vcxproj
+++ b/extensions/compiler/vc14win32/flexExtD3D.vcxproj
@@ -56,7 +56,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll</AdditionalOptions>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtDebugD3D_x86.dll</OutputFile>
 			<AdditionalLibraryDirectories>./../../../external/D3D11/libs/x86;./../../../external/D3D12/libs/x86;./../../../lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -97,7 +97,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll</AdditionalOptions>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtReleaseD3D_x86.dll</OutputFile>
 			<AdditionalLibraryDirectories>./../../../external/D3D11/libs/x86;./../../../external/D3D12/libs/x86;./../../../lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/extensions/compiler/vc14win32/vc140.pdb b/extensions/compiler/vc14win32/vc140.pdb
deleted file mode 100644
index 77acd50..0000000
--- a/extensions/compiler/vc14win32/vc140.pdb
+++ /dev/null
diff --git a/extensions/compiler/vc14win64/flexExtCUDA.vcxproj b/extensions/compiler/vc14win64/flexExtCUDA.vcxproj
index 5fe44c7..6818787 100644
--- a/extensions/compiler/vc14win64/flexExtCUDA.vcxproj
+++ b/extensions/compiler/vc14win64/flexExtCUDA.vcxproj
@@ -56,6 +56,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win64/NvFlexDebugCUDA_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtDebugCUDA_x64.dll</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -97,6 +98,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win64/NvFlexReleaseCUDA_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtReleaseCUDA_x64.dll</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/extensions/compiler/vc14win64/flexExtD3D.vcxproj b/extensions/compiler/vc14win64/flexExtD3D.vcxproj
index d43e287..05f7652 100644
--- a/extensions/compiler/vc14win64/flexExtD3D.vcxproj
+++ b/extensions/compiler/vc14win64/flexExtD3D.vcxproj
@@ -56,7 +56,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll</AdditionalOptions>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib;./../../../lib/win64/NvFlexDebugD3D_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtDebugD3D_x64.dll</OutputFile>
 			<AdditionalLibraryDirectories>./../../../external/D3D11/libs/x64;./../../../external/D3D12/libs/x64;./../../../lib/win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -97,7 +97,7 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll</AdditionalOptions>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
 			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib;./../../../lib/win64/NvFlexReleaseD3D_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexExtReleaseD3D_x64.dll</OutputFile>
 			<AdditionalLibraryDirectories>./../../../external/D3D11/libs/x64;./../../../external/D3D12/libs/x64;./../../../lib/win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/extensions/compiler/vc14win64/vc140.pdb b/extensions/compiler/vc14win64/vc140.pdb
deleted file mode 100644
index fe2e606..0000000
--- a/extensions/compiler/vc14win64/vc140.pdb
+++ /dev/null
diff --git a/extensions/compiler/xpj/flexExtCUDA.xpj b/extensions/compiler/xpj/flexExtCUDA.xpj
deleted file mode 100644
index 6e80a6f..0000000
--- a/extensions/compiler/xpj/flexExtCUDA.xpj
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<XPJ version="4">
-
-	<template filename="../../../common.xpjt"/>
-
-	<Project name="flexExtCUDA">
-
-		<!-- depends on flex solver project -->
-		<Conditional value="${config}" match="internal">
-			<Import file="../../../src/compiler/xpj/flexCUDA.xpj" />
-		</Conditional>
-
-		<Export platforms="Win32 Win64">../${xpj:TOOL}${xpj:PLATFORM}</Export>
-		<Export platform="android_aarch64" tool="make">../makeandroid_aarch64</Export>
-		<Export platform="Linux64" tool="make">../makelinux64</Export>
-
-		<Target name="flexExtCUDA">
-
-			<Var name="ProjectRoot" value="../../.." />
-			
-			<!-- Windows -->
-
-			<Config name="default" type="dll" platforms="Win32 Win64">
-
-				<apply-template name="windows-common"/>				
-
-				<OutDir platform="Win32">../../../bin/win32/</OutDir>
-				<OutDir platform="Win64">../../../bin/win64/</OutDir>
-
-				<Preprocessor type="define">
-					_CONSOLE 
-					WIN32
-				</Preprocessor>
-
-				<WarningLevel>3</WarningLevel>
-				<GenerateDebugInformation>true</GenerateDebugInformation>
-				<CharacterSet>MultiByte</CharacterSet>
-				
-				<SearchPaths type="header">
-					..\..\..\..\..
-				</SearchPaths>
-
-				<Libraries>
-				cudart.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
-				</Libraries>
-				
-			</Config>
-
-			<Config name="debug" type="dll" platforms="Win32 Win64">
-
-				<apply-template name="windows-common"/>				
-
-				<OutFile platform="Win32">NvFlexExtDebugCUDA_x86.dll</OutFile>
-				<OutFile platform="Win64">NvFlexExtDebugCUDA_x64.dll</OutFile>
-
-				<IntDir>./build/${xpj:PLATFORM}/debug/</IntDir>
-
-				<Preprocessor type="define">
-					_DEBUG
-				</Preprocessor>
-				<Preprocessor type="define">
-					_ITERATOR_DEBUG_LEVEL=0
-				</Preprocessor>
-				<RuntimeLibrary>MTd</RuntimeLibrary>
-				<GenerateDebugInformation>true</GenerateDebugInformation>
-				<FloatingPointModel>Precise</FloatingPointModel>
-				<ExportLibrary platform="Win32">..\..\..\lib\win32\NvFlexExtDebugCUDA_x86.lib</ExportLibrary>
-				<ExportLibrary platform="Win64">..\..\..\lib\win64\NvFlexExtDebugCUDA_x64.lib</ExportLibrary>
-
-				<FileTemplate platform="Win32" name="cuda" command="&quot;${user:CUDA_PATH}\bin\nvcc.exe&quot; -g -G --compiler-bindir=&quot;$(VCInstallDir)bin&quot; --compiler-options=/MTd,/Zi -I&quot;..\..\..&quot; -D_ITERATOR_DEBUG_LEVEL=0 -DCUDA -m32 -arch=sm_30 -prec-div=false -prec-sqrt=false -ftz=true -use_fast_math -c %s -o %o" buildtype="CustomBuild" filetype="cuda" description="Building %(Identity)" />
-				<FileTemplate platform="Win64" name="cuda" command="&quot;${user:CUDA_PATH}\bin\nvcc.exe&quot; -g -G --compiler-bindir=&quot;$(VCInstallDir)bin&quot; --compiler-options=/MTd,/Zi -I&quot;..\..\..&quot; -D_ITERATOR_DEBUG_LEVEL=0 -DCUDA -arch=sm_30 -prec-div=false -prec-sqrt=false -ftz=true -use_fast_math -c %s -o %o" buildtype="CustomBuild" filetype="cuda" description="Building %(Identity)" />
-
-				<Libraries platforms="Win32">
-					${user:ProjectRoot}/lib/win32/NvFlexDebugCUDA_x86.lib
-				</Libraries>
-
-				<Libraries platforms="Win64">
-					${user:ProjectRoot}/lib/win64/NvFlexDebugCUDA_x64.lib
-				</Libraries>
-
-			</Config>
-
-			<Config name="release" type="dll" platforms="Win32 Win64">
-
-				<apply-template name="windows-common"/>				
-
-				<OutFile platform="Win32">NvFlexExtReleaseCUDA_x86.dll</OutFile>
-				<OutFile platform="Win64">NvFlexExtReleaseCUDA_x64.dll</OutFile>
-
-				<IntDir>./build/${xpj:PLATFORM}/release/</IntDir>
-
-				<Preprocessor type="define">
-					NDEBUG
-				</Preprocessor>
-				<RuntimeLibrary>MT</RuntimeLibrary>
-				<WholeProgramOptimization>1</WholeProgramOptimization>
-				<Optimization>3</Optimization>
-				<EnableIntrinsicFunctions>true</EnableIntrinsicFunctions>
-				<BufferSecurityCheck>false</BufferSecurityCheck>
-				<EnableFunctionLevelLinking>true</EnableFunctionLevelLinking>
-				<EnableEnhancedInstructionSet>2</EnableEnhancedInstructionSet>
-				<FloatingPointModel>Fast</FloatingPointModel>
-
-				<ExportLibrary platform="Win32">..\..\..\lib\win32\NvFlexExtReleaseCUDA_x86.lib</ExportLibrary>
-				<ExportLibrary platform="Win64">..\..\..\lib\win64\NvFlexExtReleaseCUDA_x64.lib</ExportLibrary>
-
-				<FileTemplate platform="Win32" name="cuda" command="&quot;${user:CUDA_PATH}\bin\nvcc.exe&quot; -O3 --compiler-bindir=&quot;$(VCInstallDir)bin&quot;  --compiler-options=/MT,/Zi -I&quot;..\..\..&quot; -D_ITERATOR_DEBUG_LEVEL=0 -DNDEBUG -DCUDA -m32 -arch=sm_30 -prec-div=false -prec-sqrt=false -ftz=true -use_fast_math -c %s -o %o" buildtype="CustomBuild" filetype="cuda" description="Building %(Identity)" />
-				<FileTemplate platform="Win64" name="cuda" command="&quot;${user:CUDA_PATH}\bin\nvcc.exe&quot; -O3 --compiler-bindir=&quot;$(VCInstallDir)bin&quot;  --compiler-options=/MT,/Zi -I&quot;..\..\..&quot; -D_ITERATOR_DEBUG_LEVEL=0 -DNDEBUG -DCUDA -arch=sm_30 -prec-div=false -prec-sqrt=false -ftz=true -use_fast_math -c %s -o %o" buildtype="CustomBuild" filetype="cuda" description="Building %(Identity)" />
-
-				<Libraries platforms="Win32">
-					${user:ProjectRoot}/lib/win32/NvFlexReleaseCUDA_x86.lib
-				</Libraries>
-
-				<Libraries platforms="Win64">
-					${user:ProjectRoot}/lib/win64/NvFlexReleaseCUDA_x64.lib
-				</Libraries>
-
-			</Config>
-
-			<!-- Android aarch64-->
-
-			<Config name="default" type="lib" platforms="android_aarch64">
-
-				<apply-template name="android-aarch64-common"/>
-
-				<FileTemplate name="cuda" command='${user:NVCC} ${user:NVCCInclude} --compile "%s" -o "%o"' buildtype="CustomBuild" />
-
-				<OutDir platforms="android_aarch64" tool="make">${user:ProjectRoot}/lib/android_aarch64</OutDir>
-
-				<Preprocessor type="define" platform="android_aarch64">
-					android
-					ANDROID=1
-					ANDROID_PLAT=1
-					DISABLE_IMPORTGL
-				</Preprocessor>
-
-				<CFlags tool="make">-Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions</CFlags>
-				
-			</Config>
-
-			<Config name="release" type="lib" platforms="android_aarch64">
-				<cflags> -O3 -ffast-math </cflags>
-				<OutFile>libNvFlexExtReleaseCUDA_aarch64.a</OutFile>
-				
-				<Libraries>
-					${user:ProjectRoot}/lib/android_aarch64/libNvFlexRelease_aarch64.a
-				</Libraries>				
-			</Config>
-
-			<Config name="debug" type="lib" platforms="android_aarch64">
-				<cflags> -g -O0 </cflags>
-				<OutFile>libNvFlexExtDebugCUDA_aarch64.a</OutFile>
-				
-				<Libraries>
-					${user:ProjectRoot}/lib/android_aarch64/libNvFlexDebug_aarch64.a
-				</Libraries>				
-			</Config>
-
-
-			<!-- Linux -->
-			   
-			<Config name="default" type="lib" platforms="linux64">
-				
-				<apply-template name="linux-common"/>				
-
-				<Var name="Cub" value="${user:External}/cub-1.3.2"/>
-				<var name="GCC" value="g++"/>
-				<var name="NVCC" value='${user:CUDA_PATH}/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES'/>
-				<var name="NVCCInclude" value=' -I${user:ProjectRoot} -I${user:External} -I${user:CUDA_PATH}/include -I${user:Cub} '/>
-			
-				<FileTemplate name="cuda" command='${user:NVCC} ${user:NVCCInclude} --compile "%s" -o "%o"' buildtype="CustomBuild"/>
-
-				<OutDir platforms="linux64" tool="make">${user:ProjectRoot}/lib/linux64</OutDir>
-
-				<SearchPaths type="header" tool="make">
-					"${user:ProjectRoot}"
-					"${user:External}/freeglut/include"
-				</SearchPaths>
-
-				<CFlags tool="make">
-					-Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing
-				</CFlags>
-			</Config>      
-
-			<Config name="release" type="lib" platforms="linux64">
-				<cflags> -O3 -ffast-math -DNDEBUG</cflags>
-		        <OutFile>NvFlexExtReleaseCUDA_x64.a</OutFile>
-					
-				<Libraries>
-					${user:ProjectRoot}/lib/linux64/NvFlexReleaseCUDA_x64.a
-				</Libraries>
-
-			</Config>
-			
-			<Config name="debug" type="lib" platforms="linux64">
-				<cflags> -g -O0  </cflags>
-		        <OutFile>NvFlexExtDebugCUDA_x64.a</OutFile>
-
-				<Libraries>
-					${user:ProjectRoot}/lib/linux64/NvFlexDebugCUDA_x64.a
-				</Libraries>
-			</Config>
-
-			<!-- Source -->
-			
-			<Files name="src" type="source" root="${user:ProjectRoot}/extensions">
-				*.cpp *.h
-			</Files>
-
-			<Files name="cuda" type="source" root="${user:ProjectRoot}/extensions/cuda" template="cuda">
-				*.cu
-			</Files>		
-			
-			<Files name="include" type="source" root="${user:ProjectRoot}/include">
-				flexExt.h
-			</Files>
-
-			<Files name="core" type="source" root="${user:ProjectRoot}/core">
-				sdf.cpp
-				voxelize.cpp
-				maths.cpp
-				aabbtree.cpp
-			</Files>
-
-			<Conditional value="${config}" match="internal">
-				<Dependencies>
-					flexCUDA
-				</Dependencies>
-			</Conditional>
-
-		</Target>
-	</Project>
-
-</XPJ>
diff --git a/extensions/compiler/xpj/flexExtD3D.xpj b/extensions/compiler/xpj/flexExtD3D.xpj
deleted file mode 100644
index ff30566..0000000
--- a/extensions/compiler/xpj/flexExtD3D.xpj
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<XPJ version="4">
-
-  <Project name="flexExtD3D">
-
-    <!-- depends on flex solver project -->
-    <Conditional value="${config}" match="internal">
-      <Import file="../../../src/compiler/xpj/flexD3D.xpj" />
-    </Conditional>
-
-    <Export platforms="Win32 Win64">../${xpj:TOOL}${xpj:PLATFORM}</Export>
-
-    <Target name="flexExtD3D">
-
-      <Var name="ProjectRoot" value="../../.." />
-
-      <!-- Windows -->
-
-      <Config name="default" type="dll" platforms="Win32 Win64">
-
-        <OutDir platform="Win32">../../../bin/win32/</OutDir>
-        <OutDir platform="Win64">../../../bin/win64/</OutDir>
-
-        <Preprocessor type="define">
-          _CONSOLE
-          WIN32
-        </Preprocessor>
-
-        <WarningLevel>3</WarningLevel>
-        <GenerateDebugInformation>true</GenerateDebugInformation>
-        <CharacterSet>MultiByte</CharacterSet>
-
-        <SearchPaths type="header">
-          ..\..\..\..\..
-        </SearchPaths>
-
-        <Libraries>
-          kernel32.lib
-          user32.lib
-          gdi32.lib
-          winspool.lib
-          comdlg32.lib
-          advapi32.lib
-          shell32.lib
-          ole32.lib
-          oleaut32.lib
-          uuid.lib
-          odbc32.lib
-          odbccp32.lib
-          delayimp.lib
-        </Libraries>
-
-      <LFlags>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll</LFlags>
-
-
-      </Config>
-
-      <Config name="debug" type="dll" platforms="Win32 Win64">
-
-        <OutFile platform="Win32">NvFlexExtDebugD3D_x86.dll</OutFile>
-        <OutFile platform="Win64">NvFlexExtDebugD3D_x64.dll</OutFile>
-
-        <IntDir>./build/${xpj:PLATFORM}/DX/debug/</IntDir>
-
-        <Preprocessor type="define">
-          _DEBUG
-        </Preprocessor>
-        <Preprocessor type="define">
-          _ITERATOR_DEBUG_LEVEL=0
-        </Preprocessor>
-        <RuntimeLibrary>MTd</RuntimeLibrary>
-        <GenerateDebugInformation>true</GenerateDebugInformation>
-        <FloatingPointModel>Precise</FloatingPointModel>
-        <ExportLibrary platform="Win32">..\..\..\lib\win32\NvFlexExtDebugD3D_x86.lib</ExportLibrary>
-        <ExportLibrary platform="Win64">..\..\..\lib\win64\NvFlexExtDebugD3D_x64.lib</ExportLibrary>
-
-        <Libraries platforms="Win32">
-          ${user:ProjectRoot}/lib/win32/NvFlexDebugD3D_x86.lib
-        </Libraries>
-
-        <Libraries platforms="Win64">
-          ${user:ProjectRoot}/lib/win64/NvFlexDebugD3D_x64.lib
-        </Libraries>
-
-      </Config>
-
-      <Config name="release" type="dll" platforms="Win32 Win64">
-
-        <OutFile platform="Win32">NvFlexExtReleaseD3D_x86.dll</OutFile>
-        <OutFile platform="Win64">NvFlexExtReleaseD3D_x64.dll</OutFile>
-
-        <IntDir>./build/${xpj:PLATFORM}/DX/release/</IntDir>
-
-        <Preprocessor type="define">
-          NDEBUG
-        </Preprocessor>
-        <RuntimeLibrary>MT</RuntimeLibrary>
-        <WholeProgramOptimization>1</WholeProgramOptimization>
-        <Optimization>3</Optimization>
-        <EnableIntrinsicFunctions>true</EnableIntrinsicFunctions>
-        <BufferSecurityCheck>false</BufferSecurityCheck>
-        <EnableFunctionLevelLinking>true</EnableFunctionLevelLinking>
-        <FloatingPointModel>Fast</FloatingPointModel>
-
-        <ExportLibrary platform="Win32">..\..\..\lib\win32\NvFlexExtReleaseD3D_x86.lib</ExportLibrary>
-        <ExportLibrary platform="Win64">..\..\..\lib\win64\NvFlexExtReleaseD3D_x64.lib</ExportLibrary>
-
-        <Libraries platforms="Win32">
-          ${user:ProjectRoot}/lib/win32/NvFlexReleaseD3D_x86.lib
-        </Libraries>
-
-        <Libraries platforms="Win64">
-          ${user:ProjectRoot}/lib/win64/NvFlexReleaseD3D_x64.lib
-        </Libraries>
-
-      </Config>
-
-
-      <SearchPaths type="header">
-        ..\..\..\
-        ..\..\..\external\D3D11\include
-        ..\..\..\external\D3D12\include
-      </SearchPaths>
-
-      <SearchPaths type="lib" platform="Win32">
-        ..\..\..\external\D3D11\libs\x86
-        ..\..\..\external\D3D12\libs\x86
-        ..\..\..\lib\win32
-      </SearchPaths>
-
-      <SearchPaths type="lib" platform="Win64">
-        ..\..\..\external\D3D11\libs\x64
-        ..\..\..\external\D3D12\libs\x64
-        ..\..\..\lib\win64
-      </SearchPaths>      
-      
-      <!-- Source -->
-
-      <Files name="Core" type="source" root="${user:ProjectRoot}/core">
-        sdf.cpp
-        voxelize.cpp
-        maths.cpp
-        aabbtree.cpp
-      </Files>
-
-      <Files name="src" type="source" root="${user:ProjectRoot}/extensions/dx">
-        flexExt.cpp
-        flexExt.hlsl
-        flexExt_dx_common.h
-      </Files>
-
-      <Files name="src" type="source" root="${user:ProjectRoot}/include">
-        flexExt.h
-      </Files>
-
-      <Files name="src" type="source" root="${user:ProjectRoot}/extensions">
-        flexExtCloth.cpp
-        flexExtRigid.cpp
-        flexExtSoft.cpp
-        flexExtMovingFrame.cpp
-        flexExtContainer.cpp
-      </Files>
-
-      <HLSL Configurations="release" DisableOptim="No" Debug="No" ShaderModel="5.0" Platforms="Win32 Win64" ObjectFileOutput=" " WarningAsErrors="false" OutputHeaderFileName="${user:ProjectRoot}/extensions/dx/shaders/%(Filename).h">
-        <File  ShaderType="Compute" EntryPoint="UpdateForceFields::execute" OutputHeaderVarName="g_flexExt_UpdateForceFields"> "${user:ProjectRoot}/extensions/dx/shaders/flexExt.UpdateForceFields.hlsl" </File>
-      </HLSL>
-
-    <Conditional value="${config}" match="internal">
-      <Dependencies>
-        flexD3D
-      </Dependencies>
-    </Conditional>
-
-    </Target>
-  </Project>
-</XPJ>
\ No newline at end of file
diff --git a/extensions/compiler/xpj/flexExtD3D12.xpj b/extensions/compiler/xpj/flexExtD3D12.xpj
deleted file mode 100644
index 7ba5bd8..0000000
--- a/extensions/compiler/xpj/flexExtD3D12.xpj
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<XPJ version="4">
-
-  <Project name="flexExtD3D12">
-
-    <!-- depends on flex solver project -->
-    <Conditional value="${config}" match="internal">
-      <Import file="../../../src/compiler/xpj/flexD3D12.xpj" />
-    </Conditional>
-
-    <Export platforms="Win32 Win64">../${xpj:TOOL}${xpj:PLATFORM}</Export>
-
-    <Target name="flexExtD3D12">
-
-      <Var name="ProjectRoot" value="../../.." />
-
-      <!-- Windows -->
-
-      <Config name="default" type="dll" platforms="Win32 Win64">
-
-        <OutDir platform="Win32">../../../bin/win32/</OutDir>
-        <OutDir platform="Win64">../../../bin/win64/</OutDir>
-
-        <Preprocessor type="define">
-          _CONSOLE
-          WIN32
-        </Preprocessor>
-
-        <WarningLevel>3</WarningLevel>
-        <GenerateDebugInformation>true</GenerateDebugInformation>
-        <CharacterSet>MultiByte</CharacterSet>
-
-        <SearchPaths type="header">
-          ..\..\..\..\..
-        </SearchPaths>
-
-        <Libraries>
-          kernel32.lib
-          user32.lib
-          gdi32.lib
-          winspool.lib
-          comdlg32.lib
-          advapi32.lib
-          shell32.lib
-          ole32.lib
-          oleaut32.lib
-          uuid.lib
-          odbc32.lib
-          odbccp32.lib
-        </Libraries>
-
-      </Config>
-
-      <Config name="debug" type="dll" platforms="Win32 Win64">
-
-        <OutFile platform="Win32">flexExt_d3d12_debug_x86.dll</OutFile>
-        <OutFile platform="Win64">flexExt_d3d12_debug_x64.dll</OutFile>
-
-        <IntDir>./build/${xpj:PLATFORM}/DX/debug/</IntDir>
-
-        <Preprocessor type="define">
-          _DEBUG
-        </Preprocessor>
-        <Preprocessor type="define">
-          _ITERATOR_DEBUG_LEVEL=0
-        </Preprocessor>
-        <RuntimeLibrary>MTd</RuntimeLibrary>
-        <GenerateDebugInformation>true</GenerateDebugInformation>
-        <FloatingPointModel>Precise</FloatingPointModel>
-        <ExportLibrary platform="Win32">..\..\..\lib\win32\flexExt_d3d12_debug_x86.lib</ExportLibrary>
-        <ExportLibrary platform="Win64">..\..\..\lib\win64\flexExt_d3d12_debug_x64.lib</ExportLibrary>
-
-        <Libraries platforms="Win32">
-          ${user:ProjectRoot}/lib/win32/flex_d3d12_debug_x86.lib
-        </Libraries>
-
-        <Libraries platforms="Win64">
-          ${user:ProjectRoot}/lib/win64/flex_d3d12_debug_x64.lib
-        </Libraries>
-
-      </Config>
-
-      <Config name="release" type="dll" platforms="Win32 Win64">
-
-        <OutFile platform="Win32">flexExt_d3d12_release_x86.dll</OutFile>
-        <OutFile platform="Win64">flexExt_d3d12_release_x64.dll</OutFile>
-
-        <IntDir>./build/${xpj:PLATFORM}/DX/release/</IntDir>
-
-        <Preprocessor type="define">
-          NDEBUG
-        </Preprocessor>
-        <RuntimeLibrary>MT</RuntimeLibrary>
-        <WholeProgramOptimization>1</WholeProgramOptimization>
-        <Optimization>3</Optimization>
-        <EnableIntrinsicFunctions>true</EnableIntrinsicFunctions>
-        <BufferSecurityCheck>false</BufferSecurityCheck>
-        <EnableFunctionLevelLinking>true</EnableFunctionLevelLinking>
-        <FloatingPointModel>Fast</FloatingPointModel>
-
-        <ExportLibrary platform="Win32">..\..\..\lib\win32\flexExt_d3d12_release_x86.lib</ExportLibrary>
-        <ExportLibrary platform="Win64">..\..\..\lib\win64\flexExt_d3d12_release_x64.lib</ExportLibrary>
-
-        <Libraries platforms="Win32">
-          ${user:ProjectRoot}/lib/win32/flex_d3d12_release_x86.lib
-        </Libraries>
-
-        <Libraries platforms="Win64">
-          ${user:ProjectRoot}/lib/win64/flex_d3d12_release_x64.lib
-        </Libraries>
-
-      </Config>
-
-
-      <SearchPaths type="header">
-        ..\..\..\
-        ..\..\..\external\D3D12\include
-      </SearchPaths>
-
-      <SearchPaths type="lib" platform="Win32">
-        ..\..\..\external\D3D12\libs\x86
-        ..\..\..\lib\x86
-      </SearchPaths>
-
-      <SearchPaths type="lib" platform="Win64">
-        ..\..\..\external\D3D12\libs\x64
-        ..\..\..\lib\win64
-      </SearchPaths>      
-      
-      <!-- Source -->
-
-      <Files name="Core" type="source" root="${user:ProjectRoot}/core">
-        sdf.cpp
-        voxelize.cpp
-        maths.cpp
-        aabbtree.cpp
-      </Files>
-
-      <Files name="src" type="source" root="${user:ProjectRoot}/extensions/dx">
-        flexExt.cpp
-        flexExt.hlsl
-        flexExt_dx_common.h
-      </Files>
-
-      <Files name="src" type="source" root="${user:ProjectRoot}/include">
-        flexExt.h
-      </Files>
-
-      <Files name="src" type="source" root="${user:ProjectRoot}/extensions">
-        flexExtCloth.cpp
-        flexExtRigid.cpp
-        flexExtSoft.cpp
-        flexExtMovingFrame.cpp
-        flexExtContainer.cpp
-      </Files>
-
-      <HLSL Configurations="release" DisableOptim="No" Debug="No" ShaderModel="5.0" Platforms="Win32 Win64" ObjectFileOutput=" " WarningAsErrors="false" OutputHeaderFileName="${user:ProjectRoot}/extensions/dx/shaders/%(Filename).h">
-        <File  ShaderType="Compute" EntryPoint="UpdateForceFields::execute" OutputHeaderVarName="g_flexExt_UpdateForceFields"> "${user:ProjectRoot}/extensions/dx/shaders/flexExt.UpdateForceFields.hlsl" </File>
-      </HLSL>
-
-      <Conditional value="${config}" match="internal">
-        <Dependencies>
-          flexD3D12
-        </Dependencies>
-      </Conditional>
-
-    </Target>
-  </Project>
-</XPJ>
\ No newline at end of file
diff --git a/extensions/dx/shaders/flexExt.UpdateForceFields.h b/extensions/dx/shaders/flexExt.UpdateForceFields.h
deleted file mode 100644
index 859f621..0000000
--- a/extensions/dx/shaders/flexExt.UpdateForceFields.h
+++ /dev/null
@@ -1,549 +0,0 @@
-#if 0
-//
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
-//
-//
-// Buffer Definitions: 
-//
-// cbuffer consts
-// {
-//
-//   struct FlexExtConstParams
-//   {
-//       
-//       int kNumParticles;             // Offset:    0
-//       int kNumForceFields;           // Offset:    4
-//       float kDt;                     // Offset:    8
-//       float _pad;                    // Offset:   12
-//
-//   } gParams;                         // Offset:    0 Size:    16
-//
-// }
-//
-// Resource bind info for UpdateForceFields::positions
-// {
-//
-//   float4 $Element;                   // Offset:    0 Size:    16
-//
-// }
-//
-// Resource bind info for UpdateForceFields::forceFields
-// {
-//
-//   struct FlexExtForceFieldD3D
-//   {
-//       
-//       float mPosition[3];            // Offset:    0
-//       float mRadius;                 // Offset:   12
-//       float mStrength;               // Offset:   16
-//       int mMode;                     // Offset:   20
-//       bool mLinearFalloff;           // Offset:   24
-//
-//   } $Element;                        // Offset:    0 Size:    28
-//
-// }
-//
-// Resource bind info for UpdateForceFields::velocities
-// {
-//
-//   float4 $Element;                   // Offset:    0 Size:    16
-//
-// }
-//
-//
-// Resource Bindings:
-//
-// Name                                 Type  Format         Dim Slot Elements
-// ------------------------------ ---------- ------- ----------- ---- --------
-// UpdateForceFields::positions      texture  struct         r/o    0        1
-// UpdateForceFields::forceFields    texture  struct         r/o    1        1
-// UpdateForceFields::velocities         UAV  struct         r/w    0        1
-// consts                            cbuffer      NA          NA    0        1
-//
-//
-//
-// Input signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// no Input
-//
-// Output signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// no Output
-cs_5_0
-dcl_globalFlags refactoringAllowed
-dcl_constantbuffer cb0[1], immediateIndexed
-dcl_resource_structured t0, 16 
-dcl_resource_structured t1, 28 
-dcl_uav_structured u0, 16
-dcl_input vThreadID.x
-dcl_temps 7
-dcl_thread_group 256, 1, 1
-ilt r0.x, vThreadID.x, cb0[0].x
-ld_structured_indexable(structured_buffer, stride=16)(mixed,mixed,mixed,mixed) r1.xyzw, vThreadID.x, l(0), t0.xyzw
-mul r0.y, r1.w, cb0[0].z
-mov r2.w, l(0)
-mov r0.z, l(0)
-loop 
-  ige r0.w, r0.z, cb0[0].y
-  breakc_nz r0.w
-  if_nz r0.x
-    ld_structured_indexable(structured_buffer, stride=28)(mixed,mixed,mixed,mixed) r3.xyzw, r0.z, l(0), t1.xyzw
-    ld_structured_indexable(structured_buffer, stride=16)(mixed,mixed,mixed,mixed) r4.xyz, vThreadID.x, l(0), u0.xyzx
-    add r3.xyz, r1.xyzx, -r3.xyzx
-    dp3 r0.w, r3.xyzx, r3.xyzx
-    sqrt r0.w, r0.w
-    ge r4.w, r0.w, r3.w
-    if_nz r4.w
-      iadd r4.w, r0.z, l(1)
-      mov r0.z, r4.w
-      continue 
-    endif 
-    ld_structured_indexable(structured_buffer, stride=28)(mixed,mixed,mixed,mixed) r5.xyz, r0.z, l(16), t1.xyzx
-    lt r4.w, l(0.000000), r0.w
-    div r6.xyz, r3.xyzx, r0.wwww
-    movc r3.xyz, r4.wwww, r6.xyzx, r3.xyzx
-    div r0.w, r0.w, r3.w
-    add r0.w, -r0.w, l(1.000000)
-    mul r0.w, r0.w, r5.x
-    movc r0.w, r5.z, r0.w, r5.x
-    ieq r3.w, r5.y, l(1)
-    movc r3.w, r3.w, r1.w, l(1.000000)
-    movc r3.w, r5.y, r3.w, r0.y
-    mul r3.xyz, r0.wwww, r3.xyzx
-    mad r2.xyz, r3.xyzx, r3.wwww, r4.xyzx
-    store_structured u0.xyzw, vThreadID.x, l(0), r2.xyzw
-  endif 
-  iadd r0.z, r0.z, l(1)
-endloop 
-ret 
-// Approximately 38 instruction slots used
-#endif
-
-const BYTE g_flexExt_UpdateForceFields[] =
-{
-     68,  88,  66,  67,  17, 194, 
-     44, 187, 165, 224, 186,   5, 
-    255, 188, 158, 209,  34,  42, 
-      4,  69,   1,   0,   0,   0, 
-    220,   9,   0,   0,   5,   0, 
-      0,   0,  52,   0,   0,   0, 
-    240,   4,   0,   0,   0,   5, 
-      0,   0,  16,   5,   0,   0, 
-     64,   9,   0,   0,  82,  68, 
-     69,  70, 180,   4,   0,   0, 
-      4,   0,   0,   0,  32,   1, 
-      0,   0,   4,   0,   0,   0, 
-     60,   0,   0,   0,   0,   5, 
-     83,  67,   0,   1,   0,   0, 
-    128,   4,   0,   0,  82,  68, 
-     49,  49,  60,   0,   0,   0, 
-     24,   0,   0,   0,  32,   0, 
-      0,   0,  40,   0,   0,   0, 
-     36,   0,   0,   0,  12,   0, 
-      0,   0,   0,   0,   0,   0, 
-    188,   0,   0,   0,   5,   0, 
-      0,   0,   6,   0,   0,   0, 
-      1,   0,   0,   0,  16,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   1,   0, 
-      0,   0, 217,   0,   0,   0, 
-      5,   0,   0,   0,   6,   0, 
-      0,   0,   1,   0,   0,   0, 
-     28,   0,   0,   0,   1,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0, 248,   0, 
-      0,   0,   6,   0,   0,   0, 
-      6,   0,   0,   0,   1,   0, 
-      0,   0,  16,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   1,   0,   0,   0, 
-     22,   1,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   1,   0, 
-      0,   0,  85, 112, 100,  97, 
-    116, 101,  70, 111, 114,  99, 
-    101,  70, 105, 101, 108, 100, 
-    115,  58,  58, 112, 111, 115, 
-    105, 116, 105, 111, 110, 115, 
-      0,  85, 112, 100,  97, 116, 
-    101,  70, 111, 114,  99, 101, 
-     70, 105, 101, 108, 100, 115, 
-     58,  58, 102, 111, 114,  99, 
-    101,  70, 105, 101, 108, 100, 
-    115,   0,  85, 112, 100,  97, 
-    116, 101,  70, 111, 114,  99, 
-    101,  70, 105, 101, 108, 100, 
-    115,  58,  58, 118, 101, 108, 
-    111,  99, 105, 116, 105, 101, 
-    115,   0,  99, 111, 110, 115, 
-    116, 115,   0, 171, 171, 171, 
-     22,   1,   0,   0,   1,   0, 
-      0,   0, 128,   1,   0,   0, 
-     16,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    188,   0,   0,   0,   1,   0, 
-      0,   0, 152,   2,   0,   0, 
-     16,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-    217,   0,   0,   0,   1,   0, 
-      0,   0, 244,   2,   0,   0, 
-     28,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-    248,   0,   0,   0,   1,   0, 
-      0,   0,  88,   4,   0,   0, 
-     16,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-    168,   1,   0,   0,   0,   0, 
-      0,   0,  16,   0,   0,   0, 
-      2,   0,   0,   0, 116,   2, 
-      0,   0,   0,   0,   0,   0, 
-    255, 255, 255, 255,   0,   0, 
-      0,   0, 255, 255, 255, 255, 
-      0,   0,   0,   0, 103,  80, 
-     97, 114,  97, 109, 115,   0, 
-     70, 108, 101, 120,  69, 120, 
-    116,  67, 111, 110, 115, 116, 
-     80,  97, 114,  97, 109, 115, 
-      0, 107,  78, 117, 109,  80, 
-     97, 114, 116, 105,  99, 108, 
-    101, 115,   0, 105, 110, 116, 
-      0, 171, 171, 171,   0,   0, 
-      2,   0,   1,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    209,   1,   0,   0, 107,  78, 
-    117, 109,  70, 111, 114,  99, 
-    101,  70, 105, 101, 108, 100, 
-    115,   0, 107,  68, 116,   0, 
-    102, 108, 111,  97, 116,   0, 
-    171, 171,   0,   0,   3,   0, 
-      1,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  16,   2, 
-      0,   0,  95, 112,  97, 100, 
-      0, 171, 171, 171, 195,   1, 
-      0,   0, 216,   1,   0,   0, 
-      0,   0,   0,   0, 252,   1, 
-      0,   0, 216,   1,   0,   0, 
-      4,   0,   0,   0,  12,   2, 
-      0,   0,  24,   2,   0,   0, 
-      8,   0,   0,   0,  60,   2, 
-      0,   0,  24,   2,   0,   0, 
-     12,   0,   0,   0,   5,   0, 
-      0,   0,   1,   0,   4,   0, 
-      0,   0,   4,   0,  68,   2, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    176,   1,   0,   0, 192,   2, 
-      0,   0,   0,   0,   0,   0, 
-     16,   0,   0,   0,   2,   0, 
-      0,   0, 208,   2,   0,   0, 
-      0,   0,   0,   0, 255, 255, 
-    255, 255,   0,   0,   0,   0, 
-    255, 255, 255, 255,   0,   0, 
-      0,   0,  36,  69, 108, 101, 
-    109, 101, 110, 116,   0, 102, 
-    108, 111,  97, 116,  52,   0, 
-      1,   0,   3,   0,   1,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 201,   2,   0,   0, 
-    192,   2,   0,   0,   0,   0, 
-      0,   0,  28,   0,   0,   0, 
-      2,   0,   0,   0,  52,   4, 
-      0,   0,   0,   0,   0,   0, 
-    255, 255, 255, 255,   0,   0, 
-      0,   0, 255, 255, 255, 255, 
-      0,   0,   0,   0,  70, 108, 
-    101, 120,  69, 120, 116,  70, 
-    111, 114,  99, 101,  70, 105, 
-    101, 108, 100,  68,  51,  68, 
-      0, 109,  80, 111, 115, 105, 
-    116, 105, 111, 110,   0, 171, 
-      0,   0,   3,   0,   1,   0, 
-      1,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  16,   2,   0,   0, 
-    109,  82,  97, 100, 105, 117, 
-    115,   0,   0,   0,   3,   0, 
-      1,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  16,   2, 
-      0,   0, 109,  83, 116, 114, 
-    101, 110, 103, 116, 104,   0, 
-    109,  77, 111, 100, 101,   0, 
-      0,   0,   2,   0,   1,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 209,   1,   0,   0, 
-    109,  76, 105, 110, 101,  97, 
-    114,  70,  97, 108, 108, 111, 
-    102, 102,   0,  98, 111, 111, 
-    108,   0,   0,   0,   1,   0, 
-      1,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 207,   3, 
-      0,   0,  49,   3,   0,   0, 
-     60,   3,   0,   0,   0,   0, 
-      0,   0,  96,   3,   0,   0, 
-    104,   3,   0,   0,  12,   0, 
-      0,   0, 140,   3,   0,   0, 
-    104,   3,   0,   0,  16,   0, 
-      0,   0, 150,   3,   0,   0, 
-    156,   3,   0,   0,  20,   0, 
-      0,   0, 192,   3,   0,   0, 
-    212,   3,   0,   0,  24,   0, 
-      0,   0,   5,   0,   0,   0, 
-      1,   0,   7,   0,   0,   0, 
-      5,   0, 248,   3,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  28,   3, 
-      0,   0, 192,   2,   0,   0, 
-      0,   0,   0,   0,  16,   0, 
-      0,   0,   2,   0,   0,   0, 
-    208,   2,   0,   0,   0,   0, 
-      0,   0, 255, 255, 255, 255, 
-      0,   0,   0,   0, 255, 255, 
-    255, 255,   0,   0,   0,   0, 
-     77, 105,  99, 114, 111, 115, 
-    111, 102, 116,  32,  40,  82, 
-     41,  32,  72,  76,  83,  76, 
-     32,  83, 104,  97, 100, 101, 
-    114,  32,  67, 111, 109, 112, 
-    105, 108, 101, 114,  32,  54, 
-     46,  51,  46,  57,  54,  48, 
-     48,  46,  49,  54,  51,  56, 
-     52,   0, 171, 171,  73,  83, 
-     71,  78,   8,   0,   0,   0, 
-      0,   0,   0,   0,   8,   0, 
-      0,   0,  79,  83,  71,  78, 
-      8,   0,   0,   0,   0,   0, 
-      0,   0,   8,   0,   0,   0, 
-     83,  72,  69,  88,  40,   4, 
-      0,   0,  80,   0,   5,   0, 
-     10,   1,   0,   0, 106,   8, 
-      0,   1,  89,   0,   0,   4, 
-     70, 142,  32,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-    162,   0,   0,   4,   0, 112, 
-     16,   0,   0,   0,   0,   0, 
-     16,   0,   0,   0, 162,   0, 
-      0,   4,   0, 112,  16,   0, 
-      1,   0,   0,   0,  28,   0, 
-      0,   0, 158,   0,   0,   4, 
-      0, 224,  17,   0,   0,   0, 
-      0,   0,  16,   0,   0,   0, 
-     95,   0,   0,   2,  18,   0, 
-      2,   0, 104,   0,   0,   2, 
-      7,   0,   0,   0, 155,   0, 
-      0,   4,   0,   1,   0,   0, 
-      1,   0,   0,   0,   1,   0, 
-      0,   0,  34,   0,   0,   7, 
-     18,   0,  16,   0,   0,   0, 
-      0,   0,  10,   0,   2,   0, 
-     10, 128,  32,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    167,   0,   0, 138,   2, 131, 
-      0, 128, 131, 153,  25,   0, 
-    242,   0,  16,   0,   1,   0, 
-      0,   0,  10,   0,   2,   0, 
-      1,  64,   0,   0,   0,   0, 
-      0,   0,  70, 126,  16,   0, 
-      0,   0,   0,   0,  56,   0, 
-      0,   8,  34,   0,  16,   0, 
-      0,   0,   0,   0,  58,   0, 
-     16,   0,   1,   0,   0,   0, 
-     42, 128,  32,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     54,   0,   0,   5, 130,   0, 
-     16,   0,   2,   0,   0,   0, 
-      1,  64,   0,   0,   0,   0, 
-      0,   0,  54,   0,   0,   5, 
-     66,   0,  16,   0,   0,   0, 
-      0,   0,   1,  64,   0,   0, 
-      0,   0,   0,   0,  48,   0, 
-      0,   1,  33,   0,   0,   8, 
-    130,   0,  16,   0,   0,   0, 
-      0,   0,  42,   0,  16,   0, 
-      0,   0,   0,   0,  26, 128, 
-     32,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      4,   3,  58,   0,  16,   0, 
-      0,   0,   0,   0,  31,   0, 
-      4,   3,  10,   0,  16,   0, 
-      0,   0,   0,   0, 167,   0, 
-      0, 139,   2, 227,   0, 128, 
-    131, 153,  25,   0, 242,   0, 
-     16,   0,   3,   0,   0,   0, 
-     42,   0,  16,   0,   0,   0, 
-      0,   0,   1,  64,   0,   0, 
-      0,   0,   0,   0,  70, 126, 
-     16,   0,   1,   0,   0,   0, 
-    167,   0,   0, 138,   2, 131, 
-      0, 128, 131, 153,  25,   0, 
-    114,   0,  16,   0,   4,   0, 
-      0,   0,  10,   0,   2,   0, 
-      1,  64,   0,   0,   0,   0, 
-      0,   0,  70, 226,  17,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   8, 114,   0,  16,   0, 
-      3,   0,   0,   0,  70,   2, 
-     16,   0,   1,   0,   0,   0, 
-     70,   2,  16, 128,  65,   0, 
-      0,   0,   3,   0,   0,   0, 
-     16,   0,   0,   7, 130,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70,   2,  16,   0,   3,   0, 
-      0,   0,  70,   2,  16,   0, 
-      3,   0,   0,   0,  75,   0, 
-      0,   5, 130,   0,  16,   0, 
-      0,   0,   0,   0,  58,   0, 
-     16,   0,   0,   0,   0,   0, 
-     29,   0,   0,   7, 130,   0, 
-     16,   0,   4,   0,   0,   0, 
-     58,   0,  16,   0,   0,   0, 
-      0,   0,  58,   0,  16,   0, 
-      3,   0,   0,   0,  31,   0, 
-      4,   3,  58,   0,  16,   0, 
-      4,   0,   0,   0,  30,   0, 
-      0,   7, 130,   0,  16,   0, 
-      4,   0,   0,   0,  42,   0, 
-     16,   0,   0,   0,   0,   0, 
-      1,  64,   0,   0,   1,   0, 
-      0,   0,  54,   0,   0,   5, 
-     66,   0,  16,   0,   0,   0, 
-      0,   0,  58,   0,  16,   0, 
-      4,   0,   0,   0,   7,   0, 
-      0,   1,  21,   0,   0,   1, 
-    167,   0,   0, 139,   2, 227, 
-      0, 128, 131, 153,  25,   0, 
-    114,   0,  16,   0,   5,   0, 
-      0,   0,  42,   0,  16,   0, 
-      0,   0,   0,   0,   1,  64, 
-      0,   0,  16,   0,   0,   0, 
-     70, 114,  16,   0,   1,   0, 
-      0,   0,  49,   0,   0,   7, 
-    130,   0,  16,   0,   4,   0, 
-      0,   0,   1,  64,   0,   0, 
-      0,   0,   0,   0,  58,   0, 
-     16,   0,   0,   0,   0,   0, 
-     14,   0,   0,   7, 114,   0, 
-     16,   0,   6,   0,   0,   0, 
-     70,   2,  16,   0,   3,   0, 
-      0,   0, 246,  15,  16,   0, 
-      0,   0,   0,   0,  55,   0, 
-      0,   9, 114,   0,  16,   0, 
-      3,   0,   0,   0, 246,  15, 
-     16,   0,   4,   0,   0,   0, 
-     70,   2,  16,   0,   6,   0, 
-      0,   0,  70,   2,  16,   0, 
-      3,   0,   0,   0,  14,   0, 
-      0,   7, 130,   0,  16,   0, 
-      0,   0,   0,   0,  58,   0, 
-     16,   0,   0,   0,   0,   0, 
-     58,   0,  16,   0,   3,   0, 
-      0,   0,   0,   0,   0,   8, 
-    130,   0,  16,   0,   0,   0, 
-      0,   0,  58,   0,  16, 128, 
-     65,   0,   0,   0,   0,   0, 
-      0,   0,   1,  64,   0,   0, 
-      0,   0, 128,  63,  56,   0, 
-      0,   7, 130,   0,  16,   0, 
-      0,   0,   0,   0,  58,   0, 
-     16,   0,   0,   0,   0,   0, 
-     10,   0,  16,   0,   5,   0, 
-      0,   0,  55,   0,   0,   9, 
-    130,   0,  16,   0,   0,   0, 
-      0,   0,  42,   0,  16,   0, 
-      5,   0,   0,   0,  58,   0, 
-     16,   0,   0,   0,   0,   0, 
-     10,   0,  16,   0,   5,   0, 
-      0,   0,  32,   0,   0,   7, 
-    130,   0,  16,   0,   3,   0, 
-      0,   0,  26,   0,  16,   0, 
-      5,   0,   0,   0,   1,  64, 
-      0,   0,   1,   0,   0,   0, 
-     55,   0,   0,   9, 130,   0, 
-     16,   0,   3,   0,   0,   0, 
-     58,   0,  16,   0,   3,   0, 
-      0,   0,  58,   0,  16,   0, 
-      1,   0,   0,   0,   1,  64, 
-      0,   0,   0,   0, 128,  63, 
-     55,   0,   0,   9, 130,   0, 
-     16,   0,   3,   0,   0,   0, 
-     26,   0,  16,   0,   5,   0, 
-      0,   0,  58,   0,  16,   0, 
-      3,   0,   0,   0,  26,   0, 
-     16,   0,   0,   0,   0,   0, 
-     56,   0,   0,   7, 114,   0, 
-     16,   0,   3,   0,   0,   0, 
-    246,  15,  16,   0,   0,   0, 
-      0,   0,  70,   2,  16,   0, 
-      3,   0,   0,   0,  50,   0, 
-      0,   9, 114,   0,  16,   0, 
-      2,   0,   0,   0,  70,   2, 
-     16,   0,   3,   0,   0,   0, 
-    246,  15,  16,   0,   3,   0, 
-      0,   0,  70,   2,  16,   0, 
-      4,   0,   0,   0, 168,   0, 
-      0,   8, 242, 224,  17,   0, 
-      0,   0,   0,   0,  10,   0, 
-      2,   0,   1,  64,   0,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   2,   0,   0,   0, 
-     21,   0,   0,   1,  30,   0, 
-      0,   7,  66,   0,  16,   0, 
-      0,   0,   0,   0,  42,   0, 
-     16,   0,   0,   0,   0,   0, 
-      1,  64,   0,   0,   1,   0, 
-      0,   0,  22,   0,   0,   1, 
-     62,   0,   0,   1,  83,  84, 
-     65,  84, 148,   0,   0,   0, 
-     38,   0,   0,   0,   7,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,  12,   0, 
-      0,   0,   5,   0,   0,   0, 
-      0,   0,   0,   0,   2,   0, 
-      0,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0
-};
diff --git a/extensions/flexExtContainer.cpp b/extensions/flexExtContainer.cpp
index 60d0230..b96f73c 100644
--- a/extensions/flexExtContainer.cpp
+++ b/extensions/flexExtContainer.cpp
@@ -96,6 +96,8 @@ struct NvFlexExtContainer
 	std::vector<int> mFreeList;
 	std::vector<NvFlexExtInstance*> mInstances;
 
+	std::vector<NvFlexExtSoftJoint*> mSoftJoints;
+
 	// particles
 	NvFlexVector<Vec4> mParticles;
 	NvFlexVector<Vec4> mParticlesRest;
@@ -188,6 +190,15 @@ void CompactObjects(NvFlexExtContainer* c)
 		}
 	}
 
+	// each joint corresponds to one shape matching constraint
+	for (size_t i = 0; i < c->mSoftJoints.size(); ++i)
+	{
+		const NvFlexExtSoftJoint* joint = c->mSoftJoints[i];
+
+		totalNumShapeIndices += joint->numParticles;
+		++totalNumShapes;
+	}
+
 	//----------------------
 	// map buffers
 
@@ -391,6 +402,33 @@ void CompactObjects(NvFlexExtContainer* c)
 	}
 
 
+	// go through each joint and add shape matching constraint to the solver
+	for (size_t i = 0; i < c->mSoftJoints.size(); ++i)
+	{
+		NvFlexExtSoftJoint* joint = c->mSoftJoints[i];
+		const int numJointParticles = joint->numParticles;
+
+		// store start index into shape array
+		joint->shapeIndex = shapeIndex;
+
+		const int offset = dstShapeOffsets[shapeIndex - 1];
+		dstShapeOffsets[shapeIndex] = offset + numJointParticles;
+
+		for (int i = 0; i < numJointParticles; ++i)
+		{
+			dstShapeIndices[shapeIndexOffset] = joint->particleIndices[i];
+			dstShapeRestPositions[shapeIndexOffset] = Vec3(joint->particleLocalPositions[3 * i + 0], joint->particleLocalPositions[3 * i + 1], joint->particleLocalPositions[3 * i + 2]);
+
+			++shapeIndexOffset;
+		}
+
+		dstShapeTranslations[shapeIndex] = Vec3(joint->shapeTranslations);
+		dstShapeRotations[shapeIndex] = Quat(joint->shapeRotations);
+		dstShapeCoefficients[shapeIndex] = joint->stiffness;
+
+		++shapeIndex;
+	}
+
 	//----------------------
 	// unmap buffers
 
@@ -825,6 +863,60 @@ void NvFlexExtUpdateInstances(NvFlexExtContainer* c)
 		}		
 	}
 
+	for (int i = 0; i < int(c->mSoftJoints.size()); ++i)
+	{
+		NvFlexExtSoftJoint* joint = c->mSoftJoints[i];
+
+		const int shapeStart = joint->shapeIndex;
+
+		// Here we compute the COM only once instead of in NvFlexExtCreateSoftJoint() to avoid buffer mapping issue
+		if (!joint->initialized)
+		{
+			// Calculate the center of mass of the new shape matching constraint given a set of joint particles and its indices
+			// To improve the accuracy of the result, first transform the particlePosition to relative coordinates (by finding the mean and subtracting that from all positions)
+			// Note: If this is not done, one might see ghost forces if the mean of the particlePosition is far from the origin.
+			Vec3 shapeOffset(0.0f);
+			for (int i = 0; i < joint->numParticles; ++i)
+			{
+				const Vec4 particlePosition = c->mParticles[joint->particleIndices[i]];
+				shapeOffset += Vec3(particlePosition);
+			}
+			shapeOffset /= float(joint->numParticles);
+
+			Vec3 com;
+			for (int i = 0; i < joint->numParticles; ++i)
+			{
+				const Vec4 particlePosition = c->mParticles[joint->particleIndices[i]];
+
+				// By subtracting shapeOffset the calculation is done in relative coordinates
+				com += Vec3(particlePosition) - shapeOffset;
+			}
+			com /= float(joint->numParticles);
+
+			// Add the shapeOffset to switch back to absolute coordinates
+			com += shapeOffset;
+
+			// update per-joint shapeTranslations and copy to the container's memory
+			joint->shapeTranslations[0] = com.x;
+			joint->shapeTranslations[1] = com.y;
+			joint->shapeTranslations[2] = com.z;
+
+			joint->initialized = true;		// Complete joint initilization process 
+		}
+		else
+		{
+			joint->shapeTranslations[0] = c->mShapeTranslations[shapeStart].x;
+			joint->shapeTranslations[1] = c->mShapeTranslations[shapeStart].y;
+			joint->shapeTranslations[2] = c->mShapeTranslations[shapeStart].z;
+		}
+
+		// copy data back to per-joint memory from the container's memory
+		joint->shapeRotations[0] = c->mShapeRotations[shapeStart].x;
+		joint->shapeRotations[1] = c->mShapeRotations[shapeStart].y;
+		joint->shapeRotations[2] = c->mShapeRotations[shapeStart].z;
+		joint->shapeRotations[3] = c->mShapeRotations[shapeStart].w;
+	}
+
 	c->mShapeTranslations.unmap();
 	c->mShapeRotations.unmap();
 }
@@ -846,4 +938,85 @@ void NvFlexExtDestroyAsset(NvFlexExtAsset* asset)
 	delete asset;
 }
 
+NvFlexExtSoftJoint* NvFlexExtCreateSoftJoint(NvFlexExtContainer* c, const int* particleIndices, const float* particleLocalPositions, const int numJointParticles, const float stiffness)
+{
+	NvFlexExtSoftJoint* joint = new NvFlexExtSoftJoint();
+
+	joint->particleIndices = new int[numJointParticles];
+	memcpy(joint->particleIndices, particleIndices, sizeof(int) * numJointParticles);
+
+	joint->particleLocalPositions = new float[3 * numJointParticles];
+	memcpy(joint->particleLocalPositions, particleLocalPositions, 3 * sizeof(float)*numJointParticles);
+
+	// initialize with Quat()
+	joint->shapeRotations[0] = Quat().x;
+	joint->shapeRotations[1] = Quat().y;
+	joint->shapeRotations[2] = Quat().z;
+	joint->shapeRotations[3] = Quat().w;
+
+	joint->numParticles = numJointParticles;
+	joint->stiffness = stiffness;
+	joint->initialized = false;		// Initialization will be fully completed in NvFlexExtUpdateInstances()
+
+	c->mSoftJoints.push_back(joint);
+
+	// mark container as dirty
+	c->mNeedsCompact = true;
+
+	return joint;
+}
+
+void NvFlexExtDestroySoftJoint(NvFlexExtContainer* c, NvFlexExtSoftJoint* joint)
+{
+	delete[] joint->particleIndices;
+	delete[] joint->particleLocalPositions;
+
+	// TODO: O(N) remove
+	std::vector<NvFlexExtSoftJoint*>::iterator iter = std::find(c->mSoftJoints.begin(), c->mSoftJoints.end(), joint);
+	assert(iter != c->mSoftJoints.end());
+	c->mSoftJoints.erase(iter);
+
+	c->mNeedsCompact = true;
+
+	delete joint;
+}
+
+void NvFlexExtSoftJointSetTransform(NvFlexExtContainer* c, NvFlexExtSoftJoint* joint, const float* newPosition, const float* newRotation)
+{
+	// calculate transform from old position to new position
+	Matrix44 LocalFromOld = AffineInverse(TranslationMatrix(Point3(joint->shapeTranslations))*RotationMatrix(joint->shapeRotations));
+	Matrix44 NewFromLocal = TranslationMatrix(Point3(newPosition))*RotationMatrix(newRotation);
+	Matrix44 transform = NewFromLocal*LocalFromOld;
+
+	// transform soft joint particles to new location
+
+	//----------------------
+	// map buffers
+	c->mParticles.map();
+
+	for (int i = 0; i < joint->numParticles; ++i)
+	{
+		const Vec3 particlePosition = Vec3(c->mParticles[joint->particleIndices[i]]);
+		Vec4 particleNewPostion = transform * Vec4(particlePosition, 1.0f);
+
+		// update soft joint particles
+		c->mParticles[joint->particleIndices[i]].x = particleNewPostion.x;
+		c->mParticles[joint->particleIndices[i]].y = particleNewPostion.y;
+		c->mParticles[joint->particleIndices[i]].z = particleNewPostion.z;
+	}
+
+	joint->shapeTranslations[0] = newPosition[0];
+	joint->shapeTranslations[1] = newPosition[1];
+	joint->shapeTranslations[2] = newPosition[2];
+
+	joint->shapeRotations[0] = newRotation[0];
+	joint->shapeRotations[1] = newRotation[1];
+	joint->shapeRotations[2] = newRotation[2];
+	joint->shapeRotations[3] = newRotation[3];
+
+	//----------------------
+	// unmap buffers
+	c->mParticles.unmap();
+}
+