Permalink
Browse files

Merge pull request #6 from kwhatmough/master

Merge next into master
  • Loading branch information...
2 parents cca83bc + cac14fa commit e7a68965d647e0cbe5492f15607a7e1ffbbe719d @seanpaultaylor seanpaultaylor committed Nov 8, 2012
View
13 .cproject
@@ -36,9 +36,12 @@
<listOptionValue builtIn="false" value="C:/bbndk-2.0.1/target/target-override/usr/include"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.1742615649" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <option id="com.qnx.qcc.option.compiler.ccoptions.1742615649" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-mfpu=neon"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.1458154112" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.394065364" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.450648636" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -100,9 +103,12 @@
<listOptionValue builtIn="false" value="C:/bbndk-2.0.1/target/target-override/usr/include"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.564956055" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <option id="com.qnx.qcc.option.compiler.ccoptions.564956055" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-mfpu=neon"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.371366966" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.1298308727" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.2087027974" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -284,6 +290,9 @@
<listOptionValue builtIn="false" value="C:/bbndk-2.0.1/target/target-override/usr/include"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.1334844926" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.656604421" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.768977308" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
View
2 .project
@@ -27,7 +27,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/bullet/Device-Debug}</value>
+ <value>${workspace_loc:/bullet/Device-Release}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
View
27 Demos/BasicDemo/.cproject
@@ -44,9 +44,12 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="BT_USE_NEON"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.1395330943" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <option id="com.qnx.qcc.option.compiler.ccoptions.1395330943" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-mfpu=neon"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.1183184496" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.1715629603" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.1455826248" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -122,11 +125,12 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="BT_USE_NEON"/>
</option>
- <option id="com.qnx.qcc.option.compiler.pie.99177655" name="Position Independent Executable (-fPIE)" superClass="com.qnx.qcc.option.compiler.pie" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.compiler.pie.99177655" name="Position Independent Executable (-fPIE)" superClass="com.qnx.qcc.option.compiler.pie" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.qccoptions.1659042578" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-frecord-gcc-switches"/>
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.1628464982" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <option id="com.qnx.qcc.option.compiler.ccoptions.1628464982" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-mfpu=neon"/>
</option>
<inputType id="com.qnx.qcc.inputType.compiler.1561860142" superClass="com.qnx.qcc.inputType.compiler"/>
@@ -137,10 +141,10 @@
<tool id="com.qnx.qcc.tool.linker.2027020811" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
<option id="com.qnx.qcc.option.linker.langcpp.317203576" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.713857295" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Release}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Release}&quot;"/>
</option>
- <option id="com.qnx.qcc.option.linker.pie.402854426" name="Position Independent Executable (-pie)" superClass="com.qnx.qcc.option.linker.pie" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.linker.pie.402854426" name="Position Independent Executable (-pie)" superClass="com.qnx.qcc.option.linker.pie" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.security.2033662317" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1391109742" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="GLESv1_CM"/>
@@ -316,7 +320,7 @@
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
<cconfiguration id="com.qnx.qcc.configuration.exe.debug.1176710407">
- <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.exe.debug.1176710407" moduleId="org.eclipse.cdt.core.settings" name="Simulator-Debug">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.exe.debug.1176710407" moduleId="org.eclipse.cdt.core.settings" name="Simulator">
<externalSettings/>
<extensions>
<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -326,7 +330,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" description="" id="com.qnx.qcc.configuration.exe.debug.1176710407" name="Simulator-Debug" parent="com.qnx.qcc.configuration.exe.debug">
+ <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" description="" id="com.qnx.qcc.configuration.exe.debug.1176710407" name="Simulator" parent="com.qnx.qcc.configuration.exe.debug">
<folderInfo id="com.qnx.qcc.configuration.exe.debug.1176710407." name="/" resourcePath="">
<toolChain id="com.qnx.qcc.toolChain.exe.debug.879152398" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.829330978" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
@@ -344,6 +348,9 @@
<option id="com.qnx.qcc.option.compiler.defines.994981406" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.932027476" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.1682870676" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.1325752781" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -354,8 +361,8 @@
<option id="com.qnx.qcc.option.linker.debug.870251140" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.1953721982" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.1903697911" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Simulator}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Simulator}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.security.667822364" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1746571984" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
View
6 Demos/BasicDemo/.project
@@ -12,10 +12,6 @@
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
- <key>?children?</key>
- <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
- </dictionary>
- <dictionary>
<key>?name?</key>
<value></value>
</dictionary>
@@ -33,7 +29,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/BasicDemo/Device-Debug}</value>
+ <value>${workspace_loc:/BasicDemo/Device-Release}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
View
4 Demos/BasicDemo/bar-descriptor.xml
@@ -66,9 +66,9 @@
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Coverage/BasicDemo" entry="true" type="Qnx/Elf">BasicDemo</asset>
</configuration>
- <configuration id="com.qnx.qcc.configuration.exe.debug.1176710407" name="Simulator-Debug">
+ <configuration id="com.qnx.qcc.configuration.exe.debug.1176710407" name="Simulator">
<platformArchitecture>x86</platformArchitecture>
- <asset path="Simulator-Debug/BasicDemo" entry="true" type="Qnx/Elf">BasicDemo</asset>
+ <asset path="Simulator/BasicDemo" entry="true" type="Qnx/Elf">BasicDemo</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.918794581" name="Simulator-Profile">
<platformArchitecture>x86</platformArchitecture>
View
27 Demos/Box2dDemo/.cproject
@@ -44,9 +44,12 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="BT_USE_NEON"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.1507577269" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <option id="com.qnx.qcc.option.compiler.ccoptions.1507577269" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-mfpu=neon"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.1714159309" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.633440019" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.191747342" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -122,11 +125,12 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="BT_USE_NEON"/>
</option>
- <option id="com.qnx.qcc.option.compiler.pie.1427538065" name="Position Independent Executable (-fPIE)" superClass="com.qnx.qcc.option.compiler.pie" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.compiler.pie.1427538065" name="Position Independent Executable (-fPIE)" superClass="com.qnx.qcc.option.compiler.pie" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.qccoptions.1183238197" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-frecord-gcc-switches"/>
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.102455466" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <option id="com.qnx.qcc.option.compiler.ccoptions.102455466" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-mfpu=neon"/>
</option>
<inputType id="com.qnx.qcc.inputType.compiler.33999560" superClass="com.qnx.qcc.inputType.compiler"/>
@@ -141,10 +145,10 @@
<tool id="com.qnx.qcc.tool.linker.1577451562" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
<option id="com.qnx.qcc.option.linker.langcpp.1410327879" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.2009148239" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Release}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Release}&quot;"/>
</option>
- <option id="com.qnx.qcc.option.linker.pie.414696106" name="Position Independent Executable (-pie)" superClass="com.qnx.qcc.option.linker.pie" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.linker.pie.414696106" name="Position Independent Executable (-pie)" superClass="com.qnx.qcc.option.linker.pie" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.security.1972942377" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.2050011064" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="GLESv1_CM"/>
@@ -328,7 +332,7 @@
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
<cconfiguration id="com.qnx.qcc.configuration.exe.debug.1963364241">
- <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.exe.debug.1963364241" moduleId="org.eclipse.cdt.core.settings" name="Simulator-Debug">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.exe.debug.1963364241" moduleId="org.eclipse.cdt.core.settings" name="Simulator">
<externalSettings/>
<extensions>
<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -338,7 +342,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" description="" id="com.qnx.qcc.configuration.exe.debug.1963364241" name="Simulator-Debug" parent="com.qnx.qcc.configuration.exe.debug">
+ <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" description="" id="com.qnx.qcc.configuration.exe.debug.1963364241" name="Simulator" parent="com.qnx.qcc.configuration.exe.debug">
<folderInfo id="com.qnx.qcc.configuration.exe.debug.1963364241." name="/" resourcePath="">
<toolChain id="com.qnx.qcc.toolChain.exe.debug.1983960472" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.2017066792" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
@@ -356,6 +360,9 @@
<option id="com.qnx.qcc.option.compiler.defines.1250420594" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.1663222850" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.1558336047" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.709666112" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -370,8 +377,8 @@
<option id="com.qnx.qcc.option.linker.debug.1755123712" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.815824681" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.646442818" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Simulator}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Simulator}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.security.401558529" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.1226405511" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
View
6 Demos/Box2dDemo/.project
@@ -12,10 +12,6 @@
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
- <key>?children?</key>
- <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
- </dictionary>
- <dictionary>
<key>?name?</key>
<value></value>
</dictionary>
@@ -33,7 +29,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/Box2dDemo/Device-Debug}</value>
+ <value>${workspace_loc:/Box2dDemo/Device-Release}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
View
4 Demos/Box2dDemo/bar-descriptor.xml
@@ -65,9 +65,9 @@
<configuration id="com.qnx.qcc.configuration.exe.profile.coverage.1148597740" name="Device-Coverage">
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Coverage/Box2dDemo" entry="true" type="Qnx/Elf">Box2dDemo</asset>
- </configuration>
+ </configuration>
<configuration id="com.qnx.qcc.configuration.exe.debug.1963364241" name="Simulator">
- <platformArchitecture>x86</platformArchitecture>
+ <platformArchitecture>x86</platformArchitecture>
<asset path="Simulator/Box2dDemo" entry="true" type="Qnx/Elf">Box2dDemo</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.142872959" name="Simulator-Profile">
View
27 Demos/BspDemo/.cproject
@@ -44,9 +44,12 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="BT_USE_NEON"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.319789781" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <option id="com.qnx.qcc.option.compiler.ccoptions.319789781" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-mfpu=neon"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.2015395244" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.370944642" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.1354248732" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -122,11 +125,12 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="BT_USE_NEON"/>
</option>
- <option id="com.qnx.qcc.option.compiler.pie.1945499883" name="Position Independent Executable (-fPIE)" superClass="com.qnx.qcc.option.compiler.pie" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.compiler.pie.1945499883" name="Position Independent Executable (-fPIE)" superClass="com.qnx.qcc.option.compiler.pie" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.qccoptions.756631364" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-frecord-gcc-switches"/>
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.262053334" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <option id="com.qnx.qcc.option.compiler.ccoptions.262053334" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-mfpu=neon"/>
</option>
<inputType id="com.qnx.qcc.inputType.compiler.1737231742" superClass="com.qnx.qcc.inputType.compiler"/>
@@ -137,10 +141,10 @@
<tool id="com.qnx.qcc.tool.linker.390914368" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
<option id="com.qnx.qcc.option.linker.langcpp.1756928081" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.401577791" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Release}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Release}&quot;"/>
</option>
- <option id="com.qnx.qcc.option.linker.pie.1059867644" name="Position Independent Executable (-pie)" superClass="com.qnx.qcc.option.linker.pie" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.linker.pie.1059867644" name="Position Independent Executable (-pie)" superClass="com.qnx.qcc.option.linker.pie" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.security.508871660" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.845786110" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
<listOptionValue builtIn="false" value="GLESv1_CM"/>
@@ -316,7 +320,7 @@
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
<cconfiguration id="com.qnx.qcc.configuration.exe.debug.238607602">
- <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.exe.debug.238607602" moduleId="org.eclipse.cdt.core.settings" name="Simulator-Debug">
+ <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.exe.debug.238607602" moduleId="org.eclipse.cdt.core.settings" name="Simulator">
<externalSettings/>
<extensions>
<extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -326,7 +330,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" description="" id="com.qnx.qcc.configuration.exe.debug.238607602" name="Simulator-Debug" parent="com.qnx.qcc.configuration.exe.debug">
+ <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" description="" id="com.qnx.qcc.configuration.exe.debug.238607602" name="Simulator" parent="com.qnx.qcc.configuration.exe.debug">
<folderInfo id="com.qnx.qcc.configuration.exe.debug.238607602." name="/" resourcePath="">
<toolChain id="com.qnx.qcc.toolChain.exe.debug.903740906" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
<targetPlatform archList="all" binaryParser="com.qnx.tools.ide.qde.core.QDEBynaryParser" id="com.qnx.qcc.targetPlatform.790379932" osList="all" superClass="com.qnx.qcc.targetPlatform"/>
@@ -344,6 +348,9 @@
<option id="com.qnx.qcc.option.compiler.defines.813869086" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.190848592" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.1412042828" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.1411596071" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -354,8 +361,8 @@
<option id="com.qnx.qcc.option.linker.debug.161202499" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.1488258588" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.652702139" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
- <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Simulator}&quot;"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Simulator}&quot;"/>
</option>
<option id="com.qnx.qcc.option.linker.security.1521983401" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraries.413982604" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
View
6 Demos/BspDemo/.project
@@ -10,10 +10,6 @@
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
- <key>?children?</key>
- <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
- </dictionary>
- <dictionary>
<key>?name?</key>
<value></value>
</dictionary>
@@ -31,7 +27,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/BspDemo/Device-Debug}</value>
+ <value>${workspace_loc:/BspDemo/Device-Release}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
View
4 Demos/BspDemo/bar-descriptor.xml
@@ -68,9 +68,9 @@
<platformArchitecture>armle-v7</platformArchitecture>
<asset path="Device-Coverage/BspDemo" entry="true" type="Qnx/Elf">BspDemo</asset>
</configuration>
- <configuration id="com.qnx.qcc.configuration.exe.debug.238607602" name="Simulator-Debug">
+ <configuration id="com.qnx.qcc.configuration.exe.debug.238607602" name="Simulator">
<platformArchitecture>x86</platformArchitecture>
- <asset path="Simulator-Debug/BspDemo" entry="true" type="Qnx/Elf">BspDemo</asset>
+ <asset path="Simulator/BspDemo" entry="true" type="Qnx/Elf">BspDemo</asset>
</configuration>
<configuration id="com.qnx.qcc.configuration.exe.profile.1096832748" name="Simulator-Profile">
<platformArchitecture>x86</platformArchitecture>
View
13 Demos/OpenGL/.cproject
@@ -40,9 +40,12 @@
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/src}&quot;"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.1559448210" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <option id="com.qnx.qcc.option.compiler.ccoptions.1559448210" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-mfpu=neon"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.728933212" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.1095326077" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.28413671" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -101,9 +104,12 @@
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/src}&quot;"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.1770168523" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <option id="com.qnx.qcc.option.compiler.ccoptions.1770168523" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-mfpu=neon"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.285659867" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.1119386050" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.557867721" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -280,6 +286,9 @@
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/src}&quot;"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.qccoptions.1348531198" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-Wno-psabi"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.2029209548" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.952060804" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
View
6 Demos/OpenGL/.project
@@ -11,10 +11,6 @@
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
- <key>?children?</key>
- <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
- </dictionary>
- <dictionary>
<key>?name?</key>
<value></value>
</dictionary>
@@ -32,7 +28,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/BulletOpenGL/Device-Debug}</value>
+ <value>${workspace_loc:/BulletOpenGL/Device-Release}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
View
4 qnx/Bullet/common.mk
@@ -8,6 +8,8 @@ NAME=Bullet
# Suppress the _g suffix from the debug variant
BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE))
+CCFLAGS += -DBT_USE_NEON -mfpu=neon
+
#===== EXTRA_INCVPATH - a space-separated list of directories to search for include files.
EXTRA_INCVPATH+=$(PRODUCT_ROOT)/../../Bullet/src
@@ -32,4 +34,4 @@ 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)))
+OPTIMIZE_TYPE=$(OPTIMIZE_TYPE_$(filter g, $(VARIANTS)))
View
4 src/LinearMath/btVector3.cpp
@@ -812,7 +812,7 @@ long _mindot_large( const float *vv, const float *vec, unsigned long count, floa
}
-#elif defined BT_USE_NEON
+#elif defined (__APPLE__) && defined (BT_USE_NEON)
#define ARM_NEON_GCC_COMPATIBILITY 1
#include <arm_neon.h>
@@ -1622,7 +1622,7 @@ long _mindot_large_v1( const float *vv, const float *vec, unsigned long count, f
}
-#else
+#elif defined (__APPLE__)
#error Unhandled __APPLE__ arch
#endif
View
4 src/LinearMath/btVector3.h
@@ -143,7 +143,9 @@ ATTRIBUTE_ALIGNED16(class) btVector3
{
mVec128 = rhs.mVec128;
}
+#endif // #if (defined (BT_USE_SSE_IN_API) && defined (BT_USE_SSE) )|| defined (BT_USE_NEON)
+#if (defined (BT_USE_SSE_IN_API) && defined (BT_USE_SSE) ) || (defined (__APPLE__) && defined (BT_USE_NEON))
// Assignment Operator
SIMD_FORCE_INLINE btVector3&
operator=(const btVector3& v)
@@ -152,7 +154,7 @@ ATTRIBUTE_ALIGNED16(class) btVector3
return *this;
}
-#endif // #if defined (BT_USE_SSE_IN_API) || defined (BT_USE_NEON)
+#endif // #if (defined (BT_USE_SSE_IN_API) && defined (BT_USE_SSE) ) || (defined (__APPLE__) && defined (BT_USE_NEON))
/**@brief Add a vector to this one
* @param The vector to add to this one */

0 comments on commit e7a6896

Please sign in to comment.