Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Converting line delimiters to Unix-style in all the makefiles I misse…

…d, as well as the bar-descriptor.
  • Loading branch information...
commit 2217b83a252f5fe8c6b9459329fd460411a03281 1 parent adfc040
@ablake ablake authored
View
16 Gamepad/Makefile
@@ -1,8 +1,8 @@
-LIST=CPU
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
+LIST=CPU
+ifndef QRECURSE
+QRECURSE=recurse.mk
+ifdef QCONFIG
+QRDIR=$(dir $(QCONFIG))
+endif
+endif
+include $(QRDIR)$(QRECURSE)
View
16 Gamepad/arm/Makefile
@@ -1,8 +1,8 @@
-LIST=VARIANT
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
+LIST=VARIANT
+ifndef QRECURSE
+QRECURSE=recurse.mk
+ifdef QCONFIG
+QRDIR=$(dir $(QCONFIG))
+endif
+endif
+include $(QRDIR)$(QRECURSE)
View
2  Gamepad/arm/o.le-v7-g/Makefile
@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk
View
2  Gamepad/arm/o.le-v7/Makefile
@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk
View
106 Gamepad/bar-descriptor.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
-
-<!-- BlackBerry® 10 application descriptor file.
-
- Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS.
--->
-
- <!-- A universally unique application identifier. Must be unique across all BlackBerry applications.
- Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
- <id>com.example.Gamepad</id>
-
- <!-- The name that is displayed in the BlackBerry application installer.
- May have multiple values for each language. See samples or xsd schema file. Optional. -->
- <name>Gamepad</name>
-
- <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
- Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
- An updated version of application must have a versionNumber value higher than the previous version. Required. -->
- <versionNumber>1.0.0</versionNumber>
-
- <!-- Fourth digit segment of the package version. First three segments are taken from the
- <versionNumber> element. Must be an integer from 0 to 2^16-1 -->
- <buildId>1</buildId>
-
- <!-- Description, displayed in the BlackBerry application installer.
- May have multiple values for each language. See samples or xsd schema file. Optional. -->
- <description>The Gamepad application</description>
-
- <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
- <author>Example Inc.</author>
-
- <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
- <!-- <authorId>ABC1234YjsnUk235h</authorId> -->
-
- <initialWindow>
- <aspectRatio>landscape</aspectRatio>
- <autoOrients>false</autoOrients>
- <systemChrome>none</systemChrome>
- <transparent>false</transparent>
- </initialWindow>
-
- <!-- The category where the application appears. Either core.games or core.media. -->
- <category>core.games</category>
- <asset path="icon.png">icon.png</asset>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<qnx xmlns="http://www.qnx.com/schemas/application/1.0">
+
+<!-- BlackBerry® 10 application descriptor file.
+
+ Specifies parameters for identifying, installing, and launching native applications on BlackBerry® 10 OS.
+-->
+
+ <!-- A universally unique application identifier. Must be unique across all BlackBerry applications.
+ Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
+ <id>com.example.Gamepad</id>
+
+ <!-- The name that is displayed in the BlackBerry application installer.
+ May have multiple values for each language. See samples or xsd schema file. Optional. -->
+ <name>Gamepad</name>
+
+ <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
+ Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
+ An updated version of application must have a versionNumber value higher than the previous version. Required. -->
+ <versionNumber>1.0.0</versionNumber>
+
+ <!-- Fourth digit segment of the package version. First three segments are taken from the
+ <versionNumber> element. Must be an integer from 0 to 2^16-1 -->
+ <buildId>1</buildId>
+
+ <!-- Description, displayed in the BlackBerry application installer.
+ May have multiple values for each language. See samples or xsd schema file. Optional. -->
+ <description>The Gamepad application</description>
+
+ <!-- Name of author which is used for signing. Must match the developer name of your development certificate. -->
+ <author>Example Inc.</author>
+
+ <!-- Unique author ID assigned by signing authority. Required if using debug tokens. -->
+ <!-- <authorId>ABC1234YjsnUk235h</authorId> -->
+
+ <initialWindow>
+ <aspectRatio>landscape</aspectRatio>
+ <autoOrients>false</autoOrients>
+ <systemChrome>none</systemChrome>
+ <transparent>false</transparent>
+ </initialWindow>
+
+ <!-- The category where the application appears. Either core.games or core.media. -->
+ <category>core.games</category>
+ <asset path="icon.png">icon.png</asset>
<asset path="gamepad.png">gamepad.png</asset>
<configuration name="Device-Debug">
<platformArchitecture>armle-v7</platformArchitecture>
@@ -56,13 +56,13 @@
<platformArchitecture>x86</platformArchitecture>
<asset path="x86/o-g/Gamepad" entry="true" type="Qnx/Elf">Gamepad</asset>
</configuration>
-
- <!-- The icon for the application. -->
+
+ <!-- The icon for the application. -->
<icon>
<image>icon.png</image>
- </icon>
-
- <!-- Ensure that shared libraries in the package are found at run-time. -->
- <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
-
-</qnx>
+ </icon>
+
+ <!-- Ensure that shared libraries in the package are found at run-time. -->
+ <env var="LD_LIBRARY_PATH" value="app/native/lib"/>
+
+</qnx>
View
78 Gamepad/common.mk
@@ -1,40 +1,40 @@
-ifndef QCONFIG
-QCONFIG=qconfig.mk
-endif
-include $(QCONFIG)
-
-USEFILE=
-
-# Extra include path for libfreetype and for target overrides and patches
-EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \
- $(QNX_TARGET)/../target-override/usr/include
-
-# Extra library search path for target overrides and patches
-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 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)
-
-# Add your required library names, here
-LIBS+=bps screen EGL GLESv1_CM m png freetype
-
-include $(MKFILES_ROOT)/qmacros.mk
-
-# Suppress the _g suffix from the debug variant
-BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE))
-
-include $(MKFILES_ROOT)/qtargets.mk
-
-OPTIMIZE_TYPE_g=none
-OPTIMIZE_TYPE=$(OPTIMIZE_TYPE_$(filter g, $(VARIANTS)))
-
+ifndef QCONFIG
+QCONFIG=qconfig.mk
+endif
+include $(QCONFIG)
+
+USEFILE=
+
+# Extra include path for libfreetype and for target overrides and patches
+EXTRA_INCVPATH+=$(QNX_TARGET)/usr/include/freetype2 \
+ $(QNX_TARGET)/../target-override/usr/include
+
+# Extra library search path for target overrides and patches
+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 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)
+
+# Add your required library names, here
+LIBS+=bps screen EGL GLESv1_CM m png freetype
+
+include $(MKFILES_ROOT)/qmacros.mk
+
+# Suppress the _g suffix from the debug variant
+BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE))
+
+include $(MKFILES_ROOT)/qtargets.mk
+
+OPTIMIZE_TYPE_g=none
+OPTIMIZE_TYPE=$(OPTIMIZE_TYPE_$(filter g, $(VARIANTS)))
+
-include $(PROJECT_ROOT)/../samples.mk
View
16 Gamepad/x86/Makefile
@@ -1,8 +1,8 @@
-LIST=VARIANT
-ifndef QRECURSE
-QRECURSE=recurse.mk
-ifdef QCONFIG
-QRDIR=$(dir $(QCONFIG))
-endif
-endif
-include $(QRDIR)$(QRECURSE)
+LIST=VARIANT
+ifndef QRECURSE
+QRECURSE=recurse.mk
+ifdef QCONFIG
+QRDIR=$(dir $(QCONFIG))
+endif
+endif
+include $(QRDIR)$(QRECURSE)
View
2  Gamepad/x86/o-g/Makefile
@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk
View
2  Gamepad/x86/o/Makefile
@@ -1 +1 @@
-include ../../common.mk
+include ../../common.mk
Please sign in to comment.
Something went wrong with that request. Please try again.