PhysX 3.4 / APEX 1.4 release candidate @21506124

4 files changed, 32 insertions, 32 deletions

diff --git a/APEX_1.4/compiler/android16/Makefile.PsFastXml.mk b/APEX_1.4/compiler/android16/Makefile.PsFastXml.mk
index 36276462..88e36c74 100644
--- a/APEX_1.4/compiler/android16/Makefile.PsFastXml.mk
+++ b/APEX_1.4/compiler/android16/Makefile.PsFastXml.mk
@@ -50,7 +50,7 @@ PsFastXml_debug_common_cflags    += $(addprefix -D, $(PsFastXml_debug_defines))
 PsFastXml_debug_common_cflags    += $(addprefix -I, $(PsFastXml_debug_hpaths))
 PsFastXml_debug_common_cflags  += -Werror
 PsFastXml_debug_common_cflags  += -fpic -fno-exceptions
-PsFastXml_debug_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PsFastXml_debug_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PsFastXml_debug_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PsFastXml_debug_common_cflags  += -g3 -gdwarf-2
 PsFastXml_debug_cflags	:= $(PsFastXml_debug_common_cflags)
@@ -59,7 +59,7 @@ PsFastXml_debug_cppflags  += -fno-rtti
 PsFastXml_debug_lflags    := $(PsFastXml_custom_lflags)
 PsFastXml_debug_lflags    += $(addprefix -L, $(PsFastXml_debug_lpaths))
 PsFastXml_debug_lflags    += -Wl,--start-group $(addprefix -l, $(PsFastXml_debug_libraries)) -Wl,--end-group
-PsFastXml_debug_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PsFastXml_debug_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PsFastXml_debug_objsdir  = $(OBJS_DIR)/PsFastXml_debug
 PsFastXml_debug_cpp_o    = $(addprefix $(PsFastXml_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PsFastXml_cppfiles)))))
 PsFastXml_debug_cc_o    = $(addprefix $(PsFastXml_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PsFastXml_ccfiles)))))
@@ -141,7 +141,7 @@ PsFastXml_release_common_cflags    += $(addprefix -D, $(PsFastXml_release_define
 PsFastXml_release_common_cflags    += $(addprefix -I, $(PsFastXml_release_hpaths))
 PsFastXml_release_common_cflags  += -Werror
 PsFastXml_release_common_cflags  += -fpic -fno-exceptions
-PsFastXml_release_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PsFastXml_release_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PsFastXml_release_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PsFastXml_release_common_cflags  += -O3 -fno-strict-aliasing
 PsFastXml_release_common_cflags  += -ffunction-sections -funwind-tables -fstack-protector
@@ -152,7 +152,7 @@ PsFastXml_release_cppflags  += -fno-rtti
 PsFastXml_release_lflags    := $(PsFastXml_custom_lflags)
 PsFastXml_release_lflags    += $(addprefix -L, $(PsFastXml_release_lpaths))
 PsFastXml_release_lflags    += -Wl,--start-group $(addprefix -l, $(PsFastXml_release_libraries)) -Wl,--end-group
-PsFastXml_release_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PsFastXml_release_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PsFastXml_release_objsdir  = $(OBJS_DIR)/PsFastXml_release
 PsFastXml_release_cpp_o    = $(addprefix $(PsFastXml_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PsFastXml_cppfiles)))))
 PsFastXml_release_cc_o    = $(addprefix $(PsFastXml_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PsFastXml_ccfiles)))))
@@ -236,7 +236,7 @@ PsFastXml_checked_common_cflags    += $(addprefix -D, $(PsFastXml_checked_define
 PsFastXml_checked_common_cflags    += $(addprefix -I, $(PsFastXml_checked_hpaths))
 PsFastXml_checked_common_cflags  += -Werror
 PsFastXml_checked_common_cflags  += -fpic -fno-exceptions
-PsFastXml_checked_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PsFastXml_checked_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PsFastXml_checked_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PsFastXml_checked_common_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PsFastXml_checked_common_cflags  += -ffunction-sections -funwind-tables -fstack-protector
@@ -247,7 +247,7 @@ PsFastXml_checked_cppflags  += -fno-rtti
 PsFastXml_checked_lflags    := $(PsFastXml_custom_lflags)
 PsFastXml_checked_lflags    += $(addprefix -L, $(PsFastXml_checked_lpaths))
 PsFastXml_checked_lflags    += -Wl,--start-group $(addprefix -l, $(PsFastXml_checked_libraries)) -Wl,--end-group
-PsFastXml_checked_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PsFastXml_checked_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PsFastXml_checked_objsdir  = $(OBJS_DIR)/PsFastXml_checked
 PsFastXml_checked_cpp_o    = $(addprefix $(PsFastXml_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PsFastXml_cppfiles)))))
 PsFastXml_checked_cc_o    = $(addprefix $(PsFastXml_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PsFastXml_ccfiles)))))
