Permalink
Browse files

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

- Adds the x86 output targets.
  • Loading branch information...
1 parent bf8d6dc commit 90a64e2fb5b40571c8c11526a11d98c2f362a3ac @chrisculy chrisculy committed Oct 5, 2011
View
@@ -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
View
@@ -1,23 +0,0 @@
-ifndef QCONFIG
-QCONFIG=qconfig.mk
-endif
-include $(QCONFIG)
-
-NAME=Box2D
-
-#===== CCFLAGS - add the flags to the C compiler command line.
-CCFLAGS+=-Y_gpp
-
-#===== EXTRA_SRCVPATH - a space-separated list of directories to search for source files.
-EXTRA_SRCVPATH+=$(PROJECT_ROOT)/Box2D/Collision \
- $(PROJECT_ROOT)/Box2D/Collision/Shapes \
- $(PROJECT_ROOT)/Box2D/Common \
- $(PROJECT_ROOT)/Box2D/Dynamics \
- $(PROJECT_ROOT)/Box2D/Dynamics/Contacts \
- $(PROJECT_ROOT)/Box2D/Dynamics/Joints \
- $(PROJECT_ROOT)/Box2D/Rope
-
-include $(MKFILES_ROOT)/qtargets.mk
-
-OPTIMIZE_TYPE_g=none
-OPTIMIZE_TYPE=$(OPTIMIZE_TYPE_$(filter g, $(VARIANTS)))
File renamed without changes.
@@ -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)
@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk
@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk
View
@@ -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)))
View
@@ -0,0 +1,8 @@
+LIST=VARIANT
+ifndef QRECURSE
+QRECURSE=recurse.mk
+ifdef QCONFIG
+QRDIR=$(dir $(QCONFIG))
+endif
+endif
+include $(QRDIR)$(QRECURSE)
View
@@ -0,0 +1 @@
+include ../../common.mk
View
@@ -0,0 +1 @@
+include ../../common.mk

0 comments on commit 90a64e2

Please sign in to comment.