Merge pull request #288 from blackberry/master

Rebase from master for patches.

gameplay-encoder/README.md

@@ -43,9 +43,9 @@ XCode project "gameplay-encoder.xcodeproj" on MacOSX.
 - Edit the project properties of target "gameplay-encoder".
 - Add Preprocessor Macro "USE_FBX" to both Debug/Release sections. (Build Settings)
 - Add the FBX include directory to Header Search Paths: (Build Settings)
-  * Example: /Applications/Autodesk/FBXSDK20132/include
+  * Example: "/Applications/Autodesk/FBX SDK/2013.2/include" (Use quotes due to additional space in path)
 - Add the FBX library and dependency Library/Frameworks: (Build Phases -> Link Binary with Libraries)
-  * Example: /Applications/Autodesk/FBXSDK20132/lib/gcc4/ub/libfbxsdk-2013.2-static.a  (Add Other)
+  * Example: /Applications/Autodesk/FBX SDK/2013.2/lib/gcc4/ub/libfbxsdk-2013.2-static.a  (Add Other)
   * Example: libiconv.dylib, Cocoa.framework, SystemConfiguration.framework
 - Build gameplay-encoder
 

gameplay-newproject.sh

@@ -151,7 +151,7 @@ while [ "${gpPathAbs#$common_path}" = "${gpPathAbs}" ]; do
 		back="../${back}"
 	fi
 done
-gpPath=${back}${gpPathAbs#$common_path/}
+gpPath=${back}/${gpPathAbs#$common_path/}
 if [[ ${gpPathAbs} == ${common_path} ]]; then
 	gpPath=${back}
 fi