Permalink
Browse files

Updated and tested on BlackBerry 10 devices using latest SDK.

1 parent 8cbee38 commit 514685799abfb71f6390df10ad7791e5df3bfce9 @seanpaultaylor seanpaultaylor committed Jan 9, 2013
Showing with 1,832 additions and 1,908 deletions.
  1. +1,335 −76 .cproject
  2. +2 −2 .project
  3. +0 −8 Makefile
  4. +6 −28 README.md
  5. +17 −37 bar-descriptor.xml
  6. +55 −281 code/{unix/qnx_glimp.c → blackberry/blackberry_glimp.c}
  7. +331 −0 code/blackberry/blackberry_main.c
  8. +16 −37 code/{unix/qnx_net.c → blackberry/blackberry_net.c}
  9. +0 −7 code/botlib/be_aas_reach.c
  10. +1 −4 code/botlib/be_interface.c
  11. +1 −7 code/botlib/be_interface.h
  12. +1 −1 code/cgame/cg_draw.c
  13. +1 −1 code/cgame/cg_main.c
  14. +4 −4 code/cgame/cg_marks.c
  15. +1 −1 code/cgame/cg_players.c
  16. +2 −2 code/cgame/cg_public.h
  17. +1 −1 code/cgame/cg_scoreboard.c
  18. +1 −1 code/cgame/cg_syscalls.c
  19. +2 −1 code/cgame/cg_view.c
  20. +2 −4 code/client/cl_keys.c
  21. +1 −1 code/client/cl_main.c
  22. +1 −1 code/client/cl_ui.c
  23. +1 −1 code/game/bg_misc.c
  24. +3 −3 code/game/bg_pmove.c
  25. +1 −1 code/game/bg_slidemove.c
  26. +1 −1 code/game/g_bot.c
  27. +1 −1 code/game/g_local.h
  28. +1 −1 code/game/g_main.c
  29. +2 −2 code/game/g_public.h
  30. +1 −1 code/game/g_svcmds.c
  31. +1 −1 code/game/g_syscalls.c
  32. +1 −1 code/game/q_shared.c
  33. +1 −4 code/game/q_shared.h
  34. +1 −1 code/null/null_client.c
  35. +1 −1 code/q3_ui/ui_atoms.c
  36. +1 −1 code/q3_ui/ui_gameinfo.c
  37. +1 −1 code/q3_ui/ui_local.h
  38. +1 −1 code/q3_ui/ui_main.c
  39. +1 −1 code/q3_ui/ui_players.c
  40. +18 −103 code/qcommon/common.c
  41. +2 −18 code/qcommon/qcommon.h
  42. +1 −1 code/qcommon/unzip.c
  43. +1 −6 code/splines/q_shared.hpp
  44. +1 −1 code/ui/ui_local.h
  45. +1 −1 code/ui/ui_shared.c
  46. +1 −1 code/ui/ui_syscalls.c
  47. +1 −1 code/unix/linux_signals.c
  48. +1 −1 code/unix/linux_snd.c
  49. +0 −389 code/unix/qnx_main.c
  50. +0 −430 code/unix/rim_shared.c
  51. +2 −2 code/unix/unix_net.c
  52. +2 −6 code/unix/unix_shared.c
  53. +0 −19 common.mk
  54. BIN icon.png
  55. +0 −8 qnx/Makefile
  56. +0 −333 qnx/common.mk
  57. +0 −8 qnx/nto/Makefile
  58. +0 −8 qnx/nto/arm/Makefile
  59. +0 −1 qnx/nto/arm/o.le.g.v7/Makefile
  60. +0 −1 qnx/nto/arm/o.le.v7/Makefile
  61. +0 −42 qnx/quake3.use