@@ -331,7 +331,7 @@ PsFastXml_profile_common_cflags    += $(addprefix -D, $(PsFastXml_profile_define
 PsFastXml_profile_common_cflags    += $(addprefix -I, $(PsFastXml_profile_hpaths))
 PsFastXml_profile_common_cflags  += -Werror
 PsFastXml_profile_common_cflags  += -fpic -fno-exceptions
-PsFastXml_profile_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PsFastXml_profile_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PsFastXml_profile_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PsFastXml_profile_common_cflags  += -O3 -fno-strict-aliasing
 PsFastXml_profile_common_cflags  += -ffunction-sections -funwind-tables -fstack-protector
@@ -342,7 +342,7 @@ PsFastXml_profile_cppflags  += -fno-rtti
 PsFastXml_profile_lflags    := $(PsFastXml_custom_lflags)
 PsFastXml_profile_lflags    += $(addprefix -L, $(PsFastXml_profile_lpaths))
 PsFastXml_profile_lflags    += -Wl,--start-group $(addprefix -l, $(PsFastXml_profile_libraries)) -Wl,--end-group
-PsFastXml_profile_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PsFastXml_profile_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PsFastXml_profile_objsdir  = $(OBJS_DIR)/PsFastXml_profile
 PsFastXml_profile_cpp_o    = $(addprefix $(PsFastXml_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PsFastXml_cppfiles)))))
 PsFastXml_profile_cc_o    = $(addprefix $(PsFastXml_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PsFastXml_ccfiles)))))
diff --git a/APEX_1.4/compiler/android16/Makefile.PxFoundation.mk b/APEX_1.4/compiler/android16/Makefile.PxFoundation.mk
index 35751718..46e6f319 100644
--- a/APEX_1.4/compiler/android16/Makefile.PxFoundation.mk
+++ b/APEX_1.4/compiler/android16/Makefile.PxFoundation.mk
@@ -64,7 +64,7 @@ PxFoundation_debug_common_cflags    += $(addprefix -D, $(PxFoundation_debug_defi
 PxFoundation_debug_common_cflags    += $(addprefix -I, $(PxFoundation_debug_hpaths))
 PxFoundation_debug_common_cflags  += -Werror
 PxFoundation_debug_common_cflags  += -fpic -fno-exceptions
-PxFoundation_debug_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxFoundation_debug_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxFoundation_debug_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxFoundation_debug_common_cflags  += -Wall -Wextra -Wpedantic -Wstrict-aliasing=2
 PxFoundation_debug_common_cflags  += -Wno-maybe-uninitialized -Wno-unused-variable
@@ -78,7 +78,7 @@ PxFoundation_debug_cppflags  += -Wno-invalid-offsetof
 PxFoundation_debug_lflags    := $(PxFoundation_custom_lflags)
 PxFoundation_debug_lflags    += $(addprefix -L, $(PxFoundation_debug_lpaths))
 PxFoundation_debug_lflags    += -Wl,--start-group $(addprefix -l, $(PxFoundation_debug_libraries)) -Wl,--end-group
-PxFoundation_debug_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxFoundation_debug_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxFoundation_debug_objsdir  = $(OBJS_DIR)/PxFoundation_debug
 PxFoundation_debug_cpp_o    = $(addprefix $(PxFoundation_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxFoundation_cppfiles)))))
 PxFoundation_debug_cc_o    = $(addprefix $(PxFoundation_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxFoundation_ccfiles)))))
