Made Frogatto and Cube Trains compile for the PlayBook.

frogatto · Sep 2, 2012 · 55f3988 · 55f3988
1 parent ffdde1b
commit 55f3988
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 32 deletions.
diff --git a/modules/cube_trains/data/level/downstairs-reversed.cfg b/modules/cube_trains/data/level/downstairs-reversed.cfg
diff --git a/modules/cube_trains/module.cfg b/modules/cube_trains/module.cfg
@@ -2,6 +2,5 @@
 id: "cube_trains",
 name: "Cube Trains",
 min_engine_version: 1.2,
-arguments: ["--width", "1000", "--height", "775", "--bigscreen", "--proportional-resize", "--no-iphone-controls", "--no-autopause"]
-//arguments: []
+arguments: [/*"--width", "1000", "--height", "775",*/ "--bigscreen", "--proportional-resize", "--no-iphone-controls", "--no-autopause"]
 }
diff --git a/...es/cube_trains/PlayBook Release Steps.txt → ...e_trains/utils/PlayBook Release Steps.txt b/...es/cube_trains/PlayBook Release Steps.txt → ...e_trains/utils/PlayBook Release Steps.txt
@@ -234,6 +234,7 @@ Set up frogatto. Follow this chat log:
 
 Configuration for to release Cube Trains:
 Testing:
+ -- Make sure the compiled mode flag in prefrences.cpp is toggled appropriately. -- 
 ① Move the (slightly renamed) bar-descriptor file, and the master-config.cfg file, from the modules/cube_trains directory. (Replace the existing bar-descriptor.)
 ② Run "make assets", which will now compile Cube Trains data and images.
 ③ Checksum the .cfgs for release, so stats are reported.
@@ -246,3 +247,4 @@ Testing:
 ⑩ Repeat step two, but set the configuration to Device-Release.
 ⑪ Change the build target of your projects to Device-Release from Device-Debug from the right-click menu.
 ⑫ Recompile everything in order, and upload the project to the PlayBook.
+ -- Make sure you've put back the bar-descriptor AND the master-config files. -- 
diff --git a/modules/cube_trains/master-config.cfg → modules/cube_trains/utils/master-config.cfg b/modules/cube_trains/master-config.cfg → modules/cube_trains/utils/master-config.cfg
diff --git a/modules/cube_trains/xbar-descriptor.xml → ...les/cube_trains/utils/xbar-descriptor.xml b/modules/cube_trains/xbar-descriptor.xml → ...les/cube_trains/utils/xbar-descriptor.xml
@@ -62,20 +62,15 @@
 
     <!--  The category where the application appears. Either core.games or core.media. -->
     <category>core.games</category>
-    <asset path="locale">locale</asset>
     <asset path="data">data</asset>
     <asset path="images">images</asset>
-    <asset path="music">music</asset>
-    <asset path="sounds">sounds</asset>
     <asset path="DejaVuSans.ttf">DejaVuSans.ttf</asset>
     <asset path="FreeMono.ttf">FreeMono.ttf</asset>
-    <asset path="images/os/blackberry/bbsplash.jpg">bbsplash.jpg</asset>
-    <asset path="images/os/blackberry/bbicon.png">bbicon.png</asset>
-    <asset path="master-config.cfg">master-config.cfg</asset>
    <asset path="modules/cube_trains/data">modules/cube_trains/data</asset>
    <asset path="modules/cube_trains/images">modules/cube_trains/images</asset>
    <asset path="modules/cube_trains/module.cfg">modules/cube_trains/module.cfg</asset>
    <asset path="modules/cube_trains/images/window-icon.png">window-icon.png</asset>
+   <asset path="modules/cube_trains/master-config.cfg">master-config.cfg</asset>
     <configuration id="com.qnx.qcc.configuration.exe.debug.925317493" name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>
        <asset path="Device-Debug/frogatto" entry="true" type="Qnx/Elf">frogatto</asset>

diff --git a/src/preferences.cpp b/src/preferences.cpp
@@ -239,7 +239,7 @@ namespace preferences {
 		int virtual_screen_height_ = 600;
 		int actual_screen_width_ = 1024;
 		int actual_screen_height_ = 600;
-		bool load_compiled_ = true;
+		bool load_compiled_ = false;
 		bool use_fbo_ = true;
 		bool use_bequ_ = true;
 		bool use_16bpp_textures_ = false;