Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Make demo configuration names consistent with libs.

Add NEON flags to qnx make file.

Suppress PSABI warnings.
  • Loading branch information...
commit 72668a834b780fefe4367df4e0197e29d5b15aab 1 parent 29286f3
Ken Whatmough kwhatmough authored
13 .cproject
@@ -36,9 +36,12 @@
36 36 <listOptionValue builtIn="false" value="C:/bbndk-2.0.1/target/target-override/usr/include"/>
37 37 <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
38 38 </option>
39   - <option id="com.qnx.qcc.option.compiler.ccoptions.1742615649" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
  39 + <option id="com.qnx.qcc.option.compiler.ccoptions.1742615649" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
40 40 <listOptionValue builtIn="false" value="-mfpu=neon"/>
41 41 </option>
  42 + <option id="com.qnx.qcc.option.compiler.qccoptions.1458154112" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  43 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  44 + </option>
42 45 <inputType id="com.qnx.qcc.inputType.compiler.394065364" superClass="com.qnx.qcc.inputType.compiler"/>
43 46 </tool>
44 47 <tool id="com.qnx.qcc.tool.assembler.450648636" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -100,9 +103,12 @@
100 103 <listOptionValue builtIn="false" value="C:/bbndk-2.0.1/target/target-override/usr/include"/>
101 104 <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
102 105 </option>
103   - <option id="com.qnx.qcc.option.compiler.ccoptions.564956055" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
  106 + <option id="com.qnx.qcc.option.compiler.ccoptions.564956055" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
104 107 <listOptionValue builtIn="false" value="-mfpu=neon"/>
105 108 </option>
  109 + <option id="com.qnx.qcc.option.compiler.qccoptions.371366966" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  110 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  111 + </option>
106 112 <inputType id="com.qnx.qcc.inputType.compiler.1298308727" superClass="com.qnx.qcc.inputType.compiler"/>
107 113 </tool>
108 114 <tool id="com.qnx.qcc.tool.assembler.2087027974" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -284,6 +290,9 @@
284 290 <listOptionValue builtIn="false" value="C:/bbndk-2.0.1/target/target-override/usr/include"/>
285 291 <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
286 292 </option>
  293 + <option id="com.qnx.qcc.option.compiler.qccoptions.1334844926" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  294 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  295 + </option>
287 296 <inputType id="com.qnx.qcc.inputType.compiler.656604421" superClass="com.qnx.qcc.inputType.compiler"/>
288 297 </tool>
289 298 <tool id="com.qnx.qcc.tool.assembler.768977308" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
2  .project
@@ -27,7 +27,7 @@
27 27 </dictionary>
28 28 <dictionary>
29 29 <key>org.eclipse.cdt.make.core.buildLocation</key>
30   - <value>${workspace_loc:/bullet/Device-Debug}</value>
  30 + <value>${workspace_loc:/bullet/Device-Release}</value>
31 31 </dictionary>
32 32 <dictionary>
33 33 <key>org.eclipse.cdt.make.core.contents</key>
27 Demos/BasicDemo/.cproject
@@ -44,9 +44,12 @@
44 44 <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
45 45 <listOptionValue builtIn="false" value="BT_USE_NEON"/>
46 46 </option>
47   - <option id="com.qnx.qcc.option.compiler.ccoptions.1395330943" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
  47 + <option id="com.qnx.qcc.option.compiler.ccoptions.1395330943" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
48 48 <listOptionValue builtIn="false" value="-mfpu=neon"/>
49 49 </option>
  50 + <option id="com.qnx.qcc.option.compiler.qccoptions.1183184496" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  51 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  52 + </option>
50 53 <inputType id="com.qnx.qcc.inputType.compiler.1715629603" superClass="com.qnx.qcc.inputType.compiler"/>
51 54 </tool>
52 55 <tool id="com.qnx.qcc.tool.assembler.1455826248" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -122,11 +125,12 @@
122 125 <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
123 126 <listOptionValue builtIn="false" value="BT_USE_NEON"/>
124 127 </option>
125   - <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"/>
  128 + <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"/>