@@ -158,7 +158,7 @@ PxFoundation_release_common_cflags    += $(addprefix -D, $(PxFoundation_release_
 PxFoundation_release_common_cflags    += $(addprefix -I, $(PxFoundation_release_hpaths))
 PxFoundation_release_common_cflags  += -Werror
 PxFoundation_release_common_cflags  += -fpic -fno-exceptions
-PxFoundation_release_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxFoundation_release_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxFoundation_release_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxFoundation_release_common_cflags  += -Wall -Wextra -Wpedantic -Wstrict-aliasing=2
 PxFoundation_release_common_cflags  += -Wno-maybe-uninitialized -Wno-unused-variable
@@ -174,7 +174,7 @@ PxFoundation_release_cppflags  += -Wno-invalid-offsetof
 PxFoundation_release_lflags    := $(PxFoundation_custom_lflags)
 PxFoundation_release_lflags    += $(addprefix -L, $(PxFoundation_release_lpaths))
 PxFoundation_release_lflags    += -Wl,--start-group $(addprefix -l, $(PxFoundation_release_libraries)) -Wl,--end-group
-PxFoundation_release_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxFoundation_release_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxFoundation_release_objsdir  = $(OBJS_DIR)/PxFoundation_release
 PxFoundation_release_cpp_o    = $(addprefix $(PxFoundation_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxFoundation_cppfiles)))))
 PxFoundation_release_cc_o    = $(addprefix $(PxFoundation_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxFoundation_ccfiles)))))
@@ -256,7 +256,7 @@ PxFoundation_checked_common_cflags    += $(addprefix -D, $(PxFoundation_checked_
 PxFoundation_checked_common_cflags    += $(addprefix -I, $(PxFoundation_checked_hpaths))
 PxFoundation_checked_common_cflags  += -Werror
 PxFoundation_checked_common_cflags  += -fpic -fno-exceptions
-PxFoundation_checked_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxFoundation_checked_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxFoundation_checked_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxFoundation_checked_common_cflags  += -Wall -Wextra -Wpedantic -Wstrict-aliasing=2
 PxFoundation_checked_common_cflags  += -Wno-maybe-uninitialized -Wno-unused-variable
@@ -272,7 +272,7 @@ PxFoundation_checked_cppflags  += -Wno-invalid-offsetof
 PxFoundation_checked_lflags    := $(PxFoundation_custom_lflags)
 PxFoundation_checked_lflags    += $(addprefix -L, $(PxFoundation_checked_lpaths))
 PxFoundation_checked_lflags    += -Wl,--start-group $(addprefix -l, $(PxFoundation_checked_libraries)) -Wl,--end-group
-PxFoundation_checked_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxFoundation_checked_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxFoundation_checked_objsdir  = $(OBJS_DIR)/PxFoundation_checked
 PxFoundation_checked_cpp_o    = $(addprefix $(PxFoundation_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxFoundation_cppfiles)))))
 PxFoundation_checked_cc_o    = $(addprefix $(PxFoundation_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxFoundation_ccfiles)))))
@@ -354,7 +354,7 @@ PxFoundation_profile_common_cflags    += $(addprefix -D, $(PxFoundation_profile_
 PxFoundation_profile_common_cflags    += $(addprefix -I, $(PxFoundation_profile_hpaths))
 PxFoundation_profile_common_cflags  += -Werror
 PxFoundation_profile_common_cflags  += -fpic -fno-exceptions
-PxFoundation_profile_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxFoundation_profile_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxFoundation_profile_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxFoundation_profile_common_cflags  += -Wall -Wextra -Wpedantic -Wstrict-aliasing=2
 PxFoundation_profile_common_cflags  += -Wno-maybe-uninitialized -Wno-unused-variable
@@ -370,7 +370,7 @@ PxFoundation_profile_cppflags  += -Wno-invalid-offsetof
 PxFoundation_profile_lflags    := $(PxFoundation_custom_lflags)
 PxFoundation_profile_lflags    += $(addprefix -L, $(PxFoundation_profile_lpaths))
 PxFoundation_profile_lflags    += -Wl,--start-group $(addprefix -l, $(PxFoundation_profile_libraries)) -Wl,--end-group
-PxFoundation_profile_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxFoundation_profile_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxFoundation_profile_objsdir  = $(OBJS_DIR)/PxFoundation_profile
 PxFoundation_profile_cpp_o    = $(addprefix $(PxFoundation_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxFoundation_cppfiles)))))
 PxFoundation_profile_cc_o    = $(addprefix $(PxFoundation_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxFoundation_ccfiles)))))
