Updated BlackBerry bar-descriptor.xml files.

Remove scoreloopcore to be included by default.
Fixed qcc compiler warning in Texture.cpp

gameplay/src/Texture.cpp

@@ -85,7 +85,7 @@ Texture* Texture::create(const char* path, bool generateMipmaps)
         GP_ASSERT(t);
         if (t->_path == path)
         {
-            // If 'generateMipmaps' is true, call Texture::generateMipamps() to force the 
+            // If 'generateMipmaps' is true, call Texture::generateMipamps() to force the
             // texture to generate its mipmap chain if it hasn't already done so.
             if (generateMipmaps)
             {
@@ -168,7 +168,7 @@ Texture* Texture::create(Format format, unsigned int width, unsigned int height,
     GL_ASSERT( glBindTexture(GL_TEXTURE_2D, textureId) );
     GL_ASSERT( glPixelStorei(GL_UNPACK_ALIGNMENT, 1) );
 #ifndef OPENGL_ES
-    // glGenerateMipmap is new in OpenGL 3.0. For OpenGL 2.0 we must fallback to use glTexParameteri 
+    // glGenerateMipmap is new in OpenGL 3.0. For OpenGL 2.0 we must fallback to use glTexParameteri
     // with GL_GENERATE_MIPMAP prior to actual texture creation (glTexImage2D)
     if ( generateMipmaps && glGenerateMipmap == NULL )
         GL_ASSERT( glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE) );
@@ -651,7 +651,7 @@ Texture* Texture::createCompressedDDS(const char* path)
             if (stream->read(level.data, 1, level.size) != (unsigned int)level.size)
             {
                 GP_ERROR("Failed to load dds compressed texture bytes for texture: %s", path);
-                
+
                 // Cleanup mip data.
                 for (unsigned int i = 0; i < header.dwMipMapCount; ++i)
                     SAFE_DELETE_ARRAY(level.data);
@@ -854,7 +854,7 @@ void Texture::generateMipmaps()
     {
         GL_ASSERT( glBindTexture(GL_TEXTURE_2D, _handle) );
         GL_ASSERT( glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST) );
-        if( glGenerateMipmap != NULL )
+        if (glGenerateMipmap)
             GL_ASSERT( glGenerateMipmap(GL_TEXTURE_2D) );
 
         _mipmapped = true;

samples/browser/.cproject

@@ -73,7 +73,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<option id="com.qnx.qcc.option.linker.objectFiles.782983295" name="Additional Object Files" superClass="com.qnx.qcc.option.linker.objectFiles"/>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
@@ -162,7 +161,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<option id="com.qnx.qcc.option.linker.objectFiles.661413139" name="Additional Object Files" superClass="com.qnx.qcc.option.linker.objectFiles"/>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
@@ -250,7 +248,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<option id="com.qnx.qcc.option.linker.objectFiles.901324184" name="Additional Object Files" superClass="com.qnx.qcc.option.linker.objectFiles"/>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">

samples/browser/bar-descriptor.xml

@@ -1,75 +1,76 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
-
-<!-- BlackBerry OS application descriptor file.
-    Specifies parameters for identifying, installing, and launching native applications on BlackBerry OS.
--->
-
-    <!-- A universally unique application identifier. Must be unique across all BlackBerry OS applications.
-         Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
-    <id>org.gameplay3d.sample_browser</id>
-
-    <!-- The name that is displayed in the BlackBerry OS application installer. 
-         May have multiple values for each language. See samples or xsd schema file. Optional. -->
-    <name>Samples</name>
-
-    <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
-         Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
-         An updated version of application must have a versionNumber value higher than the previous version. Required. -->
-    <versionNumber>2.0.0</versionNumber>
-
-    <!-- Fourth digit segment of the package version. First three segments are taken from the 
-         <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
-    <buildId>1</buildId>
-
-    <!-- Description, displayed in the BlackBerry OS application installer.
-         May have multiple values for each language. See samples or xsd schema file. Optional. -->
-    <description>Samples</description>
-
-    <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
-    <author>RIM Canada</author>
-
-    <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
-
-    <initialWindow>
-        <aspectRatio>landscape</aspectRatio>
-        <autoOrients>false</autoOrients>
-        <systemChrome>none</systemChrome>
-        <transparent>false</transparent>
-    </initialWindow>
-
-    <category>core.games</category>
-
-    <asset path="icon.png">icon.png</asset>
-	<asset path="game.config">game.config</asset>
-    <asset path="../../gameplay/res/shaders">res/shaders</asset>
-    <asset path="../../gameplay/res/ui">res/ui</asset>
-	<asset path="res/common">res/common</asset>
-	<asset path="res/png">res/png</asset>
-
-    <configuration name="Device-Debug">
-       <platformArchitecture>armle-v7</platformArchitecture>
-       <asset path="Device-Debug/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
-    </configuration>
-    <configuration name="Device-Release">
-       <platformArchitecture>armle-v7</platformArchitecture>
-       <asset path="Device-Release/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
-    </configuration>
-    <configuration name="Simulator">
-        <platformArchitecture>x86</platformArchitecture>
-       <asset path="Simulator/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
-    </configuration>
-
-    <!-- The icon for the application, which should be 114x114. -->
-    <icon>
-        <image>icon.png</image>
-    </icon>
-
-    <!-- The splash screen that will appear when your application is launching, which should be 1280x720. -->
-    <!-- <splashscreen></splashscreen> -->
-
-    <!-- Ensure that shared libraries in the package are found at run-time. -->
-    <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
-
-</qnx>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
+
+<!-- BlackBerry OS application descriptor file.
+    Specifies parameters for identifying, installing, and launching native applications on BlackBerry OS.
+-->
+
+    <!-- A universally unique application identifier. Must be unique across all BlackBerry OS applications.
+         Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
+    <id>org.gameplay3d.sample_browser</id>
+
+    <!-- The name that is displayed in the BlackBerry OS application installer. 
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <name>Samples</name>
+
+    <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
+         Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
+         An updated version of application must have a versionNumber value higher than the previous version. Required. -->
+    <versionNumber>2.0.0</versionNumber>
+
+    <!-- Fourth digit segment of the package version. First three segments are taken from the 
+         <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
+    <buildId>1</buildId>
+
+    <!-- Description, displayed in the BlackBerry OS application installer.
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <description>Samples</description>
+
+    <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
+    <author>RIM Canada</author>
+
+    <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
+
+    <initialWindow>
+        <aspectRatio>landscape</aspectRatio>
+        <autoOrients>false</autoOrients>
+        <systemChrome>none</systemChrome>
+        <transparent>false</transparent>
+    </initialWindow>
+
+    <category>core.games</category>
+
+    <asset path="icon.png">icon.png</asset>
+	<asset path="game.config">game.config</asset>
+	<asset path="res/common">res/common</asset>
+	<asset path="res/png">res/png</asset>
+    <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
+    <asset path="../../gameplay/res/shaders">res/shaders</asset>
+    <asset path="../../gameplay/res/ui">res/ui</asset>
+    
+    <configuration name="Device-Debug">
+       <platformArchitecture>armle-v7</platformArchitecture>
+       <asset path="Device-Debug/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
+    </configuration>
+    <configuration name="Device-Release">
+       <platformArchitecture>armle-v7</platformArchitecture>
+       <asset path="Device-Release/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
+    </configuration>
+    <configuration name="Simulator">
+        <platformArchitecture>x86</platformArchitecture>
+       <asset path="Simulator/sample-browser" entry="true" type="Qnx/Elf">sample-browser</asset>
+    </configuration>
+
+    <!-- The icon for the application, which should be 114x114. -->
+    <icon>
+        <image>icon.png</image>
+    </icon>
+
+    <!-- The splash screen that will appear when your application is launching, which should be 1280x720. -->
+    <!-- <splashscreen></splashscreen> -->
+
+    <!-- Ensure that shared libraries in the package are found at run-time. -->
+    <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
+
+</qnx>

samples/character/.cproject

@@ -74,7 +74,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.2129662816" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -163,7 +162,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.176990175" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -251,7 +249,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.994108925" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/character/bar-descriptor.xml

@@ -1,119 +1,118 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
-
-<!-- BlackBerry OS application descriptor file.
-    Specifies parameters for identifying, installing, and launching native applications on BlackBerry OS.
--->
-
-    <!-- A universally unique application identifier. Must be unique across all BlackBerry OS applications.
-         Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
-    <id>org.gameplay3d.sample_character</id>
-
-    <!-- The name that is displayed in the BlackBerry OS application installer. 
-         May have multiple values for each language. See samples or xsd schema file. Optional. -->
-    <name>Character</name>
-    
-    <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
-         Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
-         An updated version of application must have a versionNumber value higher than the previous version. Required. -->
-    <versionNumber>2.0.0</versionNumber>
-
-    <!-- Fourth digit segment of the package version. First three segments are taken from the 
-         <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
-    <buildId>1</buildId>
-
-    <!-- Description, displayed in the BlackBerry OS application installer.
-         May have multiple values for each language. See samples or xsd schema file. Optional. -->
-    <description>Character</description>
-
-    <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
-    <author>RIM Canada</author>
-
-    <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
-
-    <initialWindow>
-        <aspectRatio>landscape</aspectRatio>
-        <autoOrients>false</autoOrients>
-        <systemChrome>none</systemChrome>
-        <transparent>false</transparent>
-    </initialWindow>
-
-    <category>core.games</category>
-    
-    <asset path="icon.png">icon.png</asset>
-    <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
-    <asset path="../../gameplay/res/shaders">res/shaders</asset>
-    <asset path="../../gameplay/res/ui">res/ui</asset>
-    <asset path="res/common">res/common</asset>
-
-    <asset path="res/design/backboard.png">res/png/backboard.png</asset>
-    <asset path="res/design/basketball.png">res/png/basketball.png</asset>
-    <asset path="res/design/basketballnet.png">res/png/basketballnet.png</asset>
-    <asset path="res/design/book.png">res/png/book.png</asset>
-    <asset path="res/design/bookshelf.png">res/png/bookshelf.png</asset>
-    <asset path="res/design/boy.png">res/png/boy.png</asset>
-    <asset path="res/design/decals.png">res/png/decals.png</asset>
-    <asset path="res/design/door.png">res/png/door.png</asset>
-    <asset path="res/design/doorframe.png">res/png/doorframe.png</asset>
-    <asset path="res/design/easel.png">res/png/easel.png</asset>
-    <asset path="res/design/floor.png">res/png/floor.png</asset>
-    <asset path="res/design/floortiles.png">res/png/floortiles.png</asset>
-    <asset path="res/design/gamepad.png">res/png/gamepad.png</asset>
-    <asset path="res/design/playtable.png">res/png/playtable.png</asset>
-    <asset path="res/design/shadow.png">res/png/shadow.png</asset>
-    <asset path="res/design/storageorganizer.png">res/png/storageorganizer.png</asset>
-    <asset path="res/design/tableleg1.png">res/png/tableleg1.png</asset>
-    <asset path="res/design/tableleg2.png">res/png/tableleg2.png</asset>
-    <asset path="res/design/tableleg3.png">res/png/tableleg3.png</asset>
-    <asset path="res/design/tableleg4.png">res/png/tableleg4.png</asset>
-    <asset path="res/design/tabletop.png">res/png/tabletop.png</asset>
-    <asset path="res/design/tiles.png">res/png/tiles.png</asset>
-    <asset path="res/design/tilesn.png">res/png/tilesn.png</asset>
-    <asset path="res/design/toybox.png">res/png/toybox.png</asset>
-    <asset path="res/design/walleast.png">res/png/walleast.png</asset>
-    <asset path="res/design/wallnorth.png">res/png/wallnorth.png</asset>
-    <asset path="res/design/walloverhang.png">res/png/walloverhang.png</asset>
-    <asset path="res/design/wallsouth.png">res/png/wallsouth.png</asset>
-    <asset path="res/design/wallwest.png">res/png/wallwest.png</asset>
-    <asset path="res/design/windowledge.png">res/png/windowledge.png</asset>
-    <asset path="res/design/wood.png">res/png/wood.png</asset>
-    <asset path="res/design/woodn.png">res/png/woodn.png</asset>
-    <asset path="game.png.config">game.config</asset>
-   
-    <configuration name="Device-Debug">
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
+
+<!-- BlackBerry OS application descriptor file.
+    Specifies parameters for identifying, installing, and launching native applications on BlackBerry OS.
+-->
+
+    <!-- A universally unique application identifier. Must be unique across all BlackBerry OS applications.
+         Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
+    <id>org.gameplay3d.sample_character</id>
+
+    <!-- The name that is displayed in the BlackBerry OS application installer. 
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <name>Character</name>
+    
+    <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
+         Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
+         An updated version of application must have a versionNumber value higher than the previous version. Required. -->
+    <versionNumber>2.0.0</versionNumber>
+
+    <!-- Fourth digit segment of the package version. First three segments are taken from the 
+         <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
+    <buildId>1</buildId>
+
+    <!-- Description, displayed in the BlackBerry OS application installer.
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <description>Character</description>
+
+    <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
+    <author>RIM Canada</author>
+
+    <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
+
+    <initialWindow>
+        <aspectRatio>landscape</aspectRatio>
+        <autoOrients>false</autoOrients>
+        <systemChrome>none</systemChrome>
+        <transparent>false</transparent>
+    </initialWindow>
+
+    <category>core.games</category>
+    
+    <asset path="icon.png">icon.png</asset>
+    <asset path="res/common">res/common</asset>
+    <asset path="res/design/backboard.png">res/png/backboard.png</asset>
+    <asset path="res/design/basketball.png">res/png/basketball.png</asset>
+    <asset path="res/design/basketballnet.png">res/png/basketballnet.png</asset>
+    <asset path="res/design/book.png">res/png/book.png</asset>
+    <asset path="res/design/bookshelf.png">res/png/bookshelf.png</asset>
+    <asset path="res/design/boy.png">res/png/boy.png</asset>
+    <asset path="res/design/decals.png">res/png/decals.png</asset>
+    <asset path="res/design/door.png">res/png/door.png</asset>
+    <asset path="res/design/doorframe.png">res/png/doorframe.png</asset>
+    <asset path="res/design/easel.png">res/png/easel.png</asset>
+    <asset path="res/design/floor.png">res/png/floor.png</asset>
+    <asset path="res/design/floortiles.png">res/png/floortiles.png</asset>
+    <asset path="res/design/gamepad.png">res/png/gamepad.png</asset>
+    <asset path="res/design/playtable.png">res/png/playtable.png</asset>
+    <asset path="res/design/shadow.png">res/png/shadow.png</asset>
+    <asset path="res/design/storageorganizer.png">res/png/storageorganizer.png</asset>
+    <asset path="res/design/tableleg1.png">res/png/tableleg1.png</asset>
+    <asset path="res/design/tableleg2.png">res/png/tableleg2.png</asset>
+    <asset path="res/design/tableleg3.png">res/png/tableleg3.png</asset>
+    <asset path="res/design/tableleg4.png">res/png/tableleg4.png</asset>
+    <asset path="res/design/tabletop.png">res/png/tabletop.png</asset>
+    <asset path="res/design/tiles.png">res/png/tiles.png</asset>
+    <asset path="res/design/tilesn.png">res/png/tilesn.png</asset>
+    <asset path="res/design/toybox.png">res/png/toybox.png</asset>
+    <asset path="res/design/walleast.png">res/png/walleast.png</asset>
+    <asset path="res/design/wallnorth.png">res/png/wallnorth.png</asset>
+    <asset path="res/design/walloverhang.png">res/png/walloverhang.png</asset>
+    <asset path="res/design/wallsouth.png">res/png/wallsouth.png</asset>
+    <asset path="res/design/wallwest.png">res/png/wallwest.png</asset>
+    <asset path="res/design/windowledge.png">res/png/windowledge.png</asset>
+    <asset path="res/design/wood.png">res/png/wood.png</asset>
+    <asset path="res/design/woodn.png">res/png/woodn.png</asset>
+    <asset path="game.png.config">game.config</asset>
+    <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
+    <asset path="../../gameplay/res/shaders">res/shaders</asset>
+    <asset path="../../gameplay/res/ui">res/ui</asset>
+    
+    <configuration name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>
-       <asset path="Device-Debug/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
+       <asset path="Device-Debug/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
     </configuration>
-    <configuration name="Device-Release">
+    <configuration name="Device-Release">
        <platformArchitecture>armle-v7</platformArchitecture>
-       <asset path="Device-Release/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
+       <asset path="Device-Release/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
     </configuration>
-    <configuration name="Simulator">
+    <configuration name="Simulator">
        <platformArchitecture>x86</platformArchitecture>
-       <asset path="Simulator/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
+       <asset path="Simulator/sample-character" entry="true" type="Qnx/Elf">sample-character</asset>
     </configuration>
-  
-    <!-- The icon for the application, which should be 114x114. -->
-    <icon>
-        <image>icon.png</image>
-    </icon>
-    
-    <!-- The splash screen that will appear when your application is launching. Should be 1280x720. -->
-    <!-- <splashscreen></splashscreen> -->
-    
-    <!-- The permissions requested by your application. -->
-    <!--  <action>access_shared</action> -->
-    <!--  <action>record_audio</action> -->
-    <!--  <action>read_geolocation</action> -->
-    <!--  <action>use_camera</action> -->
-    <!--  <action>access_internet</action> -->
-    <!--  <action>play_audio</action> -->
-    <!--  <action>post_notification</action> -->
-    <!--  <action>set_audio_volume</action> -->
-    <!--  <action>read_device_identifying_information</action> -->
-    
-    <!-- Ensure that shared libraries in the package are found at run-time. -->
-    <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
-
-</qnx>
+  
+    <!-- The icon for the application, which should be 114x114. -->
+    <icon>
+        <image>icon.png</image>
+    </icon>
+    
+    <!-- The splash screen that will appear when your application is launching. Should be 1280x720. -->
+    <!-- <splashscreen></splashscreen> -->
+    
+    <!-- The permissions requested by your application. -->
+    <!--  <action>access_shared</action> -->
+    <!--  <action>record_audio</action> -->
+    <!--  <action>read_geolocation</action> -->
+    <!--  <action>use_camera</action> -->
+    <!--  <action>access_internet</action> -->
+    <!--  <action>play_audio</action> -->
+    <!--  <action>post_notification</action> -->
+    <!--  <action>set_audio_volume</action> -->
+    <!--  <action>read_device_identifying_information</action> -->
+    
+    <!-- Ensure that shared libraries in the package are found at run-time. -->
+    <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
+
+</qnx>

samples/lua/.cproject

@@ -74,7 +74,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -161,7 +160,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -249,7 +247,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/lua/bar-descriptor.xml

@@ -30,7 +30,7 @@
     <author>RIM Canada</author>
 
     <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
 
     <initialWindow>
         <aspectRatio>landscape</aspectRatio>
@@ -43,15 +43,15 @@
 
     <asset path="icon.png">icon.png</asset>
     <asset path="game.config">game.config</asset>
-   	<asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
-    <asset path="../../gameplay/res/shaders">res/shaders</asset>
-    <asset path="../../gameplay/res/ui">res/ui</asset>
     <asset path="res/ai.lua">res/ai.lua</asset>
     <asset path="res/game.lua">res/game.lua</asset>
     <asset path="res/lua.gpb">res/lua.gpb</asset>
     <asset path="res/lua.material">res/lua.material</asset>
     <asset path="res/lua.scene">res/lua.scene</asset>
     <asset path="res/lua-logo.png">res/lua-logo.png</asset>
+    <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
+    <asset path="../../gameplay/res/shaders">res/shaders</asset>
+    <asset path="../../gameplay/res/ui">res/ui</asset>
 
     <configuration name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>

samples/mesh/.cproject

@@ -74,7 +74,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -163,7 +162,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -253,7 +251,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/mesh/bar-descriptor.xml

@@ -30,7 +30,7 @@
     <author>RIM Canada</author>
 
     <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
 
     <initialWindow>
         <aspectRatio>landscape</aspectRatio>
@@ -46,10 +46,10 @@
     <asset path="res/mesh.scene">res/mesh.scene</asset>
     <asset path="res/mesh.gpb">res/mesh.gpb</asset>
     <asset path="res/mesh.material">res/mesh.material</asset>
+    <asset path="game.config">game.config</asset>
     <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
     <asset path="../../gameplay/res/shaders">res/shaders</asset>
     <asset path="../../gameplay/res/ui">res/ui</asset>
-    <asset path="game.config">game.config</asset>
     
     <configuration name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>

samples/particles/.cproject

@@ -74,7 +74,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -151,7 +150,7 @@
 									<listOptionValue builtIn="false" value="EGL"/>
 									<listOptionValue builtIn="false" value="screen"/>
 									<listOptionValue builtIn="false" value="m"/>
-									<listOptionValue builtIn="false" value="png16"/>
+									<listOptionValue builtIn="false" value="png"/>
 									<listOptionValue builtIn="false" value="pps"/>
 									<listOptionValue builtIn="false" value="bps"/>
 									<listOptionValue builtIn="false" value="gestures"/>
@@ -161,7 +160,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -239,7 +237,7 @@
 									<listOptionValue builtIn="false" value="EGL"/>
 									<listOptionValue builtIn="false" value="screen"/>
 									<listOptionValue builtIn="false" value="m"/>
-									<listOptionValue builtIn="false" value="png16"/>
+									<listOptionValue builtIn="false" value="png"/>
 									<listOptionValue builtIn="false" value="pps"/>
 									<listOptionValue builtIn="false" value="bps"/>
 									<listOptionValue builtIn="false" value="gestures"/>
@@ -249,7 +247,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/particles/bar-descriptor.xml

@@ -30,7 +30,7 @@
     <author>RIM Canada</author>
 
     <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
 
     <initialWindow>
         <aspectRatio>landscape</aspectRatio>

samples/racer/.cproject

@@ -74,7 +74,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -161,7 +160,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -249,7 +247,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/racer/bar-descriptor.xml

@@ -30,7 +30,7 @@
     <author>RIM Canada</author>
 
     <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
-    <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
 
     <initialWindow>
         <aspectRatio>landscape</aspectRatio>
@@ -42,11 +42,11 @@
     <category>core.games</category>
 
     <asset path="icon.png">icon.png</asset>
+    <asset path="res/common">res/common</asset>
     <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
     <asset path="../../gameplay/res/shaders">res/shaders</asset>
     <asset path="../../gameplay/res/ui">res/ui</asset>
-    <asset path="res/common">res/common</asset>
-        
+    
     <configuration name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>
        <asset path="Device-Debug/sample-racer" entry="true" type="Qnx/Elf">sample-racer</asset>

samples/spaceship/.cproject

@@ -73,7 +73,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1645280653" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -161,7 +160,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.534133606" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -250,7 +248,6 @@
 									<listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-									<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1805822171" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

samples/spaceship/bar-descriptor.xml

@@ -1,44 +1,90 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<qnx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.qnx.com/schemas/application/1.0">
-  <id>org.gameplay3d.sample_spaceship</id>
-  <name>Spaceship</name>
-  <versionNumber>2.0.0</versionNumber>
-  <buildId>1</buildId>
-  <description>Spaceship</description>
-  <author>RIM Canada</author>
-  <category>core.games</category>
-  <initialWindow>
-    <autoOrients>false</autoOrients>
-    <aspectRatio>landscape</aspectRatio>
-    <systemChrome>none</systemChrome>
-    <transparent>false</transparent>
-  </initialWindow>
-  <asset path="icon.png">icon.png</asset>
-  <asset path="res/airstrip.gpb">res/airstrip.gpb</asset>
-  <asset path="res/spaceship.gpb">res/spaceship.gpb</asset>
-  <asset path="res/spaceship.wav">res/spaceship.wav</asset>
-  <asset path="res//background.ogg">res/background.ogg</asset>
-  <asset path="res/background.png">res/background.png</asset>
-  <asset path="res/propulsion_glow.png">res/propulsion_glow.png</asset>
-  <asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
-  <asset path="../../gameplay/res/shaders">res/shaders</asset>
-  <asset path="../../gameplay/res/ui">res/ui</asset>
-  <asset path="game.config">game.config</asset>
-  <configuration name="Device-Debug">
-    <platformArchitecture>armle-v7</platformArchitecture>
-    <asset path="Device-Debug/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
-  </configuration>
-  <configuration name="Device-Release">
-    <platformArchitecture>armle-v7</platformArchitecture>
-    <asset path="Device-Release/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
-  </configuration>
-  <configuration name="Simulator">
-    <platformArchitecture>x86</platformArchitecture>
-    <asset path="Simulator/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
-  </configuration>
-  <permission>read_device_identifying_information</permission>
-  <icon>
-    <image>icon.png</image>
-  </icon>
-  <env var="LD_LIBRARY_PATH" value="app/native/lib" />
+<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
+
+<!-- BlackBerry OS application descriptor file.
+    Specifies parameters for identifying, installing, and launching native applications on BlackBerry OS.
+-->
+
+    <!-- A universally unique application identifier. Must be unique across all BlackBerry OS applications.
+         Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
+    <id>org.gameplay3d.sample_spaceship</id>
+
+    <!-- The name that is displayed in the BlackBerry OS application installer. 
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <name>Spaceship</name>
+
+    <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
+         Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
+         An updated version of application must have a versionNumber value higher than the previous version. Required. -->
+    <versionNumber>2.0.0</versionNumber>
+
+    <!-- Fourth digit segment of the package version. First three segments are taken from the 
+         <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
+    <buildId>1</buildId>
+
+    <!-- Description, displayed in the BlackBerry OS application installer.
+         May have multiple values for each language. See samples or xsd schema file. Optional. -->
+    <description>Spaceship</description>
+
+    <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
+    <author>RIM Canada</author>
+
+    <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
+    <!-- <authorId>gYAAgLDcDLxX077jVWRVnDpywiU</authorId> -->
+
+    <initialWindow>
+        <aspectRatio>landscape</aspectRatio>
+        <autoOrients>false</autoOrients>
+        <systemChrome>none</systemChrome>
+        <transparent>false</transparent>
+    </initialWindow>
+
+    <category>core.games</category>
+  
+	<asset path="icon.png">icon.png</asset>
+	<asset path="res/airstrip.gpb">res/airstrip.gpb</asset>  
+	<asset path="res/spaceship.gpb">res/spaceship.gpb</asset>
+	<asset path="res/spaceship.wav">res/spaceship.wav</asset>
+	<asset path="res//background.ogg">res/background.ogg</asset>
+	<asset path="res/background.png">res/background.png</asset>
+	<asset path="res/propulsion_glow.png">res/propulsion_glow.png</asset>
+	<asset path="game.config">game.config</asset>
+	<asset path="../../gameplay/res/logo_powered_white.png">res/logo_powered_white.png</asset>
+	<asset path="../../gameplay/res/shaders">res/shaders</asset>
+	<asset path="../../gameplay/res/ui">res/ui</asset>
+	  
+	<configuration name="Device-Debug">
+	  <platformArchitecture>armle-v7</platformArchitecture>
+	  <asset path="Device-Debug/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
+	</configuration>
+	<configuration name="Device-Release">
+	  <platformArchitecture>armle-v7</platformArchitecture>
+	  <asset path="Device-Release/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
+	</configuration>
+	<configuration name="Simulator">
+	  <platformArchitecture>x86</platformArchitecture>
+	  <asset path="Simulator/sample-spaceship" entry="true" type="Qnx/Elf">sample-spaceship</asset>
+	</configuration>
+
+    <!-- The icon for the application, which should be 114x114. -->
+    <icon>
+        <image>icon.png</image>
+    </icon>
+
+    <!-- The splash screen that will appear when your application is launching. Should be 1280x720. -->
+    <!-- <splashscreen></splashscreen> -->
+
+    <!-- The permissions requested by your application. -->
+    <!--  <action>access_shared</action> -->
+    <!--  <action>record_audio</action> -->
+    <!--  <action>read_geolocation</action> -->
+    <!--  <action>use_camera</action> -->
+    <!--  <action>access_internet</action> -->
+    <!--  <action>play_audio</action> -->
+    <!--  <action>post_notification</action> -->
+    <!--  <action>set_audio_volume</action> -->
+    <!--  <action>read_device_identifying_information</action> -->
+
+    <!-- Ensure that shared libraries in the package are found at run-time. -->
+    <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
 </qnx>

template/template.cproject

@@ -76,7 +76,6 @@
                                     <listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-								    <listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.149610709" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -164,7 +163,6 @@
                                     <listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-          							<listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1335515313" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@ -253,7 +251,6 @@
                                     <listOptionValue builtIn="false" value="lua"/>
 									<listOptionValue builtIn="false" value="bullet"/>
 									<listOptionValue builtIn="false" value="vorbis"/>
-								    <listOptionValue builtIn="false" value="scoreloopcore"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.linker.1669353763" superClass="com.qnx.qcc.inputType.linker">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>