126 129 <option id="com.qnx.qcc.option.compiler.qccoptions.1659042578" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
127 130 <listOptionValue builtIn="false" value="-frecord-gcc-switches"/>
  131 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
128 132 </option>
129   - <option id="com.qnx.qcc.option.compiler.ccoptions.1628464982" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
  133 + <option id="com.qnx.qcc.option.compiler.ccoptions.1628464982" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
130 134 <listOptionValue builtIn="false" value="-mfpu=neon"/>
131 135 </option>
132 136 <inputType id="com.qnx.qcc.inputType.compiler.1561860142" superClass="com.qnx.qcc.inputType.compiler"/>
@@ -137,10 +141,10 @@
137 141 <tool id="com.qnx.qcc.tool.linker.2027020811" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
138 142 <option id="com.qnx.qcc.option.linker.langcpp.317203576" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
139 143 <option id="com.qnx.qcc.option.linker.libraryPaths.713857295" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
140   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
141   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
  144 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Release}&quot;"/>
  145 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Release}&quot;"/>
142 146 </option>
143   - <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"/>
  147 + <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"/>
144 148 <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"/>
145 149 <option id="com.qnx.qcc.option.linker.libraries.1391109742" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
146 150 <listOptionValue builtIn="false" value="GLESv1_CM"/>
@@ -316,7 +320,7 @@
316 320 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
317 321 </cconfiguration>
318 322 <cconfiguration id="com.qnx.qcc.configuration.exe.debug.1176710407">
319   - <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">
  323 + <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.exe.debug.1176710407" moduleId="org.eclipse.cdt.core.settings" name="Simulator">
320 324 <externalSettings/>
321 325 <extensions>
322 326 <extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -326,7 +330,7 @@
326 330 </extensions>
327 331 </storageModule>
328 332 <storageModule moduleId="cdtBuildSystem" version="4.0.0">
329   - <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">
  333 + <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">
330 334 <folderInfo id="com.qnx.qcc.configuration.exe.debug.1176710407." name="/" resourcePath="">
331 335 <toolChain id="com.qnx.qcc.toolChain.exe.debug.879152398" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
332 336 <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 @@
344 348 <option id="com.qnx.qcc.option.compiler.defines.994981406" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
345 349 <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
346 350 </option>
  351 + <option id="com.qnx.qcc.option.compiler.qccoptions.932027476" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  352 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  353 + </option>
347 354 <inputType id="com.qnx.qcc.inputType.compiler.1682870676" superClass="com.qnx.qcc.inputType.compiler"/>
348 355 </tool>
349 356 <tool id="com.qnx.qcc.tool.assembler.1325752781" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -354,8 +361,8 @@
354 361 <option id="com.qnx.qcc.option.linker.debug.870251140" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
355 362 <option id="com.qnx.qcc.option.linker.langcpp.1953721982" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
356 363 <option id="com.qnx.qcc.option.linker.libraryPaths.1903697911" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
357   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
358   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
  364 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Simulator}&quot;"/>
  365 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Simulator}&quot;"/>
359 366 </option>
360 367 <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"/>
361 368 <option id="com.qnx.qcc.option.linker.libraries.1746571984" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
6 Demos/BasicDemo/.project
@@ -12,10 +12,6 @@
12 12 <triggers>clean,full,incremental,</triggers>
13 13 <arguments>
14 14 <dictionary>
15   - <key>?children?</key>
16   - <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
17   - </dictionary>
18   - <dictionary>
19 15 <key>?name?</key>
20 16 <value></value>
21 17 </dictionary>
@@ -33,7 +29,7 @@
33 29 </dictionary>
34 30 <dictionary>
35 31 <key>org.eclipse.cdt.make.core.buildLocation</key>
36   - <value>${workspace_loc:/BasicDemo/Device-Debug}</value>
  32 + <value>${workspace_loc:/BasicDemo/Device-Release}</value>