diff --git a/APEX_1.4/compiler/android16/Makefile.PxPvdSDK.mk b/APEX_1.4/compiler/android16/Makefile.PxPvdSDK.mk
index 9b0af5e7..eae9d2e0 100644
--- a/APEX_1.4/compiler/android16/Makefile.PxPvdSDK.mk
+++ b/APEX_1.4/compiler/android16/Makefile.PxPvdSDK.mk
@@ -63,7 +63,7 @@ PxPvdSDK_debug_common_cflags    += $(addprefix -D, $(PxPvdSDK_debug_defines))
 PxPvdSDK_debug_common_cflags    += $(addprefix -I, $(PxPvdSDK_debug_hpaths))
 PxPvdSDK_debug_common_cflags  += -Werror
 PxPvdSDK_debug_common_cflags  += -fpic -fno-exceptions
-PxPvdSDK_debug_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxPvdSDK_debug_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxPvdSDK_debug_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxPvdSDK_debug_common_cflags  += -Wall -Wextra -Wpedantic -Wstrict-aliasing=2
 PxPvdSDK_debug_common_cflags  += -Wno-maybe-uninitialized -Wno-unused-variable
@@ -77,7 +77,7 @@ PxPvdSDK_debug_cppflags  += -Wno-invalid-offsetof
 PxPvdSDK_debug_lflags    := $(PxPvdSDK_custom_lflags)
 PxPvdSDK_debug_lflags    += $(addprefix -L, $(PxPvdSDK_debug_lpaths))
 PxPvdSDK_debug_lflags    += -Wl,--start-group $(addprefix -l, $(PxPvdSDK_debug_libraries)) -Wl,--end-group
-PxPvdSDK_debug_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxPvdSDK_debug_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxPvdSDK_debug_objsdir  = $(OBJS_DIR)/PxPvdSDK_debug
 PxPvdSDK_debug_cpp_o    = $(addprefix $(PxPvdSDK_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxPvdSDK_cppfiles)))))
 PxPvdSDK_debug_cc_o    = $(addprefix $(PxPvdSDK_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxPvdSDK_ccfiles)))))
@@ -162,7 +162,7 @@ PxPvdSDK_release_common_cflags    += $(addprefix -D, $(PxPvdSDK_release_defines)
 PxPvdSDK_release_common_cflags    += $(addprefix -I, $(PxPvdSDK_release_hpaths))
 PxPvdSDK_release_common_cflags  += -Werror
 PxPvdSDK_release_common_cflags  += -fpic -fno-exceptions
-PxPvdSDK_release_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxPvdSDK_release_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxPvdSDK_release_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxPvdSDK_release_common_cflags  += -Wall -Wextra -Wpedantic -Wstrict-aliasing=2
 PxPvdSDK_release_common_cflags  += -Wno-maybe-uninitialized -Wno-unused-variable
@@ -178,7 +178,7 @@ PxPvdSDK_release_cppflags  += -Wno-invalid-offsetof
 PxPvdSDK_release_lflags    := $(PxPvdSDK_custom_lflags)
 PxPvdSDK_release_lflags    += $(addprefix -L, $(PxPvdSDK_release_lpaths))
 PxPvdSDK_release_lflags    += -Wl,--start-group $(addprefix -l, $(PxPvdSDK_release_libraries)) -Wl,--end-group
-PxPvdSDK_release_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxPvdSDK_release_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxPvdSDK_release_objsdir  = $(OBJS_DIR)/PxPvdSDK_release
 PxPvdSDK_release_cpp_o    = $(addprefix $(PxPvdSDK_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxPvdSDK_cppfiles)))))
 PxPvdSDK_release_cc_o    = $(addprefix $(PxPvdSDK_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxPvdSDK_ccfiles)))))
@@ -265,7 +265,7 @@ PxPvdSDK_checked_common_cflags    += $(addprefix -D, $(PxPvdSDK_checked_defines)
 PxPvdSDK_checked_common_cflags    += $(addprefix -I, $(PxPvdSDK_checked_hpaths))
 PxPvdSDK_checked_common_cflags  += -Werror
 PxPvdSDK_checked_common_cflags  += -fpic -fno-exceptions
-PxPvdSDK_checked_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxPvdSDK_checked_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxPvdSDK_checked_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxPvdSDK_checked_common_cflags  += -Wall -Wextra -Wpedantic -Wstrict-aliasing=2
 PxPvdSDK_checked_common_cflags  += -Wno-maybe-uninitialized -Wno-unused-variable
@@ -281,7 +281,7 @@ PxPvdSDK_checked_cppflags  += -Wno-invalid-offsetof
 PxPvdSDK_checked_lflags    := $(PxPvdSDK_custom_lflags)
 PxPvdSDK_checked_lflags    += $(addprefix -L, $(PxPvdSDK_checked_lpaths))
 PxPvdSDK_checked_lflags    += -Wl,--start-group $(addprefix -l, $(PxPvdSDK_checked_libraries)) -Wl,--end-group
-PxPvdSDK_checked_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxPvdSDK_checked_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxPvdSDK_checked_objsdir  = $(OBJS_DIR)/PxPvdSDK_checked
 PxPvdSDK_checked_cpp_o    = $(addprefix $(PxPvdSDK_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxPvdSDK_cppfiles)))))
 PxPvdSDK_checked_cc_o    = $(addprefix $(PxPvdSDK_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxPvdSDK_ccfiles)))))
