diff --git a/SDL/blackberry_build.sh b/SDL/blackberry_build.sh
index f89ab23d3c..bc6516b05f 100755
--- a/SDL/blackberry_build.sh
+++ b/SDL/blackberry_build.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
 
-BUILD_TYPE=Release
-
-if [ -f ${QNX_TARGET}/usr/include/bps/vibration.h ]; then
-    BB_OS=10.0
-elif [ -f ${QNX_TARGET}/usr/include/bps/virtualkeyboard.h ]; then
-    BB_OS=2.1
-else
+BB_OS=`cat ${QNX_TARGET}/etc/qversion 2>/dev/null`
+if [ -z "$BB_OS" ]; then
     echo "Could not find your Blackberry NDK. Please source bbndk-env.sh"
     exit 1
 fi
@@ -19,40 +14,6 @@ fi
 if [ -z "$PROJECT_ROOT" ]; then
 	PROJECT_ROOT=${PPSSPP_ROOT}/..
 fi
-PKG_CONFIG_PATH=${PROJECT_ROOT}/install/lib/pkgconfig
-PKG_CONFIG_LIBDIR=${PROJECT_ROOT}/install/lib/pkgconfig
-
-SDL_PROJECT=${PROJECT_ROOT}/SDL
-
-while true; do
-	case "$1" in
-	-h | --help ) 
-		echo "Build script for BlackBerry PlayBook"
-		echo "For normal usage, please use the NDK to build."
-		echo
-		echo "Options: "
-		echo "  -d, --debug             Create a debug build. (default is release)"
-		echo "  -h, --help              Show this help message."
-		echo "  -r, --root PATH         Specify the root directory of PPSSPP. (default is PWD parent)"
-		echo "  -p, --project-root PATH Specify the root directory containing all projects. (default is root dirs parent)"
-		echo "                          If specific projects are in different directories, you can specify them below."
-		echo "  --pkg-config PATH       Specify the pkgconfig directory. (default is PPSSPP_ROOT/../install/lib/pkgconfig)"
-		echo
-		echo "Dependency Paths (defaults are under project root): "
-		echo "  --sdl PATH                   SDL 1.2 project directory (default is SDL)"
-		echo "  --tco PATH                   TouchControlOverlay project directory (default is TouchControlOverlay)"
-		exit 0
-		;;
-	-d | --debug ) BUILD_TYPE=Debug; shift ;;
-	-r | --root ) PPSSPP_ROOT="$2"; shift 2 ;;
-	-p | --project-root ) PROJECT_ROOT="$2"; shift 2 ;;
-	--pkg-config ) PKG_CONFIG_PATH="$2"; PKG_CONFIG_LIBDIR="$2"; shift 2 ;;
-	--sdl ) SDL_PROJECT="$2"; shift 2 ;;
-	--tco ) TCO_PROJECT="$2"; shift 2 ;;
-	-- ) shift; break ;;
-	* ) break ;;
-  esac
-done
 
 if [ -z "$SDL_PROJECT" ]; then
 	SDL_PROJECT="$PROJECT_ROOT/SDL"
@@ -61,23 +22,35 @@ if [ -z "$TCO_PROJECT" ]; then
 	TCO_PROJECT="$PROJECT_ROOT/TouchControlOverlay"
 fi
 
-export PKG_CONFIG_PATH
-export PKG_CONFIG_LIBDIR
-
-echo "Build type: ${BUILD_TYPE}"
+while true; do
+	case "$1" in
+	-h | --help ) 
+		echo "Build script for BlackBerry PlayBook"
+		echo
+		echo "Options: "
+		echo "  -h, --help              Show this help message."
+		echo "  -r, --root PATH         Specify the root directory of PPSSPP. (default is PWD parent)"
+		echo "  -p, --project-root PATH Specify the root directory containing all projects. (default is roots parent)"
+		echo "Dependency Paths (defaults are under project root): "
+		echo "  --sdl PATH                   SDL 1.2 project directory (default is SDL)"
+		echo "  --tco PATH                   TouchControlOverlay project directory (default is TouchControlOverlay)"
+		exit 0
+		;;
+	-r | --root ) PPSSPP_ROOT="$2"; shift 2 ;;
+	-p | --project-root ) PROJECT_ROOT="$2"; shift 2 ;;
+	--sdl ) SDL_PROJECT="$2"; shift 2 ;;
+	--tco ) TCO_PROJECT="$2"; shift 2 ;;
+	-- ) shift; break ;;
+	* ) break ;;
+  esac
+done
 
 cmake \
--DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
--DCMAKE_SYSTEM_NAME=QNX \
 -DCMAKE_C_COMPILER="${QNX_HOST}/usr/bin/ntoarmv7-gcc" \
 -DCMAKE_CXX_COMPILER="${QNX_HOST}/usr/bin/ntoarmv7-g++" \
 -DSDL_INCLUDE_DIR="${SDL_PROJECT}/include" \
--DSDL_LIBRARY="${SDL_PROJECT}/Device-${BUILD_TYPE}/libSDL12.so;${TCO_PROJECT}/Device-${BUILD_TYPE}/libTouchControlOverlay.so" \
--DSDL_FOUND=ON \
--DPNG_LIBRARY="${QNX_TARGET}/armle-v7/usr/lib/libpng.so" \
--DPNG_PNG_INCLUDE_DIR="${QNX_TARGET}/usr/include" \
+-DSDL_LIBRARY="${SDL_PROJECT}/Device-Release/libSDL12.so;${TCO_PROJECT}/Device-Release/libTouchControlOverlay.so" \
 -DBLACKBERRY=${BB_OS} \
--DARM=7 \
-${PWD}
+..
 
 make -j4