37 33 </dictionary>
38 34 <dictionary>
39 35 <key>org.eclipse.cdt.make.core.contents</key>
4 Demos/BasicDemo/bar-descriptor.xml
@@ -66,9 +66,9 @@
66 66 <platformArchitecture>armle-v7</platformArchitecture>
67 67 <asset path="Device-Coverage/BasicDemo" entry="true" type="Qnx/Elf">BasicDemo</asset>
68 68 </configuration>
69   - <configuration id="com.qnx.qcc.configuration.exe.debug.1176710407" name="Simulator-Debug">
  69 + <configuration id="com.qnx.qcc.configuration.exe.debug.1176710407" name="Simulator">
70 70 <platformArchitecture>x86</platformArchitecture>
71   - <asset path="Simulator-Debug/BasicDemo" entry="true" type="Qnx/Elf">BasicDemo</asset>
  71 + <asset path="Simulator/BasicDemo" entry="true" type="Qnx/Elf">BasicDemo</asset>
72 72 </configuration>
73 73 <configuration id="com.qnx.qcc.configuration.exe.profile.918794581" name="Simulator-Profile">
74 74 <platformArchitecture>x86</platformArchitecture>
27 Demos/Box2dDemo/.cproject
@@ -44,9 +44,12 @@
44 44 <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
45 45 <listOptionValue builtIn="false" value="BT_USE_NEON"/>
46 46 </option>
47   - <option id="com.qnx.qcc.option.compiler.ccoptions.1507577269" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
  47 + <option id="com.qnx.qcc.option.compiler.ccoptions.1507577269" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
48 48 <listOptionValue builtIn="false" value="-mfpu=neon"/>
49 49 </option>
  50 + <option id="com.qnx.qcc.option.compiler.qccoptions.1714159309" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  51 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  52 + </option>
50 53 <inputType id="com.qnx.qcc.inputType.compiler.633440019" superClass="com.qnx.qcc.inputType.compiler"/>
51 54 </tool>
52 55 <tool id="com.qnx.qcc.tool.assembler.191747342" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -122,11 +125,12 @@
122 125 <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
123 126 <listOptionValue builtIn="false" value="BT_USE_NEON"/>
124 127 </option>
125   - <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"/>
  128 + <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"/>
126 129 <option id="com.qnx.qcc.option.compiler.qccoptions.1183238197" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
127 130 <listOptionValue builtIn="false" value="-frecord-gcc-switches"/>
  131 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
128 132 </option>
129   - <option id="com.qnx.qcc.option.compiler.ccoptions.102455466" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
  133 + <option id="com.qnx.qcc.option.compiler.ccoptions.102455466" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
130 134 <listOptionValue builtIn="false" value="-mfpu=neon"/>
131 135 </option>
132 136 <inputType id="com.qnx.qcc.inputType.compiler.33999560" superClass="com.qnx.qcc.inputType.compiler"/>
@@ -141,10 +145,10 @@
141 145 <tool id="com.qnx.qcc.tool.linker.1577451562" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
142 146 <option id="com.qnx.qcc.option.linker.langcpp.1410327879" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
143 147 <option id="com.qnx.qcc.option.linker.libraryPaths.2009148239" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
144   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
145   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
  148 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Release}&quot;"/>
  149 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Release}&quot;"/>
146 150 </option>
147   - <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"/>
  151 + <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"/>
148 152 <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"/>
149 153 <option id="com.qnx.qcc.option.linker.libraries.2050011064" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
150 154 <listOptionValue builtIn="false" value="GLESv1_CM"/>
@@ -328,7 +332,7 @@
328 332 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
329 333 </cconfiguration>
330 334 <cconfiguration id="com.qnx.qcc.configuration.exe.debug.1963364241">
331   - <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">
  335 + <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.exe.debug.1963364241" moduleId="org.eclipse.cdt.core.settings" name="Simulator">
332 336 <externalSettings/>
333 337 <extensions>
334 338 <extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -338,7 +342,7 @@
338 342 </extensions>
339 343 </storageModule>
340 344 <storageModule moduleId="cdtBuildSystem" version="4.0.0">
341   - <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">
  345 + <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">
