diff --git a/.gitignore b/.gitignore index 983483b..c734b82 100644 --- a/.gitignore +++ b/.gitignore @@ -20,28 +20,24 @@ Simulator/ Accelerometer/arm/o.le-v7-g/Accelerometer Accelerometer/arm/o.le-v7/Accelerometer Accelerometer/x86/o-g/Accelerometer -Accelerometer/x86/o/Accelerometer AudioControl/arm/o.le-v7-g/AudioControl AudioControl/arm/o.le-v7/AudioControl AudioControl/x86/o-g/AudioControl -AudioControl/x86/o/AudioControl Camera/arm/o.le-v7-g/Camera Camera/arm/o.le-v7/Camera +Camera/x86/o-g/Camera Channels/arm/o.le-v7-g/Channels Channels/arm/o.le-v7/Channels Channels/x86/o-g/Channels CubeRotate/arm/o.le-v7-g/CubeRotate CubeRotate/arm/o.le-v7/CubeRotate CubeRotate/x86/o-g/CubeRotate -CubeRotate/x86/o/CubeRotate Dialog/arm/o.le-v7-g/Dialog Dialog/arm/o.le-v7/Dialog Dialog/x86/o-g/Dialog -Dialog/x86/o/Dialog FallingBlocks/arm/o.le-v7-g/FallingBlocks FallingBlocks/arm/o.le-v7/FallingBlocks FallingBlocks/x86/o-g/FallingBlocks -FallingBlocks/x86/o/FallingBlocks GLES11Template/arm/o.le-v7-g/GLES11Template GLES11Template/arm/o.le-v7/GLES11Template GLES11Template/x86/o-g/GLES11Template @@ -51,59 +47,45 @@ GLES20Template/x86/o-g/GLES20Template Geolocation/arm/o.le-v7-g/Geolocation Geolocation/arm/o.le-v7/Geolocation Geolocation/x86/o-g/Geolocation -Geolocation/x86/o/Geolocation Gesture/arm/o.le-v7-g/Gesture Gesture/arm/o.le-v7/Gesture Gesture/x86/o-g/Gesture -Gesture/x86/o/Gesture GoodCitizen/arm/o.le-v7-g/GoodCitizen GoodCitizen/arm/o.le-v7/GoodCitizen GoodCitizen/x86/o-g/GoodCitizen -GoodCitizen/x86/o/GoodCitizen HelloWorldConsole/arm/o.le-v7-g/HelloWorldConsole HelloWorldConsole/arm/o.le-v7/HelloWorldConsole HelloWorldConsole/x86/o-g/HelloWorldConsole -HelloWorldConsole/x86/o/HelloWorldConsole HelloWorldDisplay/arm/o.le-v7-g/HelloWorldDisplay HelloWorldDisplay/arm/o.le-v7/HelloWorldDisplay HelloWorldDisplay/x86/o-g/HelloWorldDisplay -HelloWorldDisplay/x86/o/HelloWorldDisplay HttpProxy/arm/o.le-v7-g/HttpProxy HttpProxy/arm/o.le-v7/HttpProxy HttpProxy/x86/o-g/HttpProxy -HttpProxy/x86/o/HttpProxy Keyboard/arm/o.le-v7-g/Keyboard Keyboard/arm/o.le-v7/Keyboard Keyboard/x86/o-g/Keyboard -Keyboard/x86/o/Keyboard LocaleSample/arm/o.le-v7-g/LocaleSample LocaleSample/arm/o.le-v7/LocaleSample LocaleSample/x86/o-g/LocaleSample -LocaleSample/x86/o/LocaleSample NetworkStatus/arm/o.le-v7-g/NetworkStatus NetworkStatus/arm/o.le-v7/NetworkStatus NetworkStatus/x86/o-g/NetworkStatus -NetworkStatus/x86/o/NetworkStatus PaymentService/arm/o.le-v7-g/PaymentService PaymentService/arm/o.le-v7/PaymentService PaymentService/x86/o-g/PaymentService -PaymentService/x86/o/PaymentService PlayAudio/arm/o.le-v7-g/PlayAudio PlayAudio/arm/o.le-v7/PlayAudio PlayAudio/x86/o-g/PlayAudio -PlayAudio/x86/o/PlayAudio PlayWav/arm/o.le-v7-g/PlayWav PlayWav/arm/o.le-v7/PlayWav PlayWav/x86/o-g/PlayWav -PlayWav/x86/o/PlayWav ScreenTemplate/arm/o.le-v7-g/ScreenTemplate ScreenTemplate/arm/o.le-v7/ScreenTemplate ScreenTemplate/x86/o-g/ScreenTemplate -ScreenTemplate/x86/o/ScreenTemplate VideoPlayback/arm/o.le-v7-g/VideoPlayback VideoPlayback/arm/o.le-v7/VideoPlayback VideoPlayback/x86/o-g/VideoPlayback -VideoPlayback/x86/o/VideoPlayback VideoWindow/arm/o.le-v7-g/VideoWindow VideoWindow/arm/o.le-v7/VideoWindow VideoWindow/x86/o-g/VideoWindow diff --git a/Accelerometer/.cproject b/Accelerometer/.cproject index 13ad739..1e92889 100644 --- a/Accelerometer/.cproject +++ b/Accelerometer/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,51 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/Accelerometer/bar-descriptor.xml b/Accelerometer/bar-descriptor.xml index 11f9156..922ca6c 100644 --- a/Accelerometer/bar-descriptor.xml +++ b/Accelerometer/bar-descriptor.xml @@ -6,83 +6,84 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.Accelerometer - Accelerometer - - 1.0.0 - 1 - - - - - The Accelerometer application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + portrait false none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 Accelerometer - - armle-v7 - Accelerometer - - + armle-v7 Accelerometer - + x86 Accelerometer - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/Accelerometer/common.mk b/Accelerometer/common.mk index 743cb49..58fb391 100644 --- a/Accelerometer/common.mk +++ b/Accelerometer/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen 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 diff --git a/Accelerometer/manifest.properties b/Accelerometer/manifest.properties index d5ec4fb..f1db3be 100644 --- a/Accelerometer/manifest.properties +++ b/Accelerometer/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: Accelerometer icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen m sources: main.c dialogutil.c dialogutil.h -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/Accelerometer/sample-splashscreen-landscape.png b/Accelerometer/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/Accelerometer/sample-splashscreen-landscape.png and /dev/null differ diff --git a/Accelerometer/sample-splashscreen-portrait.png b/Accelerometer/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/Accelerometer/sample-splashscreen-portrait.png and /dev/null differ diff --git a/AudioControl/.cproject b/AudioControl/.cproject index 5dddcec..b51d23e 100644 --- a/AudioControl/.cproject +++ b/AudioControl/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,51 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/AudioControl/bar-descriptor.xml b/AudioControl/bar-descriptor.xml index 0f4f4fa..87caa40 100644 --- a/AudioControl/bar-descriptor.xml +++ b/AudioControl/bar-descriptor.xml @@ -6,83 +6,84 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.AudioControl - AudioControl - - 1.0.0 - 1 - - - - - The AudioControl application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + portrait false none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 AudioControl - - armle-v7 - AudioControl - - + armle-v7 AudioControl - + x86 AudioControl - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/AudioControl/common.mk b/AudioControl/common.mk index 9f74ad2..0f34397 100644 --- a/AudioControl/common.mk +++ b/AudioControl/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen +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 diff --git a/AudioControl/manifest.properties b/AudioControl/manifest.properties index 964db0b..1c44e09 100644 --- a/AudioControl/manifest.properties +++ b/AudioControl/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: AudioControl icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen sources: main.c dialogutil.c dialogutil.h -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/AudioControl/sample-splashscreen-landscape.png b/AudioControl/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/AudioControl/sample-splashscreen-landscape.png and /dev/null differ diff --git a/AudioControl/sample-splashscreen-portrait.png b/AudioControl/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/AudioControl/sample-splashscreen-portrait.png and /dev/null differ diff --git a/Camera/.cproject b/Camera/.cproject index ecd7f83..d55720a 100644 --- a/Camera/.cproject +++ b/Camera/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,36 +14,36 @@ - - - - - - + + @@ -53,36 +53,35 @@ - - - - - - - + + @@ -92,52 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/Camera/bar-descriptor.xml b/Camera/bar-descriptor.xml index df58fd6..ea3ddc5 100644 --- a/Camera/bar-descriptor.xml +++ b/Camera/bar-descriptor.xml @@ -34,6 +34,8 @@ + portrait + false none false @@ -41,30 +43,50 @@ core.games icon.png - + LICENSE + NOTICE + armle-v7 Camera - - armle-v7 - Camera - - + armle-v7 Camera + + x86 + Camera + - + - icon.png + icon.png - + run_native + read_geolocation use_camera access_shared + + + + + + + + + + + + + + + + + diff --git a/Camera/common.mk b/Camera/common.mk index 7375c97..2cae38b 100644 --- a/Camera/common.mk +++ b/Camera/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps camapi screen +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 diff --git a/Camera/manifest.properties b/Camera/manifest.properties index d647766..cec3c4a 100644 --- a/Camera/manifest.properties +++ b/Camera/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: Camera icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps camapi screen sources: main.c -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/Camera/sample-splashscreen-landscape.png b/Camera/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/Camera/sample-splashscreen-landscape.png and /dev/null differ diff --git a/Camera/sample-splashscreen-portrait.png b/Camera/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/Camera/sample-splashscreen-portrait.png and /dev/null differ diff --git a/Camera/x86/Makefile b/Camera/x86/Makefile new file mode 100644 index 0000000..0e22650 --- /dev/null +++ b/Camera/x86/Makefile @@ -0,0 +1,8 @@ +LIST=VARIANT +ifndef QRECURSE +QRECURSE=recurse.mk +ifdef QCONFIG +QRDIR=$(dir $(QCONFIG)) +endif +endif +include $(QRDIR)$(QRECURSE) diff --git a/Camera/x86/o-g/Makefile b/Camera/x86/o-g/Makefile new file mode 100644 index 0000000..2c76089 --- /dev/null +++ b/Camera/x86/o-g/Makefile @@ -0,0 +1 @@ +include ../../common.mk diff --git a/Channels/.cproject b/Channels/.cproject index 8c2b69e..71a46d6 100644 --- a/Channels/.cproject +++ b/Channels/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,52 +91,47 @@ - - - - - - + - - - - + - + - + - - diff --git a/Channels/bar-descriptor.xml b/Channels/bar-descriptor.xml index 6b28a7f..a7d512e 100644 --- a/Channels/bar-descriptor.xml +++ b/Channels/bar-descriptor.xml @@ -6,84 +6,85 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.Channels - Channels - - 1.0.0 - 1 - - - - - The Channels application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + portrait false none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 Channels - - armle-v7 - Channels - - + armle-v7 Channels - + x86 Channels - - + + icon.png - - + + run_native read_geolocation + + + + + + + + + + + + + + - + diff --git a/Channels/common.mk b/Channels/common.mk index 9f74ad2..0f34397 100644 --- a/Channels/common.mk +++ b/Channels/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen +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 diff --git a/Channels/manifest.properties b/Channels/manifest.properties index 7724346..daeaf75 100644 --- a/Channels/manifest.properties +++ b/Channels/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Combine elements of Geolocation and Accelerometer sample a project.name: Channels icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen sources: main.c dialogutil.c dialogutil.h -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/Channels/sample-splashscreen-landscape.png b/Channels/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/Channels/sample-splashscreen-landscape.png and /dev/null differ diff --git a/Channels/sample-splashscreen-portrait.png b/Channels/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/Channels/sample-splashscreen-portrait.png and /dev/null differ diff --git a/CubeRotate/.cproject b/CubeRotate/.cproject index 71bc94f..9870594 100644 --- a/CubeRotate/.cproject +++ b/CubeRotate/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,51 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/CubeRotate/bar-descriptor.xml b/CubeRotate/bar-descriptor.xml index e488703..b76e361 100644 --- a/CubeRotate/bar-descriptor.xml +++ b/CubeRotate/bar-descriptor.xml @@ -6,82 +6,82 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.CubeRotate - CubeRotate - - 1.0.0 - 1 - - - - - The CubeRotate application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + - false none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 CubeRotate - - armle-v7 - CubeRotate - - + armle-v7 CubeRotate - + x86 CubeRotate - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/CubeRotate/common.mk b/CubeRotate/common.mk index ff665d0..4735f72 100644 --- a/CubeRotate/common.mk +++ b/CubeRotate/common.mk @@ -5,21 +5,30 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk +# Extra include path for libfreetype and for target overrides and patches +EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ + $(QNX_TARGET)/../target-override/usr/include -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) +# Extra library search path for target overrides and patches +EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ + $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=glview GLESv1_CM 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 diff --git a/CubeRotate/manifest.properties b/CubeRotate/manifest.properties index 3dae9db..94153a3 100644 --- a/CubeRotate/manifest.properties +++ b/CubeRotate/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: CubeRotate icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: glview GLESv1_CM m sources: main.c -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/CubeRotate/sample-splashscreen-landscape.png b/CubeRotate/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/CubeRotate/sample-splashscreen-landscape.png and /dev/null differ diff --git a/CubeRotate/sample-splashscreen-portrait.png b/CubeRotate/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/CubeRotate/sample-splashscreen-portrait.png and /dev/null differ diff --git a/Dialog/.cproject b/Dialog/.cproject index a98f9bc..1e510b8 100644 --- a/Dialog/.cproject +++ b/Dialog/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,34 +53,35 @@ - - - - - - + + @@ -89,64 +91,28 @@ - - - - - - - - - - - - - - - - - - - - @@ -154,20 +120,17 @@ - + - - - - + - + - + diff --git a/Dialog/bar-descriptor.xml b/Dialog/bar-descriptor.xml index 104fc53..792b557 100644 --- a/Dialog/bar-descriptor.xml +++ b/Dialog/bar-descriptor.xml @@ -6,81 +6,82 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.Dialog - Dialog - - 1.0.0 - 1 - - - - - The Dialog application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 Dialog - - armle-v7 - Dialog - - + armle-v7 Dialog - + x86 Dialog - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/Dialog/common.mk b/Dialog/common.mk index 9f74ad2..0f34397 100644 --- a/Dialog/common.mk +++ b/Dialog/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen +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 diff --git a/Dialog/manifest.properties b/Dialog/manifest.properties index fdfb2e0..ca6b5b1 100644 --- a/Dialog/manifest.properties +++ b/Dialog/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: Dialog icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen sources: main.c -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/Dialog/sample-splashscreen-landscape.png b/Dialog/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/Dialog/sample-splashscreen-landscape.png and /dev/null differ diff --git a/Dialog/sample-splashscreen-portrait.png b/Dialog/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/Dialog/sample-splashscreen-portrait.png and /dev/null differ diff --git a/FallingBlocks/.cproject b/FallingBlocks/.cproject index 83d3c8f..dc31b18 100644 --- a/FallingBlocks/.cproject +++ b/FallingBlocks/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,51 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/FallingBlocks/bar-descriptor.xml b/FallingBlocks/bar-descriptor.xml index 17b486e..73efda5 100644 --- a/FallingBlocks/bar-descriptor.xml +++ b/FallingBlocks/bar-descriptor.xml @@ -6,82 +6,82 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.FallingBlocks - FallingBlocks - - 1.0.0 - 1 - - - - - The FallingBlocks application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + - true none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 FallingBlocks - - armle-v7 - FallingBlocks - - + armle-v7 FallingBlocks - + x86 FallingBlocks - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/FallingBlocks/common.mk b/FallingBlocks/common.mk index f31edb9..5b8125d 100644 --- a/FallingBlocks/common.mk +++ b/FallingBlocks/common.mk @@ -5,20 +5,29 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk +# Extra include path for libfreetype and for target overrides and patches +EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ + $(QNX_TARGET)/../target-override/usr/include -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) +# Extra library search path for target overrides and patches +EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ + $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications -LIBS+=bps screen GLESv1_CM glview +# Add your required library names, here +LIBS+=bps glview screen GLESv1_CM + +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 diff --git a/FallingBlocks/manifest.properties b/FallingBlocks/manifest.properties index 8ae138c..10c98a9 100644 --- a/FallingBlocks/manifest.properties +++ b/FallingBlocks/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: FallingBlocks icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps glview screen GLESv1_CM sources: main.c -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/FallingBlocks/sample-splashscreen-landscape.png b/FallingBlocks/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/FallingBlocks/sample-splashscreen-landscape.png and /dev/null differ diff --git a/FallingBlocks/sample-splashscreen-portrait.png b/FallingBlocks/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/FallingBlocks/sample-splashscreen-portrait.png and /dev/null differ diff --git a/Geolocation/.cproject b/Geolocation/.cproject index 4fcba9e..66b5e32 100644 --- a/Geolocation/.cproject +++ b/Geolocation/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,51 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/Geolocation/bar-descriptor.xml b/Geolocation/bar-descriptor.xml index 9d1451c..9ca4bbf 100644 --- a/Geolocation/bar-descriptor.xml +++ b/Geolocation/bar-descriptor.xml @@ -6,84 +6,85 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.Geolocation - Geolocation - - 1.0.0 - 1 - - - - - The Geolocation application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + portrait false none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 Geolocation - - armle-v7 - Geolocation - - + armle-v7 Geolocation - + x86 Geolocation - - + + icon.png - - + + run_native read_geolocation + + + + + + + + + + + + + + - + diff --git a/Geolocation/common.mk b/Geolocation/common.mk index 9f74ad2..0f34397 100644 --- a/Geolocation/common.mk +++ b/Geolocation/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen +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 diff --git a/Geolocation/manifest.properties b/Geolocation/manifest.properties index d9ce009..2e068d0 100644 --- a/Geolocation/manifest.properties +++ b/Geolocation/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: Geolocation icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen sources: main.c dialogutil.c dialogutil.h -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/Geolocation/sample-splashscreen-landscape.png b/Geolocation/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/Geolocation/sample-splashscreen-landscape.png and /dev/null differ diff --git a/Geolocation/sample-splashscreen-portrait.png b/Geolocation/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/Geolocation/sample-splashscreen-portrait.png and /dev/null differ diff --git a/Gesture/.cproject b/Gesture/.cproject index 0277584..411586c 100644 --- a/Gesture/.cproject +++ b/Gesture/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,34 +53,35 @@ - - - - - - + + @@ -89,64 +91,28 @@ - - - - - - - - - - - - - - - - - - - - @@ -154,20 +120,17 @@ - + - - - - + - + - + diff --git a/Gesture/bar-descriptor.xml b/Gesture/bar-descriptor.xml index e0b0521..cf2513e 100644 --- a/Gesture/bar-descriptor.xml +++ b/Gesture/bar-descriptor.xml @@ -6,82 +6,83 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.Gesture - Gesture - - 1.0.0 - 1 - - - - - The Gesture application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png - wallpaper.jpg LICENSE NOTICE - - armle-v7 - Gesture - - + wallpaper.jpg + armle-v7 Gesture - + armle-v7 Gesture - + x86 Gesture - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/Gesture/common.mk b/Gesture/common.mk index 079e3b4..91bfcb2 100644 --- a/Gesture/common.mk +++ b/Gesture/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen m img 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 diff --git a/Gesture/manifest.properties b/Gesture/manifest.properties index 88a5b63..2e2efa8 100644 --- a/Gesture/manifest.properties +++ b/Gesture/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: Gesture icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen m img gestures sources: main.c -resources: LICENSE NOTICE wallpaper.jpg sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE wallpaper.jpg readmes: readme.txt diff --git a/Gesture/sample-splashscreen-landscape.png b/Gesture/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/Gesture/sample-splashscreen-landscape.png and /dev/null differ diff --git a/Gesture/sample-splashscreen-portrait.png b/Gesture/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/Gesture/sample-splashscreen-portrait.png and /dev/null differ diff --git a/GoodCitizen/.cproject b/GoodCitizen/.cproject index 1d9d615..7018dc1 100644 --- a/GoodCitizen/.cproject +++ b/GoodCitizen/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,49 +91,46 @@ - - - - - - + - - - - + - + - + diff --git a/GoodCitizen/bar-descriptor.xml b/GoodCitizen/bar-descriptor.xml index ddbe9a8..617669e 100644 --- a/GoodCitizen/bar-descriptor.xml +++ b/GoodCitizen/bar-descriptor.xml @@ -6,86 +6,87 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.GoodCitizen - GoodCitizen - - 1.0.0 - 1 - - - - - The GoodCitizen application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + true none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png - radio_btn_selected.png - radio_btn_unselected.png LICENSE NOTICE + radio_btn_selected.png + radio_btn_unselected.png background-landscape.png background-portrait.png - - armle-v7 - GoodCitizen - - + armle-v7 GoodCitizen - + armle-v7 GoodCitizen - + x86 GoodCitizen - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/GoodCitizen/common.mk b/GoodCitizen/common.mk index 7aec7b7..70782aa 100644 --- a/GoodCitizen/common.mk +++ b/GoodCitizen/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,19 +13,23 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Add USING_GL11 to build bbutil for gles 1.1 use -CCFLAGS+=-DUSING_GL11 - -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) \ + -DUSING_GL11 # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen EGL GLESv1_CM m freetype png +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 diff --git a/GoodCitizen/manifest.properties b/GoodCitizen/manifest.properties index 79f7bee..5926cfe 100644 --- a/GoodCitizen/manifest.properties +++ b/GoodCitizen/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: GoodCitizen icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -51,7 +47,7 @@ sources: bbutil.h bbutil.c main.c flags.compiler: -DUSING_GL11 -resources: LICENSE NOTICE radio_btn_selected.png radio_btn_unselected.png background-landscape.png background-portrait.png sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE radio_btn_selected.png radio_btn_unselected.png background-landscape.png background-portrait.png readmes: readme.txt diff --git a/GoodCitizen/sample-splashscreen-landscape.png b/GoodCitizen/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/GoodCitizen/sample-splashscreen-landscape.png and /dev/null differ diff --git a/GoodCitizen/sample-splashscreen-portrait.png b/GoodCitizen/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/GoodCitizen/sample-splashscreen-portrait.png and /dev/null differ diff --git a/HelloWorldDisplay/.cproject b/HelloWorldDisplay/.cproject index e229202..6e1bc66 100644 --- a/HelloWorldDisplay/.cproject +++ b/HelloWorldDisplay/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,34 +53,35 @@ - - - - - - + + @@ -89,64 +91,28 @@ - - - - - - - - - - - - - - - - - - - - @@ -154,20 +120,17 @@ - + - - - - + - + - + diff --git a/HelloWorldDisplay/bar-descriptor.xml b/HelloWorldDisplay/bar-descriptor.xml index a14d30b..3689e26 100644 --- a/HelloWorldDisplay/bar-descriptor.xml +++ b/HelloWorldDisplay/bar-descriptor.xml @@ -6,84 +6,83 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.HelloWorldDisplay - HelloWorldDisplay - - 1.0.0 - 1 - - - - - The HelloWorldDisplay application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + - landscape - false none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png - HelloWorld_smaller_bubble.png LICENSE NOTICE - - armle-v7 - HelloWorldDisplay - - + HelloWorld_smaller_bubble.png + armle-v7 HelloWorldDisplay - + armle-v7 HelloWorldDisplay - + x86 HelloWorldDisplay - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/HelloWorldDisplay/common.mk b/HelloWorldDisplay/common.mk index d1b7f79..8478f1e 100644 --- a/HelloWorldDisplay/common.mk +++ b/HelloWorldDisplay/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,19 +13,23 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Add USING_GL11 to build bbutil for gles 1.1 use -CCFLAGS+=-DUSING_GL11 - -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) \ + -DUSING_GL11 # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen EGL GLESv1_CM freetype png 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 diff --git a/HelloWorldDisplay/manifest.properties b/HelloWorldDisplay/manifest.properties index c73bd1d..a5a6cc3 100644 --- a/HelloWorldDisplay/manifest.properties +++ b/HelloWorldDisplay/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: HelloWorldDisplay icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -51,7 +47,7 @@ sources: bbutil.h bbutil.c main.c flags.compiler: -DUSING_GL11 -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png HelloWorld_smaller_bubble.png +resources: LICENSE NOTICE HelloWorld_smaller_bubble.png readmes: readme.txt diff --git a/HelloWorldDisplay/sample-splashscreen-landscape.png b/HelloWorldDisplay/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/HelloWorldDisplay/sample-splashscreen-landscape.png and /dev/null differ diff --git a/HelloWorldDisplay/sample-splashscreen-portrait.png b/HelloWorldDisplay/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/HelloWorldDisplay/sample-splashscreen-portrait.png and /dev/null differ diff --git a/HttpProxy/.cproject b/HttpProxy/.cproject index 4db3ca6..d71beeb 100644 --- a/HttpProxy/.cproject +++ b/HttpProxy/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,51 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/HttpProxy/bar-descriptor.xml b/HttpProxy/bar-descriptor.xml index 6635586..2cb71af 100644 --- a/HttpProxy/bar-descriptor.xml +++ b/HttpProxy/bar-descriptor.xml @@ -6,83 +6,84 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.HttpProxy - HttpProxy - - 1.0.0 - 1 - - - - - The HttpProxy application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + portrait false none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 HttpProxy - - armle-v7 - HttpProxy - - + armle-v7 HttpProxy - + x86 HttpProxy - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/HttpProxy/common.mk b/HttpProxy/common.mk index 0aff6a1..badd099 100644 --- a/HttpProxy/common.mk +++ b/HttpProxy/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen curl +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 diff --git a/HttpProxy/manifest.properties b/HttpProxy/manifest.properties index 79775bb..2961084 100644 --- a/HttpProxy/manifest.properties +++ b/HttpProxy/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: HttpProxy icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen curl sources: main.c dialogutil.c dialogutil.h -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/HttpProxy/sample-splashscreen-landscape.png b/HttpProxy/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/HttpProxy/sample-splashscreen-landscape.png and /dev/null differ diff --git a/HttpProxy/sample-splashscreen-portrait.png b/HttpProxy/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/HttpProxy/sample-splashscreen-portrait.png and /dev/null differ diff --git a/Keyboard/.cproject b/Keyboard/.cproject index 8115a49..abf469a 100644 --- a/Keyboard/.cproject +++ b/Keyboard/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,34 +53,35 @@ - - - - - - + + @@ -89,64 +91,28 @@ - - - - - - - - - - - - - - - - - - - - @@ -154,20 +120,17 @@ - + - - - - + - + - + diff --git a/Keyboard/bar-descriptor.xml b/Keyboard/bar-descriptor.xml index 4d0e4d6..48ca91c 100644 --- a/Keyboard/bar-descriptor.xml +++ b/Keyboard/bar-descriptor.xml @@ -6,81 +6,82 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.Keyboard - Keyboard - - 1.0.0 - 1 - - - - - The Keyboard application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 Keyboard - - armle-v7 - Keyboard - - + armle-v7 Keyboard - + x86 Keyboard - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/Keyboard/common.mk b/Keyboard/common.mk index c6a84d9..4783afe 100644 --- a/Keyboard/common.mk +++ b/Keyboard/common.mk @@ -5,21 +5,30 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk +# Extra include path for libfreetype and for target overrides and patches +EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ + $(QNX_TARGET)/../target-override/usr/include -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) +# Extra library search path for target overrides and patches +EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ + $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=glview bps screen GLESv1_CM 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 diff --git a/Keyboard/manifest.properties b/Keyboard/manifest.properties index 49014da..6be27f3 100644 --- a/Keyboard/manifest.properties +++ b/Keyboard/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: Keyboard icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: glview bps screen GLESv1_CM m sources: main.c -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/Keyboard/sample-splashscreen-landscape.png b/Keyboard/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/Keyboard/sample-splashscreen-landscape.png and /dev/null differ diff --git a/Keyboard/sample-splashscreen-portrait.png b/Keyboard/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/Keyboard/sample-splashscreen-portrait.png and /dev/null differ diff --git a/LocaleSample/.cproject b/LocaleSample/.cproject index 2b8e89e..67d10d9 100644 --- a/LocaleSample/.cproject +++ b/LocaleSample/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,51 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/LocaleSample/.project b/LocaleSample/.project index 85d69ee..374435f 100644 --- a/LocaleSample/.project +++ b/LocaleSample/.project @@ -69,11 +69,6 @@ - - com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder - - - org.eclipse.cdt.core.cnature diff --git a/LocaleSample/bar-descriptor.xml b/LocaleSample/bar-descriptor.xml index d3cd693..ebe1e35 100644 --- a/LocaleSample/bar-descriptor.xml +++ b/LocaleSample/bar-descriptor.xml @@ -6,83 +6,84 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.LocaleSample - LocaleSample - - 1.0.0 - 1 - - - - - The LocaleSample application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + portrait false none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 LocaleSample - - armle-v7 - LocaleSample - - + armle-v7 LocaleSample - + x86 LocaleSample - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/LocaleSample/common.mk b/LocaleSample/common.mk index 9f74ad2..0f34397 100644 --- a/LocaleSample/common.mk +++ b/LocaleSample/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen +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 diff --git a/LocaleSample/manifest.properties b/LocaleSample/manifest.properties index d4f5a06..0d850f2 100644 --- a/LocaleSample/manifest.properties +++ b/LocaleSample/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: LocaleSample icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen sources: main.c dialogutil.c dialogutil.h -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/LocaleSample/sample-splashscreen-landscape.png b/LocaleSample/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/LocaleSample/sample-splashscreen-landscape.png and /dev/null differ diff --git a/LocaleSample/sample-splashscreen-portrait.png b/LocaleSample/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/LocaleSample/sample-splashscreen-portrait.png and /dev/null differ diff --git a/NetworkStatus/.cproject b/NetworkStatus/.cproject index 9ebde1f..2c6c885 100644 --- a/NetworkStatus/.cproject +++ b/NetworkStatus/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,51 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/NetworkStatus/bar-descriptor.xml b/NetworkStatus/bar-descriptor.xml index f3e0392..0548cd7 100644 --- a/NetworkStatus/bar-descriptor.xml +++ b/NetworkStatus/bar-descriptor.xml @@ -6,83 +6,84 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.NetworkStatus - NetworkStatus - - 1.0.0 - 1 - - - - - The NetworkStatus application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + portrait false none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 NetworkStatus - - armle-v7 - NetworkStatus - - + armle-v7 NetworkStatus - + x86 NetworkStatus - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/NetworkStatus/common.mk b/NetworkStatus/common.mk index 9f74ad2..0f34397 100644 --- a/NetworkStatus/common.mk +++ b/NetworkStatus/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen +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 diff --git a/NetworkStatus/manifest.properties b/NetworkStatus/manifest.properties index 5092c20..6a35d1f 100644 --- a/NetworkStatus/manifest.properties +++ b/NetworkStatus/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: NetworkStatus icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen sources: main.c dialogutil.c dialogutil.h -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/NetworkStatus/sample-splashscreen-landscape.png b/NetworkStatus/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/NetworkStatus/sample-splashscreen-landscape.png and /dev/null differ diff --git a/NetworkStatus/sample-splashscreen-portrait.png b/NetworkStatus/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/NetworkStatus/sample-splashscreen-portrait.png and /dev/null differ diff --git a/PaymentService/.cproject b/PaymentService/.cproject index a7a9546..1d4f88f 100644 --- a/PaymentService/.cproject +++ b/PaymentService/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,34 +53,35 @@ - - - - - - + + @@ -89,64 +91,28 @@ - - - - - - - - - - - - - - - - - - - - @@ -154,20 +120,17 @@ - + - - - - + - + - + diff --git a/PaymentService/bar-descriptor.xml b/PaymentService/bar-descriptor.xml index 3355b63..381fe5b 100644 --- a/PaymentService/bar-descriptor.xml +++ b/PaymentService/bar-descriptor.xml @@ -6,81 +6,82 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.PaymentService - PaymentService - - 1.0.0 - 1 - - - - - The PaymentService application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png LICENSE NOTICE - + armle-v7 PaymentService - - armle-v7 - PaymentService - - + armle-v7 PaymentService - + x86 PaymentService - - + + icon.png - - + + run_native + + + + + + + + + + + + + + - + diff --git a/PaymentService/common.mk b/PaymentService/common.mk index 9f74ad2..0f34397 100644 --- a/PaymentService/common.mk +++ b/PaymentService/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen +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 diff --git a/PaymentService/manifest.properties b/PaymentService/manifest.properties index 85f5cb8..94144c9 100644 --- a/PaymentService/manifest.properties +++ b/PaymentService/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: PaymentService icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen sources: main.c -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE readmes: readme.txt diff --git a/PaymentService/sample-splashscreen-landscape.png b/PaymentService/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/PaymentService/sample-splashscreen-landscape.png and /dev/null differ diff --git a/PaymentService/sample-splashscreen-portrait.png b/PaymentService/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/PaymentService/sample-splashscreen-portrait.png and /dev/null differ diff --git a/PlayAudio/.cproject b/PlayAudio/.cproject index 0afcd9d..247fe59 100644 --- a/PlayAudio/.cproject +++ b/PlayAudio/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,51 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/PlayAudio/bar-descriptor.xml b/PlayAudio/bar-descriptor.xml index 14eb7a9..00de9d8 100644 --- a/PlayAudio/bar-descriptor.xml +++ b/PlayAudio/bar-descriptor.xml @@ -6,85 +6,86 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.PlayAudio - PlayAudio - - 1.0.0 - 1 - - - - - The PlayAudio application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + portrait false none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png - farewell.mp3 LICENSE NOTICE - - armle-v7 - PlayAudio - - + farewell.mp3 + armle-v7 PlayAudio - + armle-v7 PlayAudio - + x86 PlayAudio - - + + icon.png - - + + run_native play_audio + + + + + + + + + + + + + + - + diff --git a/PlayAudio/common.mk b/PlayAudio/common.mk index 86f1c62..f3d49ff 100644 --- a/PlayAudio/common.mk +++ b/PlayAudio/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen mmrndclient strm +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 diff --git a/PlayAudio/manifest.properties b/PlayAudio/manifest.properties index 6a73560..fb46640 100644 --- a/PlayAudio/manifest.properties +++ b/PlayAudio/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: PlayAudio icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen mmrndclient strm sources: main.c dialogaudio.c dialogaudio.h -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png farewell.mp3 +resources: LICENSE NOTICE farewell.mp3 readmes: readme.txt diff --git a/PlayAudio/sample-splashscreen-landscape.png b/PlayAudio/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/PlayAudio/sample-splashscreen-landscape.png and /dev/null differ diff --git a/PlayAudio/sample-splashscreen-portrait.png b/PlayAudio/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/PlayAudio/sample-splashscreen-portrait.png and /dev/null differ diff --git a/PlayWav/.cproject b/PlayWav/.cproject index 5539515..751305c 100644 --- a/PlayWav/.cproject +++ b/PlayWav/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,73 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -128,51 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/PlayWav/bar-descriptor.xml b/PlayWav/bar-descriptor.xml index cd7576b..64aa421 100644 --- a/PlayWav/bar-descriptor.xml +++ b/PlayWav/bar-descriptor.xml @@ -6,85 +6,86 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.PlayWav - PlayWav - - 1.0.0 - 1 - - - - - The PlayWav application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + portrait false none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png - sample.wav LICENSE NOTICE - - armle-v7 - PlayWav - - + sample.wav + armle-v7 PlayWav - + armle-v7 PlayWav - + x86 PlayWav - - + + icon.png - - + + run_native play_audio + + + + + + + + + + + + + + - + diff --git a/PlayWav/common.mk b/PlayWav/common.mk index 7e506d7..8b10255 100644 --- a/PlayWav/common.mk +++ b/PlayWav/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen asound +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 diff --git a/PlayWav/manifest.properties b/PlayWav/manifest.properties index 5727ac6..f6bbcae 100644 --- a/PlayWav/manifest.properties +++ b/PlayWav/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: PlayWav icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen asound sources: main.c dialogutil.c dialogutil.h -resources: LICENSE NOTICE sample.wav sample-splashscreen-landscape.png sample-splashscreen-portrait.png +resources: LICENSE NOTICE sample.wav readmes: readme.txt diff --git a/PlayWav/sample-splashscreen-landscape.png b/PlayWav/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/PlayWav/sample-splashscreen-landscape.png and /dev/null differ diff --git a/PlayWav/sample-splashscreen-portrait.png b/PlayWav/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/PlayWav/sample-splashscreen-portrait.png and /dev/null differ diff --git a/VideoPlayback/.cproject b/VideoPlayback/.cproject index f96fda7..419951c 100644 --- a/VideoPlayback/.cproject +++ b/VideoPlayback/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,35 +14,36 @@ - - - - - - + + @@ -52,34 +53,35 @@ - - - - - - + + @@ -89,64 +91,28 @@ - - - - - - - - - - - - - - - - - - - - @@ -154,20 +120,17 @@ - + - - - - + - + - + diff --git a/VideoPlayback/bar-descriptor.xml b/VideoPlayback/bar-descriptor.xml index 5fde3ce..af7227f 100644 --- a/VideoPlayback/bar-descriptor.xml +++ b/VideoPlayback/bar-descriptor.xml @@ -6,84 +6,85 @@ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS. --> - com.example.VideoPlayback - VideoPlayback - - 1.0.0 - 1 - - - - - The VideoPlayback application - - - Example Inc. - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - + - + none false - + core.games icon.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png - pb_sample.mp4 LICENSE NOTICE - - armle-v7 - VideoPlayback - - + pb_sample.mp4 + armle-v7 VideoPlayback - + armle-v7 VideoPlayback - + x86 VideoPlayback - - + + icon.png - - + + run_native access_shared play_audio + + + + + + + + + + + + + + - + diff --git a/VideoPlayback/common.mk b/VideoPlayback/common.mk index 86f1c62..f3d49ff 100644 --- a/VideoPlayback/common.mk +++ b/VideoPlayback/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps screen mmrndclient strm +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 diff --git a/VideoPlayback/manifest.properties b/VideoPlayback/manifest.properties index 5dbcba6..7897f45 100644 --- a/VideoPlayback/manifest.properties +++ b/VideoPlayback/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: VideoPlayback icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps screen mmrndclient strm sources: main.c -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png pb_sample.mp4 +resources: LICENSE NOTICE pb_sample.mp4 readmes: readme.txt diff --git a/VideoPlayback/sample-splashscreen-landscape.png b/VideoPlayback/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/VideoPlayback/sample-splashscreen-landscape.png and /dev/null differ diff --git a/VideoPlayback/sample-splashscreen-portrait.png b/VideoPlayback/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/VideoPlayback/sample-splashscreen-portrait.png and /dev/null differ diff --git a/VideoWindow/.cproject b/VideoWindow/.cproject index 7b7e6b8..8cb5942 100644 --- a/VideoWindow/.cproject +++ b/VideoWindow/.cproject @@ -3,8 +3,8 @@ - - + + @@ -14,36 +14,36 @@ - - - - - - + + @@ -53,75 +53,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -131,52 +91,47 @@ - - - - - - + - - - - + - + - + - diff --git a/VideoWindow/bar-descriptor.xml b/VideoWindow/bar-descriptor.xml index 59af099..bf570d1 100644 --- a/VideoWindow/bar-descriptor.xml +++ b/VideoWindow/bar-descriptor.xml @@ -1,101 +1,92 @@ - - - + - - - com.example.VideoWindow + + com.example.VideoWindow - - - - VideoWindow - - + 1.0.0 - 1.0.0 - - - - 1 - - - - - - The VideoWindow application - - - - - - Research In Motion Inc. - - - - - - portrait - false - none - false - - - - - core.media - - - - - icon.png - - - - - sample-splashscreen-landscape.png:sample-splashscreen-portrait.png - sample-splashscreen-landscape.png - sample-splashscreen-portrait.png - - - - run_native - - access_shared - play_audio - - - - set_audio_volume - read_device_identifying_information - pb_sample.mp4 - icon.png - - - armle-v7 - VideoWindow - - - x86 - VideoWindow - - - armle-v7 - VideoWindow - - - VideoWindow - - - + The VideoWindow application + + + Example Inc. + + + + + + portrait + false + none + false + + + + core.games + icon.png + LICENSE + NOTICE + pb_sample.mp4 + + armle-v7 + VideoWindow + + + armle-v7 + VideoWindow + + + x86 + VideoWindow + + + + + icon.png + + + + + + + run_native + access_shared + play_audio + + + + + + + + + + + + + + + + + + diff --git a/VideoWindow/common.mk b/VideoWindow/common.mk index f163a78..7d6b3f8 100644 --- a/VideoWindow/common.mk +++ b/VideoWindow/common.mk @@ -5,12 +5,7 @@ include $(QCONFIG) USEFILE= -include $(MKFILES_ROOT)/qmacros.mk - -# Suppress the _g suffix from the debug variant -BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE)) - -# Extra include path libfreetype and for target overrides and patches +# Extra include path for libfreetype and for target overrides and patches EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ $(QNX_TARGET)/../target-override/usr/include @@ -18,16 +13,22 @@ EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \ EXTRA_LIBVPATH+=$(QNX_TARGET)/../target-override/$(CPUVARDIR)/lib \ $(QNX_TARGET)/../target-override/$(CPUVARDIR)/usr/lib -# Compiler options for enhanced security -CCFLAGS+=-fstack-protector-all -D_FORTIFY_SOURCE=2 \ - $(if $(filter g so shared,$(VARIANTS)),,-fPIE) +# Compiler options for enhanced security and recording the compiler options in release builds +CCFLAGS+=-fstack-protector-strong -D_FORTIFY_SOURCE=2 \ + $(if $(filter g so shared,$(VARIANTS)),,-fPIE) \ + $(if $(filter g,$(VARIANTS)),,-frecord-gcc-switches) # Linker options for enhanced security LDFLAGS+=-Wl,-z,relro -Wl,-z,now $(if $(filter g so shared,$(VARIANTS)),,-pie) -# Basic libraries required by most native applications +# Add your required library names, here LIBS+=bps EGL GLESv1_CM screen mmrndclient strm +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 diff --git a/VideoWindow/manifest.properties b/VideoWindow/manifest.properties index 085e7d5..060c631 100644 --- a/VideoWindow/manifest.properties +++ b/VideoWindow/manifest.properties @@ -9,8 +9,6 @@ # project.name - [required] The name of the example project that is created # icon - [optional] The icon file to generate and list in the bar-descriptor.xml. # Should be named "icon.png" -# splashscreen.landscape - [optional] The landscape splashscreen image. -# splashscreen.portrait - [optional] The portrait splashscreen image. # actions - [optional] Space-delimited list of the permissions required (actions performed) # by the application. The "run_native" action is implicit. # open.file - [Optional] The file to open in an editor when the project creation @@ -40,8 +38,6 @@ template.description: Create a new BlackBerry project.name: VideoWindow icon: icon.png -splashscreen.landscape: sample-splashscreen-landscape.png -splashscreen.portrait: sample-splashscreen-portrait.png open.file: bar-descriptor.xml @@ -49,7 +45,7 @@ libs: bps EGL GLESv1_CM screen mmrndclient strm sources: main.c -resources: LICENSE NOTICE sample-splashscreen-landscape.png sample-splashscreen-portrait.png pb_sample.mp4 +resources: LICENSE NOTICE pb_sample.mp4 readmes: readme.txt diff --git a/VideoWindow/sample-splashscreen-landscape.png b/VideoWindow/sample-splashscreen-landscape.png deleted file mode 100644 index 445d072..0000000 Binary files a/VideoWindow/sample-splashscreen-landscape.png and /dev/null differ diff --git a/VideoWindow/sample-splashscreen-portrait.png b/VideoWindow/sample-splashscreen-portrait.png deleted file mode 100644 index bc19ee2..0000000 Binary files a/VideoWindow/sample-splashscreen-portrait.png and /dev/null differ diff --git a/samples.mk b/samples.mk index 3cd56e3..9b41ec3 100644 --- a/samples.mk +++ b/samples.mk @@ -5,13 +5,12 @@ BAR_CONFIG_arm_o_le_v7:=Device-Release BAR_CONFIG_arm_o_le_v7_g:=Device-Debug BAR_CONFIG_x86_o:=Simulator BAR_CONFIG_x86_o_g:=Simulator-Debug -CONFIG_ID=$(shell grep -E "