@@ -368,7 +368,7 @@ PxPvdSDK_profile_common_cflags    += $(addprefix -D, $(PxPvdSDK_profile_defines)
 PxPvdSDK_profile_common_cflags    += $(addprefix -I, $(PxPvdSDK_profile_hpaths))
 PxPvdSDK_profile_common_cflags  += -Werror
 PxPvdSDK_profile_common_cflags  += -fpic -fno-exceptions
-PxPvdSDK_profile_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxPvdSDK_profile_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxPvdSDK_profile_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxPvdSDK_profile_common_cflags  += -Wall -Wextra -Wpedantic -Wstrict-aliasing=2
 PxPvdSDK_profile_common_cflags  += -Wno-maybe-uninitialized -Wno-unused-variable
@@ -384,7 +384,7 @@ PxPvdSDK_profile_cppflags  += -Wno-invalid-offsetof
 PxPvdSDK_profile_lflags    := $(PxPvdSDK_custom_lflags)
 PxPvdSDK_profile_lflags    += $(addprefix -L, $(PxPvdSDK_profile_lpaths))
 PxPvdSDK_profile_lflags    += -Wl,--start-group $(addprefix -l, $(PxPvdSDK_profile_libraries)) -Wl,--end-group
-PxPvdSDK_profile_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxPvdSDK_profile_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxPvdSDK_profile_objsdir  = $(OBJS_DIR)/PxPvdSDK_profile
 PxPvdSDK_profile_cpp_o    = $(addprefix $(PxPvdSDK_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxPvdSDK_cppfiles)))))
 PxPvdSDK_profile_cc_o    = $(addprefix $(PxPvdSDK_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxPvdSDK_ccfiles)))))
diff --git a/APEX_1.4/compiler/android16/Makefile.PxTask.mk b/APEX_1.4/compiler/android16/Makefile.PxTask.mk
index 399c764b..548b6b51 100644
--- a/APEX_1.4/compiler/android16/Makefile.PxTask.mk
+++ b/APEX_1.4/compiler/android16/Makefile.PxTask.mk
@@ -49,7 +49,7 @@ PxTask_debug_common_cflags    += $(addprefix -D, $(PxTask_debug_defines))
 PxTask_debug_common_cflags    += $(addprefix -I, $(PxTask_debug_hpaths))
 PxTask_debug_common_cflags  += -Werror
 PxTask_debug_common_cflags  += -fpic -fno-exceptions
-PxTask_debug_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxTask_debug_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxTask_debug_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxTask_debug_common_cflags  += -g3 -gdwarf-2
 PxTask_debug_cflags	:= $(PxTask_debug_common_cflags)
@@ -58,7 +58,7 @@ PxTask_debug_cppflags  += -fno-rtti
 PxTask_debug_lflags    := $(PxTask_custom_lflags)
 PxTask_debug_lflags    += $(addprefix -L, $(PxTask_debug_lpaths))
 PxTask_debug_lflags    += -Wl,--start-group $(addprefix -l, $(PxTask_debug_libraries)) -Wl,--end-group
-PxTask_debug_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxTask_debug_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxTask_debug_objsdir  = $(OBJS_DIR)/PxTask_debug
 PxTask_debug_cpp_o    = $(addprefix $(PxTask_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxTask_cppfiles)))))
 PxTask_debug_cc_o    = $(addprefix $(PxTask_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxTask_ccfiles)))))