342 346 <folderInfo id="com.qnx.qcc.configuration.exe.debug.1963364241." name="/" resourcePath="">
343 347 <toolChain id="com.qnx.qcc.toolChain.exe.debug.1983960472" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
344 348 <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 @@
356 360 <option id="com.qnx.qcc.option.compiler.defines.1250420594" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
357 361 <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
358 362 </option>
  363 + <option id="com.qnx.qcc.option.compiler.qccoptions.1663222850" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  364 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  365 + </option>
359 366 <inputType id="com.qnx.qcc.inputType.compiler.1558336047" superClass="com.qnx.qcc.inputType.compiler"/>
360 367 </tool>
361 368 <tool id="com.qnx.qcc.tool.assembler.709666112" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -370,8 +377,8 @@
370 377 <option id="com.qnx.qcc.option.linker.debug.1755123712" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
371 378 <option id="com.qnx.qcc.option.linker.langcpp.815824681" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
372 379 <option id="com.qnx.qcc.option.linker.libraryPaths.646442818" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
373   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
374   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
  380 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Simulator}&quot;"/>
  381 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Simulator}&quot;"/>
375 382 </option>
376 383 <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"/>
377 384 <option id="com.qnx.qcc.option.linker.libraries.1226405511" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
6 Demos/Box2dDemo/.project
@@ -12,10 +12,6 @@
12 12 <triggers>clean,full,incremental,</triggers>
13 13 <arguments>
14 14 <dictionary>
15   - <key>?children?</key>
16   - <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
17   - </dictionary>
18   - <dictionary>
19 15 <key>?name?</key>
20 16 <value></value>
21 17 </dictionary>
@@ -33,7 +29,7 @@
33 29 </dictionary>
34 30 <dictionary>
35 31 <key>org.eclipse.cdt.make.core.buildLocation</key>
36   - <value>${workspace_loc:/Box2dDemo/Device-Debug}</value>
  32 + <value>${workspace_loc:/Box2dDemo/Device-Release}</value>
37 33 </dictionary>
38 34 <dictionary>
39 35 <key>org.eclipse.cdt.make.core.contents</key>
4 Demos/Box2dDemo/bar-descriptor.xml
@@ -65,9 +65,9 @@
65 65 <platformArchitecture>armle-v7</platformArchitecture>
66 66 <asset path="Device-Coverage/Box2dDemo" entry="true" type="Qnx/Elf">Box2dDemo</asset>
67 67 </configuration>
68   - <configuration id="com.qnx.qcc.configuration.exe.debug.1963364241" name="Simulator-Debug">
  68 + <configuration id="com.qnx.qcc.configuration.exe.debug.1963364241" name="Simulator">
69 69 <platformArchitecture>x86</platformArchitecture>
70   - <asset path="Simulator-Debug/Box2dDemo" entry="true" type="Qnx/Elf">Box2dDemo</asset>
  70 + <asset path="Simulator/Box2dDemo" entry="true" type="Qnx/Elf">Box2dDemo</asset>
71 71 </configuration>
72 72 <configuration id="com.qnx.qcc.configuration.exe.profile.142872959" name="Simulator-Profile">
73 73 <platformArchitecture>x86</platformArchitecture>
27 Demos/BspDemo/.cproject
@@ -44,9 +44,12 @@
44 44 <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
45 45 <listOptionValue builtIn="false" value="BT_USE_NEON"/>
46 46 </option>
47   - <option id="com.qnx.qcc.option.compiler.ccoptions.319789781" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
  47 + <option id="com.qnx.qcc.option.compiler.ccoptions.319789781" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
48 48 <listOptionValue builtIn="false" value="-mfpu=neon"/>
49 49 </option>
  50 + <option id="com.qnx.qcc.option.compiler.qccoptions.2015395244" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  51 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  52 + </option>
