Skip to content
Browse files

Fixed up build configurations for release and simulator.

Also changed to use NDK bps library.
  • Loading branch information...
1 parent a860475 commit 819f23496838571a0f4039feeda5ec23a0e7d5e2 Artem Simonov committed with jnicholl Oct 25, 2011
Showing with 951 additions and 904 deletions.
  1. +860 −822 .cproject
  2. +81 −78 .project
  3. +10 −4 blackberry-tablet.xml
View
1,682 .cproject
860 additions, 822 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
159 .project
@@ -1,78 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>openttd</name>
- <comment></comment>
- <projects>
- <project>timidity</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>?name?</key>
- <value></value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.append_environment</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildArguments</key>
- <value></value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildCommand</key>
- <value>make</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/openttd/Device-Release}</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.contents</key>
- <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
- <value>false</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableFullBuild</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.stopOnError</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.cdt.core.cnature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
- <nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
- <nature>org.eclipse.cdt.core.ccnature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>openttd</name>
+ <comment></comment>
+ <projects>
+ <project>lzma</project>
+ <project>SDL12</project>
+ <project>timidity</project>
+ <project>TouchControlOverlay</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+ <triggers>full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>?name?</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.append_environment</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildArguments</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildCommand</key>
+ <value>make</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildLocation</key>
+ <value>${workspace_loc:/openttd/Device-Release}</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.contents</key>
+ <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>true</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+ <triggers>full,incremental,</triggers>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ <nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
+ <nature>org.eclipse.cdt.core.ccnature</nature>
+ </natures>
+</projectDescription>
View
14 blackberry-tablet.xml
@@ -57,6 +57,7 @@
<category>core.games</category>
<asset path="icon.png">icon.png</asset>
+ <asset path="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib/libbps.so" type="Qnx/Elf">lib/libbps.so.1</asset>
<asset path="${workspace_loc:openttd/splashscreen.png}">splashscreen.png</asset>
<asset path="${workspace_loc:openttd/ai/compat_0.7.nut}">ai/compat_0.7.nut</asset>
<asset path="${workspace_loc:openttd/ai/compat_1.0.nut}">ai/compat_1.0.nut</asset>
@@ -496,7 +497,7 @@
<!-- Request permission to execute native code. Required for native applications. -->
- <permission system="true">run_native</permission>
+ <action system="true">run_native</action>
<action>play_audio</action>
<!-- The permissions requested by your application. -->
@@ -511,17 +512,22 @@
<!-- <permission>read_device_identifying_information</permission> -->
<configuration id="com.qnx.qcc.configuration.exe.debug.400879774" name="Simulator">
+ <platformArchitecture>x86</platformArchitecture>
+ <asset path="${workspace_loc:SDL12/Simulator/libSDL12.so}" type="Qnx/Elf">lib/libSDL12.so</asset>
+ <asset path="${workspace_loc:/TouchControlOverlay/Simulator/libTouchControlOverlay.so}" type="Qnx/Elf">lib/libTouchControlOverlay.so</asset>
<asset path="Simulator/openttd" entry="true" type="Qnx/Elf">openttd</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.release.151817137" name="Device-Release">
+ <platformArchitecture>armle-v7</platformArchitecture>
<asset path="${workspace_loc:SDL12/Device-Release/libSDL12.so}" type="Qnx/Elf">lib/libSDL12.so</asset>
- <asset path="${workspace_loc:emulate/Device-Release/libemulate.so}" type="Qnx/Elf">lib/libemulate.so</asset>
+ <asset path="${workspace_loc:/TouchControlOverlay/Device-Release/libTouchControlOverlay.so}" type="Qnx/Elf">lib/libTouchControlOverlay.so</asset>
<asset path="Device-Release/openttd" entry="true" type="Qnx/Elf">openttd</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.debug.792443695" name="Device-Debug">
+ <platformArchitecture>armle-v7</platformArchitecture>
<asset path="${workspace_loc:SDL12/Device-Debug/libSDL12.so}" type="Qnx/Elf">lib/libSDL12.so</asset>
- <asset path="${workspace_loc:emulate/Device-Debug/libemulate.so}" type="Qnx/Elf">lib/libemulate.so</asset>
- <asset entry="true" path="${workspace_loc:openttd/Device-Debug/openttd}">openttd</asset>
+ <asset path="${workspace_loc:/TouchControlOverlay/Device-Debug/libTouchControlOverlay.so}" type="Qnx/Elf">lib/libTouchControlOverlay.so</asset>
+ <asset path="Device-Debug/openttd" entry="true" type="Qnx/Elf">openttd</asset>
</configuration>
</qnx>

0 comments on commit 819f234

Please sign in to comment.
Something went wrong with that request. Please try again.