- Updated the build when using make to run from the qnx/ subdirectory.

- Adds the x86 output targets.

Building.txt

@@ -3,9 +3,14 @@ The Build folder contains custom made project files for Visual Studio 2010 and X
 To build for the QNX platform on Windows, run cmd.exe and execute the following commands:
 > cd [bbndk]				where [bbndk] is where the QNX NDK was installed (i.e. C:\bbndk)
 > NativeSDK-env.bat
-> cd [box2d]				where [box2d] is the directory where Box2D was extracted to
+> cd [box2d]/qnx			where [box2d] is the directory where Box2D was extracted to
 > make
-Following this, the relevant binaries should reside in the arm/ subdirectory.
+Following this, the relevant binaries should reside in the following subdirectories:
+    libBox2D: 
+        [box2d]/qnx/arm/a.le.v7      (ARM release)
+        [box2d]/qnx/arm/a.le.v7.g    (ARM debug)
+        [box2d]/qnx/x86/a            (x86 release)
+        [box2d]/qnx/x86/a.g          (x86 simulator debug)
 
 For other platforms you need to run premake in this directory. You can get premake here:
 http://industriousone.com/premake

arm/Makefile → qnx/arm/Makefile

@@ -1,8 +1,8 @@
-LIST=VARIANT
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
+LIST=VARIANT
+ifndef QRECURSE
+QRECURSE=recurse.mk
+ifdef QCONFIG
+QRDIR=$(dir $(QCONFIG))
+endif
+endif
+include $(QRDIR)$(QRECURSE)

arm/a-le-v7-g/Makefile → qnx/arm/a.le.v7.g/Makefile

@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk

arm/a-le-v7/Makefile → qnx/arm/a.le.v7/Makefile

@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk

qnx/common.mk

@@ -0,0 +1,26 @@
+ifndef QCONFIG
+QCONFIG=qconfig.mk
+endif
+include $(QCONFIG)
+
+NAME=Box2D
+
+#===== CCFLAGS - add the flags to the C compiler command line. 
+CCFLAGS+=-Y_gpp
+
+#===== EXTRA_INCVPATH - a space-separated list of directories to search for include files.
+EXTRA_INCVPATH+=$(PRODUCT_ROOT)
+
+#===== EXTRA_SRCVPATH - a space-separated list of directories to search for source files.
+EXTRA_SRCVPATH+=$(PRODUCT_ROOT)/Box2D/Collision  \
+	$(PRODUCT_ROOT)/Box2D/Collision/Shapes  \
+	$(PRODUCT_ROOT)/Box2D/Common  \
+	$(PRODUCT_ROOT)/Box2D/Dynamics  \
+	$(PRODUCT_ROOT)/Box2D/Dynamics/Contacts  \
+	$(PRODUCT_ROOT)/Box2D/Dynamics/Joints  \
+	$(PRODUCT_ROOT)/Box2D/Rope
+
+include $(MKFILES_ROOT)/qtargets.mk
+
+OPTIMIZE_TYPE_g=none
+OPTIMIZE_TYPE=$(OPTIMIZE_TYPE_$(filter g, $(VARIANTS)))

qnx/x86/Makefile

@@ -0,0 +1,8 @@
+LIST=VARIANT
+ifndef QRECURSE
+QRECURSE=recurse.mk
+ifdef QCONFIG
+QRDIR=$(dir $(QCONFIG))
+endif
+endif
+include $(QRDIR)$(QRECURSE)

qnx/x86/a.g/Makefile

@@ -0,0 +1 @@
+include ../../common.mk

qnx/x86/a/Makefile

@@ -0,0 +1 @@
+include ../../common.mk