50 53 <inputType id="com.qnx.qcc.inputType.compiler.370944642" superClass="com.qnx.qcc.inputType.compiler"/>
51 54 </tool>
52 55 <tool id="com.qnx.qcc.tool.assembler.1354248732" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -122,11 +125,12 @@
122 125 <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
123 126 <listOptionValue builtIn="false" value="BT_USE_NEON"/>
124 127 </option>
125   - <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"/>
  128 + <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"/>
126 129 <option id="com.qnx.qcc.option.compiler.qccoptions.756631364" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
127 130 <listOptionValue builtIn="false" value="-frecord-gcc-switches"/>
  131 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
128 132 </option>
129   - <option id="com.qnx.qcc.option.compiler.ccoptions.262053334" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
  133 + <option id="com.qnx.qcc.option.compiler.ccoptions.262053334" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
130 134 <listOptionValue builtIn="false" value="-mfpu=neon"/>
131 135 </option>
132 136 <inputType id="com.qnx.qcc.inputType.compiler.1737231742" superClass="com.qnx.qcc.inputType.compiler"/>
@@ -137,10 +141,10 @@
137 141 <tool id="com.qnx.qcc.tool.linker.390914368" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
138 142 <option id="com.qnx.qcc.option.linker.langcpp.1756928081" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
139 143 <option id="com.qnx.qcc.option.linker.libraryPaths.401577791" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
140   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
141   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
  144 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Release}&quot;"/>
  145 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Release}&quot;"/>
142 146 </option>
143   - <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"/>
  147 + <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"/>
144 148 <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"/>
145 149 <option id="com.qnx.qcc.option.linker.libraries.845786110" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
146 150 <listOptionValue builtIn="false" value="GLESv1_CM"/>
@@ -316,7 +320,7 @@
316 320 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
317 321 </cconfiguration>
318 322 <cconfiguration id="com.qnx.qcc.configuration.exe.debug.238607602">
319   - <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">
  323 + <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.qnx.qcc.configuration.exe.debug.238607602" moduleId="org.eclipse.cdt.core.settings" name="Simulator">
320 324 <externalSettings/>
321 325 <extensions>
322 326 <extension id="com.qnx.tools.ide.qde.core.QDEBynaryParser" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -326,7 +330,7 @@
326 330 </extensions>
327 331 </storageModule>
328 332 <storageModule moduleId="cdtBuildSystem" version="4.0.0">
329   - <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">
  333 + <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">
330 334 <folderInfo id="com.qnx.qcc.configuration.exe.debug.238607602." name="/" resourcePath="">
331 335 <toolChain id="com.qnx.qcc.toolChain.exe.debug.903740906" name="QNX QCC" superClass="com.qnx.qcc.toolChain">
332 336 <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 @@
344 348 <option id="com.qnx.qcc.option.compiler.defines.813869086" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
345 349 <listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
346 350 </option>
  351 + <option id="com.qnx.qcc.option.compiler.qccoptions.190848592" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  352 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  353 + </option>
347 354 <inputType id="com.qnx.qcc.inputType.compiler.1412042828" superClass="com.qnx.qcc.inputType.compiler"/>
348 355 </tool>
349 356 <tool id="com.qnx.qcc.tool.assembler.1411596071" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -354,8 +361,8 @@
354 361 <option id="com.qnx.qcc.option.linker.debug.161202499" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
355 362 <option id="com.qnx.qcc.option.linker.langcpp.1488258588" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
356 363 <option id="com.qnx.qcc.option.linker.libraryPaths.652702139" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
357   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Device-Debug}&quot;"/>
358   - <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Device-Debug}&quot;"/>
  364 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/Simulator}&quot;"/>
  365 + <listOptionValue builtIn="false" value="&quot;${workspace_loc:/BulletOpenGL/Simulator}&quot;"/>