@@ -139,7 +139,7 @@ PxTask_release_common_cflags    += $(addprefix -D, $(PxTask_release_defines))
 PxTask_release_common_cflags    += $(addprefix -I, $(PxTask_release_hpaths))
 PxTask_release_common_cflags  += -Werror
 PxTask_release_common_cflags  += -fpic -fno-exceptions
-PxTask_release_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxTask_release_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxTask_release_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxTask_release_common_cflags  += -O3 -fno-strict-aliasing
 PxTask_release_common_cflags  += -ffunction-sections -funwind-tables -fstack-protector
@@ -150,7 +150,7 @@ PxTask_release_cppflags  += -fno-rtti
 PxTask_release_lflags    := $(PxTask_custom_lflags)
 PxTask_release_lflags    += $(addprefix -L, $(PxTask_release_lpaths))
 PxTask_release_lflags    += -Wl,--start-group $(addprefix -l, $(PxTask_release_libraries)) -Wl,--end-group
-PxTask_release_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxTask_release_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxTask_release_objsdir  = $(OBJS_DIR)/PxTask_release
 PxTask_release_cpp_o    = $(addprefix $(PxTask_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxTask_cppfiles)))))
 PxTask_release_cc_o    = $(addprefix $(PxTask_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxTask_ccfiles)))))
@@ -233,7 +233,7 @@ PxTask_checked_common_cflags    += $(addprefix -D, $(PxTask_checked_defines))
 PxTask_checked_common_cflags    += $(addprefix -I, $(PxTask_checked_hpaths))
 PxTask_checked_common_cflags  += -Werror
 PxTask_checked_common_cflags  += -fpic -fno-exceptions
-PxTask_checked_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxTask_checked_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxTask_checked_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxTask_checked_common_cflags  += -g3 -gdwarf-2 -O3 -fno-strict-aliasing
 PxTask_checked_common_cflags  += -ffunction-sections -funwind-tables -fstack-protector
@@ -244,7 +244,7 @@ PxTask_checked_cppflags  += -fno-rtti
 PxTask_checked_lflags    := $(PxTask_custom_lflags)
 PxTask_checked_lflags    += $(addprefix -L, $(PxTask_checked_lpaths))
 PxTask_checked_lflags    += -Wl,--start-group $(addprefix -l, $(PxTask_checked_libraries)) -Wl,--end-group
-PxTask_checked_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxTask_checked_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxTask_checked_objsdir  = $(OBJS_DIR)/PxTask_checked
 PxTask_checked_cpp_o    = $(addprefix $(PxTask_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxTask_cppfiles)))))
 PxTask_checked_cc_o    = $(addprefix $(PxTask_checked_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxTask_ccfiles)))))
@@ -327,7 +327,7 @@ PxTask_profile_common_cflags    += $(addprefix -D, $(PxTask_profile_defines))
 PxTask_profile_common_cflags    += $(addprefix -I, $(PxTask_profile_hpaths))
 PxTask_profile_common_cflags  += -Werror
 PxTask_profile_common_cflags  += -fpic -fno-exceptions
-PxTask_profile_common_cflags  += -isysroot C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxTask_profile_common_cflags  += -isysroot ./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxTask_profile_common_cflags  += -march=armv7-a -mfpu=neon -marm -mfloat-abi=softfp -mthumb-interwork
 PxTask_profile_common_cflags  += -O3 -fno-strict-aliasing
 PxTask_profile_common_cflags  += -ffunction-sections -funwind-tables -fstack-protector
@@ -338,7 +338,7 @@ PxTask_profile_cppflags  += -fno-rtti
 PxTask_profile_lflags    := $(PxTask_custom_lflags)
 PxTask_profile_lflags    += $(addprefix -L, $(PxTask_profile_lpaths))
 PxTask_profile_lflags    += -Wl,--start-group $(addprefix -l, $(PxTask_profile_libraries)) -Wl,--end-group
-PxTask_profile_lflags  += --sysroot=C:/b/a80d70e9dd655e16/sw/physx/externals/android-ndk/r9d-win32/platforms/android-16/arch-arm
+PxTask_profile_lflags  += --sysroot=./../../../Externals/android-ndk-r9d/platforms/android-16/arch-arm
 PxTask_profile_objsdir  = $(OBJS_DIR)/PxTask_profile
 PxTask_profile_cpp_o    = $(addprefix $(PxTask_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(PxTask_cppfiles)))))
 PxTask_profile_cc_o    = $(addprefix $(PxTask_profile_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(PxTask_ccfiles)))))