View
Oops, something went wrong.
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>quake3</name>
+ <name>Quake3</name>
<comment></comment>
<projects>
</projects>
@@ -27,7 +27,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/quake3/Device-Release}</value>
+ <value>${workspace_loc:/Quake3/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
View
@@ -1,8 +0,0 @@
-LIST=CPU
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
View
@@ -1,43 +1,21 @@
Build/Deploy using BlackBerry Native SDK
====================================
-Below are the instructions for building the Quake3 (id tech 3) game engine for BlackBerry QNX based platforms (PlayBook).
-The game engine source code included in this repository was ported from the open-source (under GPL license) directly from id software.
+Below are the instructions for building the Quake3 (id tech 3) game engine for BlackBerry 10 and PlayBook devices.
+The game engine source code included in this repository was ported from the open-source (under GPL license) directly from id Software.
The Quake3 maps/data files are not covered under the open-source agreement and must be provided by the developers wishing
to use the code.
-Download the BlackBerry Native SDK 2.0
---------------------------------------
-[Download] (https://bdsc.webapps.blackberry.com/native/beta/)
+Download the BlackBerry Native SDK 10
+-------------------------------------
+http://developer.blackberry.com/native/download/
Add your Quake Maps
-------------------
-- Copy the .pk3 map file(s) to the resource/baseq3 directory from your Quake3 CD (testing only) or custom maps you have made
+- Copy the *.pk3 map file(s) to the resource/baseq3 directory. (Typically found from your purchased Quake3 CD (testing only) or demo/custom maps.
Building from Momentics IDE
---------------------------
- Run BlackBerry Momentics IDE.
- Import the project from the repo directory "Quake3".
-- Right click Project -> Build Configurations -> Set Active Configuration -> Device-Release or Device-Debug.
- Build the project.
- Debug or Run the project.
-
-Build from Makefile
--------------------
-- Run cmd.exe and execute the following commands:
-
- `> cd [bbndk]` -- where [bbndk] is where the QNX NDK was installed (i.e. C:\bbndk-2.0.0)
-
- `> bbndk-env[.bat/.sh]`
-
- `> cd [Quake3]/qnx` -- where [Quake3] is the directory where Quake3 was extracted to
-
- `> make`
-
-- Following this, the relevant binaries should reside in the following subdirectories:
- - [quake3]/qnx/nto/arm/o.le.v7/quake3 (Release)
- - [quake3]/qnx/nto/arm/o.le.v7.g/quake3_g (Debug)
-
-- Run the following to build the Quake3 bar file. Add your additional parameters for signing keys and debug tokens.
-
- `> blackberry-nativepackager -package Quake3.bar bar-descriptor.xml -e qnx/nto/arm/o.le.v7/quake3 quake3 -e resource/baseq3/pak0.pk3 baseq3/pak0.pk3 icon.png`
-
View
@@ -6,10 +6,10 @@
Specifies parameters for identifying, installing, and launching native applications on BlackBerry Tablet OS.
-->
-
+
<!-- A universally unique application identifier. Must be unique across all BlackBerry Tablet OS applications.
Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
- <id>quake3</id>
+ <id>com.idsoftware.Quake3</id>
<!-- The name that is displayed in the BlackBerry Tablet OS application installer.
May have multiple values for each language. See samples or xsd schema file. Optional. -->
@@ -22,84 +22,64 @@
<!-- 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>
-
- <!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
- <!-- <versionLabel></versionLabel> -->
-
- <!-- Description, displayed in the BlackBerry Tablet OS application installer.
- May have multiple values for each language. See samples or xsd schema file. Optional. -->
-
- <!-- Copyright information. Optional. -->
- <!-- <copyright></copyright> -->
+ <buildId>1</buildId>
<!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
<author>id Software</author>
- <description>Quake 3</description>
<!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
<!-- <authorId>ABC1234YjsnUk235h</authorId> -->
<initialWindow>
+ <aspectRatio>landscape</aspectRatio>
+ <autoOrients>false</autoOrients>
<systemChrome>none</systemChrome>
<transparent>false</transparent>
</initialWindow>
- <!-- The category where the application appears. Either core.games or core.media. -->
+ <!-- The category where the application appears. Either core.games or core.media. -->
<category>core.games</category>
+
<asset path="icon.png">icon.png</asset>
<asset path="resource/baseq3/pak0.pk3">baseq3/pak0.pk3</asset>
- <configuration id="com.qnx.qcc.configuration.exe.debug.513359716" name="Device-Debug">
+
+ <configuration name="Device-Debug">
<platformArchitecture>armle-v7</platformArchitecture>
- <asset path="Device-Debug/quake3" entry="true" type="Qnx/Elf">quake3</asset>
+ <asset path="Device-Debug/Quake3" entry="true" type="Qnx/Elf">Quake3</asset>
</configuration>
- <configuration id="com.qnx.qcc.configuration.exe.release.1191851318" name="Device-Release">
+ <configuration name="Device-Release">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Release/Quake3" entry="true" type="Qnx/Elf">Quake3</asset>
</configuration>
- <configuration id="com.qnx.qcc.configuration.exe.profile.2047434418" name="Device-Profile">
+ <configuration name="Device-Profile">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Profile/Quake3" entry="true" type="Qnx/Elf">Quake3</asset>
</configuration>
- <configuration id="com.qnx.qcc.configuration.exe.profile.coverage.1968527117" name="Device-Coverage">
+ <configuration name="Device-Coverage">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Coverage/Quake3" entry="true" type="Qnx/Elf">Quake3</asset>
</configuration>
- <configuration id="com.qnx.qcc.configuration.exe.debug.1673080274" name="Simulator-Debug">
+ <configuration name="Simulator-Debug">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Debug/Quake3" entry="true" type="Qnx/Elf">Quake3</asset>
</configuration>
- <configuration id="com.qnx.qcc.configuration.exe.profile.1942537661" name="Simulator-Profile">
+ <configuration name="Simulator-Profile">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Profile/Quake3" entry="true" type="Qnx/Elf">Quake3</asset>
</configuration>
- <configuration id="com.qnx.qcc.configuration.exe.profile.coverage.725836059" name="Simulator-Coverage">
+ <configuration name="Simulator-Coverage">
<platformArchitecture>x86</platformArchitecture>
<asset path="Simulator-Coverage/Quake3" entry="true" type="Qnx/Elf">Quake3</asset>
</configuration>
- <!-- The icon for the application, which should be 86x86. -->
+ <!-- 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 1024x600. -->
- <!-- <splashscreen></splashscreen> -->
<!-- Request permission to execute native code. Required for native applications. -->
<action system="true">run_native</action>
<action>access_internet</action>
-
- <!-- 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"/>
Oops, something went wrong.

0 comments on commit 5146857

Please sign in to comment.