359 366 </option>
360 367 <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"/>
361 368 <option id="com.qnx.qcc.option.linker.libraries.413982604" name="Libraries (-l)" superClass="com.qnx.qcc.option.linker.libraries" valueType="libs">
6 Demos/BspDemo/.project
@@ -10,10 +10,6 @@
10 10 <triggers>clean,full,incremental,</triggers>
11 11 <arguments>
12 12 <dictionary>
13   - <key>?children?</key>
14   - <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
15   - </dictionary>
16   - <dictionary>
17 13 <key>?name?</key>
18 14 <value></value>
19 15 </dictionary>
@@ -31,7 +27,7 @@
31 27 </dictionary>
32 28 <dictionary>
33 29 <key>org.eclipse.cdt.make.core.buildLocation</key>
34   - <value>${workspace_loc:/BspDemo/Device-Debug}</value>
  30 + <value>${workspace_loc:/BspDemo/Device-Release}</value>
35 31 </dictionary>
36 32 <dictionary>
37 33 <key>org.eclipse.cdt.make.core.contents</key>
4 Demos/BspDemo/bar-descriptor.xml
@@ -68,9 +68,9 @@
68 68 <platformArchitecture>armle-v7</platformArchitecture>
69 69 <asset path="Device-Coverage/BspDemo" entry="true" type="Qnx/Elf">BspDemo</asset>
70 70 </configuration>
71   - <configuration id="com.qnx.qcc.configuration.exe.debug.238607602" name="Simulator-Debug">
  71 + <configuration id="com.qnx.qcc.configuration.exe.debug.238607602" name="Simulator">
72 72 <platformArchitecture>x86</platformArchitecture>
73   - <asset path="Simulator-Debug/BspDemo" entry="true" type="Qnx/Elf">BspDemo</asset>
  73 + <asset path="Simulator/BspDemo" entry="true" type="Qnx/Elf">BspDemo</asset>
74 74 </configuration>
75 75 <configuration id="com.qnx.qcc.configuration.exe.profile.1096832748" name="Simulator-Profile">
76 76 <platformArchitecture>x86</platformArchitecture>
13 Demos/OpenGL/.cproject
@@ -40,9 +40,12 @@
40 40 <listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
41 41 <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/src}&quot;"/>
42 42 </option>
43   - <option id="com.qnx.qcc.option.compiler.ccoptions.1559448210" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
  43 + <option id="com.qnx.qcc.option.compiler.ccoptions.1559448210" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
44 44 <listOptionValue builtIn="false" value="-mfpu=neon"/>
45 45 </option>
  46 + <option id="com.qnx.qcc.option.compiler.qccoptions.728933212" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  47 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  48 + </option>
46 49 <inputType id="com.qnx.qcc.inputType.compiler.1095326077" superClass="com.qnx.qcc.inputType.compiler"/>
47 50 </tool>
48 51 <tool id="com.qnx.qcc.tool.assembler.28413671" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -101,9 +104,12 @@
101 104 <listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
102 105 <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/src}&quot;"/>
103 106 </option>
104   - <option id="com.qnx.qcc.option.compiler.ccoptions.1770168523" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
  107 + <option id="com.qnx.qcc.option.compiler.ccoptions.1770168523" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
105 108 <listOptionValue builtIn="false" value="-mfpu=neon"/>
106 109 </option>
  110 + <option id="com.qnx.qcc.option.compiler.qccoptions.285659867" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  111 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  112 + </option>
107 113 <inputType id="com.qnx.qcc.inputType.compiler.1119386050" superClass="com.qnx.qcc.inputType.compiler"/>
108 114 </tool>
109 115 <tool id="com.qnx.qcc.tool.assembler.557867721" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -280,6 +286,9 @@
280 286 <listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
281 287 <listOptionValue builtIn="false" value="&quot;${workspace_loc:/Bullet/src}&quot;"/>
282 288 </option>
  289 + <option id="com.qnx.qcc.option.compiler.qccoptions.1348531198" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
  290 + <listOptionValue builtIn="false" value="-Wno-psabi"/>
  291 + </option>
