1.2.0.beta.11.2.0.beta.1

3 files changed, 54 insertions, 41 deletions

diff --git a/demo/compiler/makeandroid/Makefile b/demo/compiler/makeandroid/Makefile
index 0b462ff..02650e4 100644
--- a/demo/compiler/makeandroid/Makefile
+++ b/demo/compiler/makeandroid/Makefile
@@ -2,11 +2,11 @@
 # Makefile generated by XPJ for android
 
 DEPSDIR = .deps
-NDKROOT = "$(NDK_ROOT)"/"$(NDK_VERSION)"
-NDK_BIN_DIR = "$(NDK_ROOT)"/"$(NDK_VERSION)"/toolchains/"$(NDK_TOOLCHAIN)"/prebuilt/"linux-x86_64"/bin
+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  = ./../xpj/"$(JAVA_HOME)"
-ANT_TOOL = ./../xpj/"$(ANT_HOME}"/bin/ant
+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
@@ -23,22 +23,20 @@ OBJCOPY   = $(NDK_BIN_DIR)/$(NDK_PREFIX)objcopy
 
 all: debug release 
 
-debug: build_flexExtCUDA_debug 
+debug: build_flexCUDA_debug build_flexExtCUDA_debug 
 
-release: build_flexExtCUDA_release build_flexDemoCUDA_release 
+release: build_flexDevice_release build_flexCUDA_release build_flexExtCUDA_release build_flexDemoCUDA_release 
 
-clean: clean_flexExtCUDA_release clean_flexExtCUDA_debug clean_flexDemoCUDA_release 
+clean: clean_flexDevice_release clean_flexCUDA_release clean_flexCUDA_debug clean_flexExtCUDA_release clean_flexExtCUDA_debug clean_flexDemoCUDA_release 
 	rm -rf $(DEPSDIR)
 
 
-clean_release: clean_flexExtCUDA_release clean_flexDemoCUDA_release 
-	rm -rf $(DEPSDIR)
-
-
-clean_debug: clean_flexExtCUDA_debug clean_flexDemoCUDA_debug 
+clean_release: clean_flexDevice_release clean_flexCUDA_release clean_flexExtCUDA_release clean_flexDemoCUDA_release 
 	rm -rf $(DEPSDIR)
 
 
+include Makefile.flexDevice.mk
+include Makefile.flexCUDA.mk
 include Makefile.flexExtCUDA.mk
 include Makefile.flexDemoCUDA.mk
 
diff --git a/demo/compiler/makeandroid/Makefile.flexDemoCUDA.mk b/demo/compiler/makeandroid/Makefile.flexDemoCUDA.mk
index dbfbaab..74e8454 100644
--- a/demo/compiler/makeandroid/Makefile.flexDemoCUDA.mk
+++ b/demo/compiler/makeandroid/Makefile.flexDemoCUDA.mk
@@ -18,6 +18,9 @@ flexDemoCUDA_cppfiles   += ./../../../core/sdf.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/tga.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/voxelize.cpp
 flexDemoCUDA_cppfiles   += ./../../../external/egl_setup/egl_setup.cpp
+flexDemoCUDA_cppfiles   += ./../../android/android_main.cpp
+flexDemoCUDA_cppfiles   += ./../../android/android_mainRender.cpp
+flexDemoCUDA_cfiles   += ./../../android/android_native_app_glue.c
 
 flexDemoCUDA_cpp_release_dep    = $(addprefix $(DEPSDIR)/flexDemoCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexDemoCUDA_cppfiles)))))
 flexDemoCUDA_cc_release_dep    = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexDemoCUDA_ccfiles)))))
