Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #6 from blackberry/next

Removed demos from makefile builds.
  • Loading branch information...
commit fcd262771856d035e7f0fe66c2c2aa56602e93f4 2 parents b4cff6c + 7859588
@seanpaultaylor seanpaultaylor authored
View
8 qnx/HelloWorld/Makefile
@@ -1,8 +0,0 @@
-LIST=CPU
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
View
8 qnx/HelloWorld/arm/Makefile
@@ -1,8 +0,0 @@
-LIST=VARIANT
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
View
5 qnx/HelloWorld/arm/o.le.v7.g/Makefile
@@ -1,5 +0,0 @@
-include ../../common.mk
-
-EXTRA_LIBVPATH+=$(PRODUCT_ROOT)/box2d/arm/a.le.v7.g
-
-LIBS+=Box2D_g
View
6 qnx/HelloWorld/arm/o.le.v7/Makefile
@@ -1,6 +0,0 @@
-include ../../common.mk
-
-EXTRA_LIBVPATH+=$(PRODUCT_ROOT)/box2d/arm/a.le.v7
-
-LIBS+=Box2D
-
View
35 qnx/HelloWorld/common.mk
@@ -1,35 +0,0 @@
-ifndef QCONFIG
-QCONFIG=qconfig.mk
-endif
-include $(QCONFIG)
-
-USEFILE=
-NAME=HelloWorld
-
-#===== 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)/../ \
- $(QNX_TARGET)/usr/include/freetype2 \
- $(QNX_TARGET)/../target-override/usr/include
-
-#===== EXTRA_SRCVPATH - a space-separated list of directories to search for source files.
-EXTRA_SRCVPATH+=$(PRODUCT_ROOT)/../HelloWorld
-
-# Extra library search path for target overrides and patches
-EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \
- $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib
-
-# Basic libraries required by most native applications
-LIBS+=m
-
-include $(MKFILES_ROOT)/qmacros.mk
-
-# Suppress the _g suffix from the debug variant
-BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE))
-
-include $(MKFILES_ROOT)/qtargets.mk
-
-OPTIMIZE_TYPE_g=none
-OPTIMIZE_TYPE=$(OPTIMIZE_TYPE_$(filter g, $(VARIANTS)))
View
8 qnx/HelloWorld/x86/Makefile
@@ -1,8 +0,0 @@
-LIST=VARIANT
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
View
5 qnx/HelloWorld/x86/o.g/Makefile
@@ -1,5 +0,0 @@
-include ../../common.mk
-
-EXTRA_LIBVPATH+=$(PRODUCT_ROOT)/box2d/x86/a.g
-
-LIBS+=Box2D_g
View
5 qnx/HelloWorld/x86/o/Makefile
@@ -1,5 +0,0 @@
-include ../../common.mk
-
-EXTRA_LIBVPATH+=$(PRODUCT_ROOT)/box2d/x86/a
-
-LIBS+=Box2D
View
8 qnx/Makefile
@@ -1,13 +1,7 @@
-all: libs demos
+all: libs
libs:
cd Box2D && make
-demos:
- cd HelloWorld && make
- cd Testbed && make
-
clean:
cd Box2D && make clean
- cd HelloWorld && make clean
- cd Testbed && make clean
View
8 qnx/Testbed/Makefile
@@ -1,8 +0,0 @@
-LIST=CPU
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
View
8 qnx/Testbed/arm/Makefile
@@ -1,8 +0,0 @@
-LIST=VARIANT
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
View
5 qnx/Testbed/arm/o.le.v7.g/Makefile
@@ -1,5 +0,0 @@
-include ../../common.mk
-
-EXTRA_LIBVPATH+=$(PRODUCT_ROOT)/box2d/arm/a.le.v7.g
-
-LIBS+=Box2D_g
View
6 qnx/Testbed/arm/o.le.v7/Makefile
@@ -1,6 +0,0 @@
-include ../../common.mk
-
-EXTRA_LIBVPATH+=$(PRODUCT_ROOT)/box2d/arm/a.le.v7
-
-LIBS+=Box2D
-
View
43 qnx/Testbed/common.mk
@@ -1,43 +0,0 @@
-ifndef QCONFIG
-QCONFIG=qconfig.mk
-endif
-include $(QCONFIG)
-
-USEFILE=
-NAME=Testbed
-
-#===== 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)/../ \
- $(QNX_TARGET)/usr/include/freetype2 \
- $(QNX_TARGET)/../target-override/usr/include
-
-#===== EXTRA_SRCVPATH - a space-separated list of directories to search for source files.
-EXTRA_SRCVPATH+=$(PRODUCT_ROOT)/../Testbed/Tests \
- $(PRODUCT_ROOT)/../Testbed/Framework \
- $(PRODUCT_ROOT)/../Testbed/qnx
-
-SRCS = TestEntries.cpp \
- GLES-Render.cpp \
- Test.cpp \
- bbutil.cpp \
- bbmain.cpp
-
-# Extra library search path for target overrides and patches
-EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \
- $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib
-
-# Basic libraries required by most native applications
-LIBS+=bps pps m screen GLESv1_CM EGL freetype png gestures
-
-include $(MKFILES_ROOT)/qmacros.mk
-
-# Suppress the _g suffix from the debug variant
-BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE))
-
-include $(MKFILES_ROOT)/qtargets.mk
-
-OPTIMIZE_TYPE_g=none
-OPTIMIZE_TYPE=$(OPTIMIZE_TYPE_$(filter g, $(VARIANTS)))
View
8 qnx/Testbed/x86/Makefile
@@ -1,8 +0,0 @@
-LIST=VARIANT
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
View
5 qnx/Testbed/x86/o.g/Makefile
@@ -1,5 +0,0 @@
-include ../../common.mk
-
-EXTRA_LIBVPATH+=$(PRODUCT_ROOT)/box2d/x86/a.g
-
-LIBS+=Box2D_g
View
5 qnx/Testbed/x86/o/Makefile
@@ -1,5 +0,0 @@
-include ../../common.mk
-
-EXTRA_LIBVPATH+=$(PRODUCT_ROOT)/box2d/x86/a
-
-LIBS+=Box2D
Please sign in to comment.
Something went wrong with that request. Please try again.