7f40aea
diff -up ./Platform/Linux/Build/Common/CommonCppMakefile.fedora ./Platform/Linux/Build/Common/CommonCppMakefile
7f40aea
--- ./Platform/Linux/Build/Common/CommonCppMakefile.fedora	2014-06-01 16:14:48.787069665 -0400
7f40aea
+++ ./Platform/Linux/Build/Common/CommonCppMakefile	2014-06-01 16:15:21.350346455 -0400
7f40aea
@@ -71,6 +71,9 @@ endif
Tim Niemueller 8b145ba
 CFLAGS += $(INC_DIRS_OPTION) $(DEFINES_OPTION)
Tim Niemueller 8b145ba
 LDFLAGS += $(LIB_DIRS_OPTION) $(USED_LIBS_OPTION)
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
+CFLAGS += $(CFLAGS_EXT)
Tim Niemueller 8b145ba
+LDFLAGS += $(LDFLAGS_EXT)
Tim Niemueller 8b145ba
+
Tim Niemueller 8b145ba
 # some lib / exe specifics
Tim Niemueller 8b145ba
 ifneq "$(LIB_NAME)" ""
Tim Niemueller 8b145ba
 	OUTPUT_NAME = lib$(LIB_NAME).so
7f40aea
diff -up ./Platform/Linux/Build/XnFormats/Makefile.fedora ./Platform/Linux/Build/XnFormats/Makefile
7f40aea
--- ./Platform/Linux/Build/XnFormats/Makefile.fedora	2014-06-01 16:15:46.050315034 -0400
7f40aea
+++ ./Platform/Linux/Build/XnFormats/Makefile	2014-06-01 16:16:41.941505586 -0400
Tim Niemueller 8b145ba
@@ -1,10 +1,15 @@
Tim Niemueller 8b145ba
 SRC_FILES = \