@@ -26,15 +29,15 @@ flexDemoCUDA_release_dep      = $(flexDemoCUDA_cpp_release_dep) $(flexDemoCUDA_c
 -include $(flexDemoCUDA_release_dep)
 flexDemoCUDA_release_hpaths    := 
 flexDemoCUDA_release_hpaths    += ./../../..
-flexDemoCUDA_release_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include
-flexDemoCUDA_release_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport
-flexDemoCUDA_release_hpaths    += $(CUDA_PATH)/targets/armv7-linux-androideabi/include
+flexDemoCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include
+flexDemoCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport
+flexDemoCUDA_release_hpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include
 flexDemoCUDA_release_hpaths    += ./../../../external/egl_setup
 flexDemoCUDA_release_hpaths    += ./../../../external/regal_static/include
 flexDemoCUDA_release_lpaths    := 
-flexDemoCUDA_release_lpaths    += $(CUDA_PATH)/targets/armv7-linux-androideabi/lib
+flexDemoCUDA_release_lpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib
 flexDemoCUDA_release_lpaths    += ./../../../lib/android
-flexDemoCUDA_release_lpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/libs/armeabi-v7a
+flexDemoCUDA_release_lpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/libs/armeabi-v7a
 flexDemoCUDA_release_lpaths    += ./../../../external/regal_static/lib/armeabi-v7a
 flexDemoCUDA_release_lpaths    += ./../../../lib/android
 flexDemoCUDA_release_defines   := $(flexDemoCUDA_custom_defines)
@@ -44,6 +47,8 @@ flexDemoCUDA_release_defines   += ANDROID_PLAT=1
 flexDemoCUDA_release_defines   += DISABLE_IMPORTGL
 flexDemoCUDA_release_defines   += NDEBUG
 flexDemoCUDA_release_libraries := 
+flexDemoCUDA_release_libraries += NvFlexReleaseCUDA_armv7l
+flexDemoCUDA_release_libraries += flexDevice_x64
 flexDemoCUDA_release_libraries += flexExt_cuda_release_armv7l
 flexDemoCUDA_release_libraries += android
 flexDemoCUDA_release_libraries += stdc++
@@ -62,14 +67,16 @@ flexDemoCUDA_release_common_cflags	:= $(flexDemoCUDA_custom_cflags)
 flexDemoCUDA_release_common_cflags    += -MMD
 flexDemoCUDA_release_common_cflags    += $(addprefix -D, $(flexDemoCUDA_release_defines))
 flexDemoCUDA_release_common_cflags    += $(addprefix -I, $(flexDemoCUDA_release_hpaths))
-flexDemoCUDA_release_common_cflags  += -std=c++11 -fno-exceptions -fno-rtti
-flexDemoCUDA_release_common_cflags  += -fpic -fPIC -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -O2 -g -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300
 flexDemoCUDA_release_cflags	:= $(flexDemoCUDA_release_common_cflags)
+flexDemoCUDA_release_cflags  += -std=c++11 -fno-exceptions -fno-rtti
+flexDemoCUDA_release_cflags  += -fpic -fPIC -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -O2 -g -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300
 flexDemoCUDA_release_cppflags	:= $(flexDemoCUDA_release_common_cflags)
+flexDemoCUDA_release_cppflags  += -std=c++11 -fno-exceptions -fno-rtti
+flexDemoCUDA_release_cppflags  += -fpic -fPIC -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -O2 -g -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300
 flexDemoCUDA_release_lflags    := $(flexDemoCUDA_custom_lflags)
 flexDemoCUDA_release_lflags    += $(addprefix -L, $(flexDemoCUDA_release_lpaths))
 flexDemoCUDA_release_lflags    += -Wl,--start-group $(addprefix -l, $(flexDemoCUDA_release_libraries)) -Wl,--end-group
-flexDemoCUDA_release_lflags  += --sysroot="$(NDK_ROOT)"/"$(NDK_VERSION)"/platforms/android-15/arch-arm -shared -Wl,--no-undefined
+flexDemoCUDA_release_lflags  += --sysroot=/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm -shared -Wl,--no-undefined
 flexDemoCUDA_release_objsdir  = $(OBJS_DIR)/flexDemoCUDA_release
 flexDemoCUDA_release_cpp_o    = $(addprefix $(flexDemoCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDemoCUDA_cppfiles)))))
 flexDemoCUDA_release_cc_o    = $(addprefix $(flexDemoCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexDemoCUDA_ccfiles)))))
@@ -91,7 +98,7 @@ antbuild_flexDemoCUDA_release: preantbuild_flexDemoCUDA_release
 mainbuild_flexDemoCUDA_release: prebuild_flexDemoCUDA_release $(flexDemoCUDA_release_bin)
 prebuild_flexDemoCUDA_release:
 
-$(flexDemoCUDA_release_bin): $(flexDemoCUDA_release_obj) build_flexExtCUDA_release 
+$(flexDemoCUDA_release_bin): $(flexDemoCUDA_release_obj) build_flexCUDA_release build_flexDevice_release build_flexExtCUDA_release 
 	mkdir -p `dirname ./../android/flex_project/libs/armeabi-v7a/libflexDemo.so`
 	$(CXX) -shared $(flexDemoCUDA_release_obj) $(flexDemoCUDA_release_lflags) -lc -o $@ 
 	$(ECHO) building $@ complete!