283 292 <inputType id="com.qnx.qcc.inputType.compiler.2029209548" superClass="com.qnx.qcc.inputType.compiler"/>
284 293 </tool>
285 294 <tool id="com.qnx.qcc.tool.assembler.952060804" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
6 Demos/OpenGL/.project
@@ -11,10 +11,6 @@
11 11 <triggers>clean,full,incremental,</triggers>
12 12 <arguments>
13 13 <dictionary>
14   - <key>?children?</key>
15   - <value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
16   - </dictionary>
17   - <dictionary>
18 14 <key>?name?</key>
19 15 <value></value>
20 16 </dictionary>
@@ -32,7 +28,7 @@
32 28 </dictionary>
33 29 <dictionary>
34 30 <key>org.eclipse.cdt.make.core.buildLocation</key>
35   - <value>${workspace_loc:/BulletOpenGL/Device-Debug}</value>
  31 + <value>${workspace_loc:/BulletOpenGL/Device-Release}</value>
36 32 </dictionary>
37 33 <dictionary>
38 34 <key>org.eclipse.cdt.make.core.contents</key>
4 qnx/Bullet/common.mk
@@ -8,6 +8,8 @@ NAME=Bullet
8 8 # Suppress the _g suffix from the debug variant
9 9 BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE))
10 10
  11 +CCFLAGS += -DBT_USE_NEON -mfpu=neon
  12 +
11 13 #===== EXTRA_INCVPATH - a space-separated list of directories to search for include files.
12 14 EXTRA_INCVPATH+=$(PRODUCT_ROOT)/../../Bullet/src
13 15
@@ -32,4 +34,4 @@ BUILDNAME=$(IMAGE_PREF_$(BUILD_TYPE))$(NAME)$(IMAGE_SUFF_$(BUILD_TYPE))
32 34 include $(MKFILES_ROOT)/qtargets.mk
33 35
34 36 OPTIMIZE_TYPE_g=none
35   -OPTIMIZE_TYPE=$(OPTIMIZE_TYPE_$(filter g, $(VARIANTS)))
  37 +OPTIMIZE_TYPE=$(OPTIMIZE_TYPE_$(filter g, $(VARIANTS)))
4 src/LinearMath/btVector3.cpp
@@ -812,7 +812,7 @@ long _mindot_large( const float *vv, const float *vec, unsigned long count, floa
812 812 }
813 813
814 814
815   -#elif defined BT_USE_NEON
  815 +#elif defined (__APPLE__) && defined (BT_USE_NEON)
816 816 #define ARM_NEON_GCC_COMPATIBILITY 1
817 817 #include <arm_neon.h>
818 818
@@ -1622,7 +1622,7 @@ long _mindot_large_v1( const float *vv, const float *vec, unsigned long count, f
1622 1622
1623 1623 }
1624 1624
1625   -#else
  1625 +#elif defined (__APPLE__)
1626 1626 #error Unhandled __APPLE__ arch
1627 1627 #endif
1628 1628
4 src/LinearMath/btVector3.h
@@ -143,7 +143,9 @@ ATTRIBUTE_ALIGNED16(class) btVector3
143 143 {
144 144 mVec128 = rhs.mVec128;
145 145 }
  146 +#endif // #if (defined (BT_USE_SSE_IN_API) && defined (BT_USE_SSE) )|| defined (BT_USE_NEON)
146 147
  148 +#if (defined (BT_USE_SSE_IN_API) && defined (BT_USE_SSE) ) || (defined (__APPLE__) && defined (BT_USE_NEON))
147 149 // Assignment Operator
148 150 SIMD_FORCE_INLINE btVector3&
149 151 operator=(const btVector3& v)
@@ -152,7 +154,7 @@ ATTRIBUTE_ALIGNED16(class) btVector3
152 154
153 155 return *this;
154 156 }
155   -#endif // #if defined (BT_USE_SSE_IN_API) || defined (BT_USE_NEON)
  157 +#endif // #if (defined (BT_USE_SSE_IN_API) && defined (BT_USE_SSE) ) || (defined (__APPLE__) && defined (BT_USE_NEON))
156 158
157 159 /**@brief Add a vector to this one
158 160 * @param The vector to add to this one */

0 comments on commit 72668a8

Please sign in to comment.
Something went wrong with that request. Please try again.