Tim Niemueller 8b145ba
-			../../../../Source/XnFormats/*.cpp \
Tim Niemueller 8b145ba
-			../../../../Source/External/LibJPEG/*.c
7f40aea
+			../../../../Source/XnFormats/*.cpp 
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
 LIB_NAME = XnFormats
Tim Niemueller 8b145ba
 USED_LIBS = XnCore OpenNI
Tim Niemueller 8b145ba
 DEFINES = XN_FORMATS_EXPORTS
Tim Niemueller 8b145ba
-INC_DIRS = ../../../../Source/External/LibJPEG
Tim Niemueller 8b145ba
+
Tim Niemueller 8b145ba
+ifneq ($(wildcard /usr/include/jpeglib.h /usr/local/include/jpeglib.h),)
Tim Niemueller 8b145ba
+  USED_LIBS += jpeg
Tim Niemueller 8b145ba
+else
Tim Niemueller 8b145ba
+  INC_DIRS  += ../../../../Source/External/LibJPEG
Tim Niemueller 8b145ba
+  SRC_FILES += ../../../../Source/External/LibJPEG/*.c
Tim Niemueller 8b145ba
+endif
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
 include ../EngineLibMakefile
7f40aea
diff -up ./Platform/Linux/CreateRedist/install.sh.fedora ./Platform/Linux/CreateRedist/install.sh
7f40aea
--- ./Platform/Linux/CreateRedist/install.sh.fedora	2014-06-01 16:17:06.993486111 -0400
7f40aea
+++ ./Platform/Linux/CreateRedist/install.sh	2014-06-01 16:22:09.136315277 -0400
7f40aea
@@ -8,6 +8,8 @@ Installs PrimeSense Sensor Driver to cur
Tim Niemueller 8b145ba
 	Installs PrimeSense Sensor Driver (default mode)
Tim Niemueller 8b145ba
 -u,--uninstall
Tim Niemueller 8b145ba
 	Uninstalls PrimeSense Sensor Driver.
Tim Niemueller 8b145ba
+-n,--no-register
Tim Niemueller 8b145ba
+	Do not register with OpenNI
Tim Niemueller 8b145ba
 -c,--cross-compile-rootfs <path>
Tim Niemueller 8b145ba
 	Used for cross-compiling. Installs PrimeSense Sensor Driver to <path> instead of '/'.
Tim Niemueller 8b145ba
 -h,--help
7f40aea
@@ -34,6 +36,7 @@ LIB_FILES=`ls $SCRIPT_DIR/Lib/*`
Tim Niemueller 8b145ba
 BIN_FILES=`ls $SCRIPT_DIR/Bin/*`
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
 rootfs=
Tim Niemueller 8b145ba
+register=yes
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
 # parse command line
Tim Niemueller 8b145ba
 while [ "$1" ]; do
7f40aea
@@ -44,6 +47,9 @@ while [ "$1" ]; do
Tim Niemueller 8b145ba
 	-u|--uninstall)
Tim Niemueller 8b145ba
 		uninstall=yes
Tim Niemueller 8b145ba
 		;;
Tim Niemueller 8b145ba
+	-n|--no-register)
Tim Niemueller 8b145ba
+		register=no
Tim Niemueller 8b145ba
+		;;
Tim Niemueller 8b145ba
 	-c|--cross-staging-dir)
Tim Niemueller 8b145ba
 		shift
Tim Niemueller 8b145ba
 		rootfs=$1
7f40aea
@@ -70,11 +76,22 @@ if [ "$install" = yes ] && [ "$uninstall
Tim Niemueller 8b145ba
 	exit 1
Tim Niemueller 8b145ba
 fi
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
-INSTALL_LIB=$rootfs/usr/lib
Tim Niemueller 8b145ba
-INSTALL_BIN=$rootfs/usr/bin
Tim Niemueller 8b145ba
-INSTALL_ETC=$rootfs/usr/etc/primesense
Tim Niemueller 8b145ba
-INSTALL_RULES=$rootfs/etc/udev/rules.d
Tim Niemueller 8b145ba
-SERVER_LOGS_DIR=$rootfs/var/log/primesense/XnSensorServer
Tim Niemueller 8b145ba
+if [ -z "$INSTALL_LIB" ]; then
Tim Niemueller 8b145ba
+  INSTALL_LIB=$rootfs/usr/lib
Tim Niemueller 8b145ba
+fi
Tim Niemueller 8b145ba
+if [ -z "$INSTALL_BIN" ]; then
Tim Niemueller 8b145ba
+  INSTALL_BIN=$rootfs/usr/bin
Tim Niemueller 8b145ba
+fi
Tim Niemueller 8b145ba
+if [ -z "$INSTALL_ETC" ]; then
Tim Niemueller 8b145ba
+  INSTALL_ETC=$rootfs/usr/etc/primesense
Tim Niemueller 8b145ba
+fi
Tim Niemueller 8b145ba
+if [ -z "$INSTALL_RULES" ]; then
Tim Niemueller 8b145ba
+  INSTALL_RULES=$rootfs/etc/udev/rules.d
Tim Niemueller 8b145ba
+fi
Tim Niemueller 8b145ba
+if [ -z "$SERVER_LOGS_DIR" ]; then
Tim Niemueller 8b145ba
+  SERVER_LOGS_DIR=$rootfs/var/log/primesense
Tim Niemueller 8b145ba
+fi
Tim Niemueller 8b145ba
+
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
 # make all calls into OpenNI run in this filesystem
Tim Niemueller 8b145ba
 export OPEN_NI_INSTALL_PATH=$rootfs
7f40aea
@@ -92,6 +109,7 @@ if [ "$install" = yes ]; then
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
     # Copy shared libraries
Tim Niemueller 8b145ba
     printf "copying shared libraries..."
Tim Niemueller 8b145ba
+    mkdir -p $INSTALL_LIB
Tim Niemueller 8b145ba
     cp $LIB_FILES $INSTALL_LIB
Tim Niemueller 8b145ba
     printf "OK\n"
Tim Niemueller 8b145ba
 
7f40aea
@@ -101,21 +119,26 @@ if [ "$install" = yes ]; then
Tim Niemueller 8b145ba
     printf "OK\n"
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
     # register modules
Tim Niemueller 8b145ba
-    for module in $MODULES; do
Tim Niemueller 8b145ba
-        printf "registering module '$module' with OpenNI..."
Tim Niemueller 8b145ba
+    if [ "$register" == "yes" ]; then
Tim Niemueller 8b145ba
+        for module in $MODULES; do
Tim Niemueller 8b145ba
+            printf "registering module '$module' with OpenNI..."
7f40aea
 		$INSTALL_BIN/niReg -r $INSTALL_LIB/$module $INSTALL_ETC
7f40aea
-        printf "OK\n"
7f40aea
-    done
Tim Niemueller 8b145ba
+            printf "OK\n"
Tim Niemueller 8b145ba
+        done
Tim Niemueller 8b145ba
+    fi
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
     # copy config file
Tim Niemueller 8b145ba
     printf "copying server config file..."
Tim Niemueller 8b145ba
+    mkdir -p $INSTALL_ETC
Tim Niemueller 8b145ba
     cp Config/GlobalDefaults.ini $INSTALL_ETC
Tim Niemueller 8b145ba
     printf "OK\n"
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
     # make server run as root
Tim Niemueller 8b145ba
     printf "setting uid of server..."
Tim Niemueller 8b145ba
-    chown root $INSTALL_BIN/XnSensorServer
Tim Niemueller 8b145ba
-    chmod +s $INSTALL_BIN/XnSensorServer
Tim Niemueller 8b145ba
+    if [ "$register" == "yes" ]; then
Tim Niemueller 8b145ba
+        chown root $INSTALL_BIN/XnSensorServer
Tim Niemueller 8b145ba
+        chmod +s $INSTALL_BIN/XnSensorServer
Tim Niemueller 8b145ba
+    fi
Tim Niemueller 8b145ba
     printf "OK\n"
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
     # create server log dir
7f40aea
@@ -139,13 +162,15 @@ elif [ "$uninstall" = yes ]; then
Tim Niemueller 8b145ba
 	printf "Uninstalling PrimeSense Sensor\n"
Tim Niemueller 8b145ba
 	printf "******************************\n\n"
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
-    # unregister modules
Tim Niemueller 8b145ba
-    for module in $MODULES; do
Tim Niemueller 8b145ba
-    	printf "unregistering module '$module' from OpenNI..."
Tim Niemueller 8b145ba
-        if $INSTALL_BIN/niReg -u $INSTALL_LIB/$module; then
Tim Niemueller 8b145ba
-            printf "OK\n"
Tim Niemueller 8b145ba
-        fi
Tim Niemueller 8b145ba
-    done
Tim Niemueller 8b145ba
+    if [ "$register" == "yes" ]; then
Tim Niemueller 8b145ba
+        # unregister modules
Tim Niemueller 8b145ba
+        for module in $MODULES; do
7f40aea
+        	printf "unregistering module '$module' from OpenNI..."
Tim Niemueller 8b145ba
+            if $INSTALL_BIN/niReg -u $INSTALL_LIB/$module; then
Tim Niemueller 8b145ba
+                printf "OK\n"
Tim Niemueller 8b145ba
+            fi
Tim Niemueller 8b145ba
+        done
Tim Niemueller 8b145ba
+    fi
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
     # delete shared libraries
Tim Niemueller 8b145ba
     printf "removing shared libraries..."
7f40aea
diff -up ./Source/XnFormats/XnStreamCompression.h.fedora ./Source/XnFormats/XnStreamCompression.h
7f40aea
--- ./Source/XnFormats/XnStreamCompression.h.fedora	2014-06-01 16:22:24.271908053 -0400
7f40aea
+++ ./Source/XnFormats/XnStreamCompression.h	2014-06-01 16:22:38.607469258 -0400
7f40aea
@@ -26,7 +26,7 @@
Tim Niemueller 8b145ba
 //---------------------------------------------------------------------------
Tim Niemueller 8b145ba
 #include "XnFormats.h"
Tim Niemueller 8b145ba
 #include <XnOS.h>
Tim Niemueller 8b145ba
-#include <External/LibJPEG/jpeglib.h>
Tim Niemueller 8b145ba
+#include <jpeglib.h>
Tim Niemueller 8b145ba
 #include <setjmp.h>
Tim Niemueller 8b145ba
 
Tim Niemueller 8b145ba
 //---------------------------------------------------------------------------