diff --git a/demo/compiler/makeandroid/Makefile.flexExtCUDA.mk b/demo/compiler/makeandroid/Makefile.flexExtCUDA.mk
index 8a33251..9e4826c 100644
--- a/demo/compiler/makeandroid/Makefile.flexExtCUDA.mk
+++ b/demo/compiler/makeandroid/Makefile.flexExtCUDA.mk
@@ -24,28 +24,32 @@ flexExtCUDA_debug_dep      = $(flexExtCUDA_cpp_debug_dep) $(flexExtCUDA_cc_debug
 -include $(flexExtCUDA_debug_dep)
 flexExtCUDA_release_hpaths    := 
 flexExtCUDA_release_hpaths    += ./../../..
-flexExtCUDA_release_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include
-flexExtCUDA_release_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport
-flexExtCUDA_release_hpaths    += $(CUDA_PATH)/targets/armv7-linux-androideabi/include
+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    += $(CUDA_PATH)/targets/armv7-linux-androideabi/lib
+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_lpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/libs/armeabi-v7a
 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_common_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexExtCUDA_release_common_cflags  += -O3 -ffast-math
 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
@@ -68,15 +72,15 @@ postbuild_flexExtCUDA_release: mainbuild_flexExtCUDA_release
 mainbuild_flexExtCUDA_release: prebuild_flexExtCUDA_release $(flexExtCUDA_release_bin)
 prebuild_flexExtCUDA_release:
 
-$(flexExtCUDA_release_bin): $(flexExtCUDA_release_obj) 
+$(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_extensions_cuda_flexExt_cu_o): $(flexExtCUDA_cuda_extensions_cuda_flexExt_cu) 
 	@mkdir -p `dirname $(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o`
-	$(ECHO) "$(CUDA_PATH)/bin/nvcc" -ccbin $(NDK_ROOT)/$(NDK_VERSION)/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"$(CUDA_PATH)/targets/armv7-linux-androideabi/include" -I"../../.." -I"$(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport" -I"$(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include"  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o"
-	"$(CUDA_PATH)/bin/nvcc" -ccbin $(NDK_ROOT)/$(NDK_VERSION)/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"$(CUDA_PATH)/targets/armv7-linux-androideabi/include" -I"../../.." -I"$(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport" -I"$(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include"  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/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 "../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/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 "../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o"
 
 flexExtCUDA_release_DEPDIR = $(dir $(@))/$(*F)
 $(flexExtCUDA_release_cpp_o): $(flexExtCUDA_release_objsdir)/%.o:
@@ -111,28 +115,32 @@ $(flexExtCUDA_release_c_o): $(flexExtCUDA_release_objsdir)/%.o:
 
 flexExtCUDA_debug_hpaths    := 
 flexExtCUDA_debug_hpaths    += ./../../..
-flexExtCUDA_debug_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include
-flexExtCUDA_debug_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport
-flexExtCUDA_debug_hpaths    += $(CUDA_PATH)/targets/armv7-linux-androideabi/include
+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    += $(CUDA_PATH)/targets/armv7-linux-androideabi/lib
+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_lpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/libs/armeabi-v7a
 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_common_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexExtCUDA_debug_common_cflags  += -g -O0
 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
@@ -155,15 +163,15 @@ postbuild_flexExtCUDA_debug: mainbuild_flexExtCUDA_debug
 mainbuild_flexExtCUDA_debug: prebuild_flexExtCUDA_debug $(flexExtCUDA_debug_bin)
 prebuild_flexExtCUDA_debug:
 
-$(flexExtCUDA_debug_bin): $(flexExtCUDA_debug_obj) 
+$(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_extensions_cuda_flexExt_cu_o): $(flexExtCUDA_cuda_extensions_cuda_flexExt_cu) 
 	@mkdir -p `dirname $(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o`
-	$(ECHO) "$(CUDA_PATH)/bin/nvcc" -ccbin $(NDK_ROOT)/$(NDK_VERSION)/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"$(CUDA_PATH)/targets/armv7-linux-androideabi/include" -I"../../.." -I"$(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport" -I"$(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include"  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o"
-	"$(CUDA_PATH)/bin/nvcc" -ccbin $(NDK_ROOT)/$(NDK_VERSION)/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"$(CUDA_PATH)/targets/armv7-linux-androideabi/include" -I"../../.." -I"$(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport" -I"$(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include"  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/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 "../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/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 "../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o"
 
 flexExtCUDA_debug_DEPDIR = $(dir $(@))/$(*F)
 $(flexExtCUDA_debug_cpp_o): $(flexExtCUDA_debug_objsdir)/%.o: