diff --git a/pkg/qnx/bb10/.cproject b/pkg/qnx/bb10/.cproject
index 12220d9e37..646087b60a 100644
--- a/pkg/qnx/bb10/.cproject
+++ b/pkg/qnx/bb10/.cproject
@@ -29,6 +29,7 @@
 								<option id="com.qnx.qcc.option.compiler.security.1348091274" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
 								<option id="com.qnx.qcc.option.compiler.defines.107606349" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HAVE_RPNG"/>
+									<listOptionValue builtIn="false" value="HAVE_OPENGL"/>
 									<listOptionValue builtIn="false" value="HAVE_BB10"/>
 									<listOptionValue builtIn="false" value="HAVE_EGL"/>
 									<listOptionValue builtIn="false" value="HAVE_RJPEG"/>
@@ -37,7 +38,6 @@
 									<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
 									<listOptionValue builtIn="false" value="HAVE_ALSA"/>
 									<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
-									<listOptionValue builtIn="false" value="HAVE_MAIN"/>
 									<listOptionValue builtIn="false" value="HAVE_XMB"/>
 									<listOptionValue builtIn="false" value="HAVE_GLUI"/>
 									<listOptionValue builtIn="false" value="HAVE_RGUI"/>
@@ -101,16 +101,6 @@
 							<tool id="com.qnx.qcc.tool.archiver.235941332" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="com.qnx.qcc.configuration.exe.debug.381170420.973423226" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.2035959754.347573070">
-						<tool id="com.qnx.qcc.tool.assembler.2035959754.347573070" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.2035959754">
-							<option id="com.qnx.qcc.option.assembler.qccoptions.1775882432" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
-								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
-								<listOptionValue builtIn="false" value="-marm"/>
-								<listOptionValue builtIn="false" value="-mfpu=neon"/>
-							</option>
-							<inputType id="com.qnx.qcc.inputType.assembler.1121112632" superClass="com.qnx.qcc.inputType.assembler"/>
-						</tool>
-					</fileInfo>
 					<fileInfo id="com.qnx.qcc.configuration.exe.debug.381170420.1258732047" name="sinc_neon.S" rcbsApplicability="disable" resourcePath="src/sinc_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.2035959754.991633861">
 						<tool command="qcc" commandLinePattern="${COMMAND}  ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS} ${FLAGS}" id="com.qnx.qcc.tool.assembler.2035959754.991633861" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.2035959754">
 							<option id="com.qnx.qcc.option.assembler.qccoptions.1129161676" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
@@ -121,6 +111,16 @@
 							<inputType id="com.qnx.qcc.inputType.assembler.1085916531" superClass="com.qnx.qcc.inputType.assembler"/>
 						</tool>
 					</fileInfo>
+					<fileInfo id="com.qnx.qcc.configuration.exe.debug.381170420.973423226" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.2035959754.347573070">
+						<tool id="com.qnx.qcc.tool.assembler.2035959754.347573070" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.2035959754">
+							<option id="com.qnx.qcc.option.assembler.qccoptions.1775882432" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
+								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
+								<listOptionValue builtIn="false" value="-marm"/>
+								<listOptionValue builtIn="false" value="-mfpu=neon"/>
+							</option>
+							<inputType id="com.qnx.qcc.inputType.assembler.1121112632" superClass="com.qnx.qcc.inputType.assembler"/>
+						</tool>
+					</fileInfo>
 					<sourceEntries>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
 					</sourceEntries>
@@ -155,6 +155,7 @@
 								<option id="com.qnx.qcc.option.compiler.security.1255305436" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
 								<option id="com.qnx.qcc.option.compiler.defines.1244683608" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HAVE_RPNG"/>
+									<listOptionValue builtIn="false" value="HAVE_OPENGL"/>
 									<listOptionValue builtIn="false" value="HAVE_BB10"/>
 									<listOptionValue builtIn="false" value="HAVE_EGL"/>
 									<listOptionValue builtIn="false" value="HAVE_RJPEG"/>
@@ -163,7 +164,6 @@
 									<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
 									<listOptionValue builtIn="false" value="HAVE_ALSA"/>
 									<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
-									<listOptionValue builtIn="false" value="HAVE_MAIN"/>
 									<listOptionValue builtIn="false" value="HAVE_XMB"/>
 									<listOptionValue builtIn="false" value="HAVE_GLUI"/>
 									<listOptionValue builtIn="false" value="HAVE_RGUI"/>
@@ -227,16 +227,6 @@
 							<tool id="com.qnx.qcc.tool.archiver.1590791010" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="com.qnx.qcc.configuration.exe.release.648144057.1910510900" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.599691721.237427487">
-						<tool id="com.qnx.qcc.tool.assembler.599691721.237427487" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.599691721">
-							<option id="com.qnx.qcc.option.assembler.qccoptions.1196541901" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
-								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
-								<listOptionValue builtIn="false" value="-marm"/>
-								<listOptionValue builtIn="false" value="-mfpu=neon"/>
-							</option>
-							<inputType id="com.qnx.qcc.inputType.assembler.1045628756" superClass="com.qnx.qcc.inputType.assembler"/>
-						</tool>
-					</fileInfo>
 					<fileInfo id="com.qnx.qcc.configuration.exe.release.648144057.1567247301" name="sinc_neon.S" rcbsApplicability="disable" resourcePath="src/sinc_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.599691721.61424297">
 						<tool id="com.qnx.qcc.tool.assembler.599691721.61424297" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.599691721">
 							<option id="com.qnx.qcc.option.assembler.qccoptions.1232679431" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
@@ -247,6 +237,16 @@
 							<inputType id="com.qnx.qcc.inputType.assembler.1064746892" superClass="com.qnx.qcc.inputType.assembler"/>
 						</tool>
 					</fileInfo>
+					<fileInfo id="com.qnx.qcc.configuration.exe.release.648144057.1910510900" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.599691721.237427487">
+						<tool id="com.qnx.qcc.tool.assembler.599691721.237427487" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.599691721">
+							<option id="com.qnx.qcc.option.assembler.qccoptions.1196541901" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
+								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
+								<listOptionValue builtIn="false" value="-marm"/>
+								<listOptionValue builtIn="false" value="-mfpu=neon"/>
+							</option>
+							<inputType id="com.qnx.qcc.inputType.assembler.1045628756" superClass="com.qnx.qcc.inputType.assembler"/>
+						</tool>
+					</fileInfo>
 					<sourceEntries>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
 					</sourceEntries>
@@ -283,6 +283,7 @@
 								<option id="com.qnx.qcc.option.compiler.security.700151333" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
 								<option id="com.qnx.qcc.option.compiler.defines.1248635115" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HAVE_RPNG"/>
+									<listOptionValue builtIn="false" value="HAVE_OPENGL"/>
 									<listOptionValue builtIn="false" value="HAVE_BB10"/>
 									<listOptionValue builtIn="false" value="HAVE_EGL"/>
 									<listOptionValue builtIn="false" value="HAVE_RJPEG"/>
@@ -291,7 +292,6 @@
 									<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
 									<listOptionValue builtIn="false" value="HAVE_ALSA"/>
 									<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
-									<listOptionValue builtIn="false" value="HAVE_MAIN"/>
 									<listOptionValue builtIn="false" value="HAVE_XMB"/>
 									<listOptionValue builtIn="false" value="HAVE_GLUI"/>
 									<listOptionValue builtIn="false" value="HAVE_RGUI"/>
@@ -356,16 +356,6 @@
 							<tool id="com.qnx.qcc.tool.archiver.509463185" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="com.qnx.qcc.configuration.exe.profile.617031134.415465679" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.1306097437.609090486">
-						<tool id="com.qnx.qcc.tool.assembler.1306097437.609090486" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.1306097437">
-							<option id="com.qnx.qcc.option.assembler.qccoptions.1755349708" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
-								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
-								<listOptionValue builtIn="false" value="-marm"/>
-								<listOptionValue builtIn="false" value="-mfpu=neon"/>
-							</option>
-							<inputType id="com.qnx.qcc.inputType.assembler.2120030339" superClass="com.qnx.qcc.inputType.assembler"/>
-						</tool>
-					</fileInfo>
 					<fileInfo id="com.qnx.qcc.configuration.exe.profile.617031134.1663499231" name="sinc_neon.S" rcbsApplicability="disable" resourcePath="src/sinc_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.1306097437.1064225480">
 						<tool id="com.qnx.qcc.tool.assembler.1306097437.1064225480" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.1306097437">
 							<option id="com.qnx.qcc.option.assembler.qccoptions.655240149" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
@@ -376,6 +366,16 @@
 							<inputType id="com.qnx.qcc.inputType.assembler.1486816912" superClass="com.qnx.qcc.inputType.assembler"/>
 						</tool>
 					</fileInfo>
+					<fileInfo id="com.qnx.qcc.configuration.exe.profile.617031134.415465679" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.1306097437.609090486">
+						<tool id="com.qnx.qcc.tool.assembler.1306097437.609090486" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.1306097437">
+							<option id="com.qnx.qcc.option.assembler.qccoptions.1755349708" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
+								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
+								<listOptionValue builtIn="false" value="-marm"/>
+								<listOptionValue builtIn="false" value="-mfpu=neon"/>
+							</option>
+							<inputType id="com.qnx.qcc.inputType.assembler.2120030339" superClass="com.qnx.qcc.inputType.assembler"/>
+						</tool>
+					</fileInfo>
 					<sourceEntries>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
 					</sourceEntries>
@@ -412,6 +412,7 @@
 								<option id="com.qnx.qcc.option.compiler.security.2107949508" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
 								<option id="com.qnx.qcc.option.compiler.defines.1697783072" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HAVE_RPNG"/>
+									<listOptionValue builtIn="false" value="HAVE_OPENGL"/>
 									<listOptionValue builtIn="false" value="HAVE_BB10"/>
 									<listOptionValue builtIn="false" value="HAVE_EGL"/>
 									<listOptionValue builtIn="false" value="HAVE_RJPEG"/>
@@ -420,7 +421,6 @@
 									<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
 									<listOptionValue builtIn="false" value="HAVE_ALSA"/>
 									<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
-									<listOptionValue builtIn="false" value="HAVE_MAIN"/>
 									<listOptionValue builtIn="false" value="HAVE_XMB"/>
 									<listOptionValue builtIn="false" value="HAVE_GLUI"/>
 									<listOptionValue builtIn="false" value="HAVE_RGUI"/>
@@ -485,16 +485,6 @@
 							<tool id="com.qnx.qcc.tool.archiver.147959592" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="com.qnx.qcc.configuration.exe.profile.coverage.2128233679.536693408" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.483492359.168355956">
-						<tool id="com.qnx.qcc.tool.assembler.483492359.168355956" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.483492359">
-							<option id="com.qnx.qcc.option.assembler.qccoptions.107131003" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
-								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
-								<listOptionValue builtIn="false" value="-marm"/>
-								<listOptionValue builtIn="false" value="-mfpu=neon"/>
-							</option>
-							<inputType id="com.qnx.qcc.inputType.assembler.177597270" superClass="com.qnx.qcc.inputType.assembler"/>
-						</tool>
-					</fileInfo>
 					<fileInfo id="com.qnx.qcc.configuration.exe.profile.coverage.2128233679.502727032" name="sinc_neon.S" rcbsApplicability="disable" resourcePath="src/sinc_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.483492359.863211175">
 						<tool id="com.qnx.qcc.tool.assembler.483492359.863211175" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.483492359">
 							<option id="com.qnx.qcc.option.assembler.qccoptions.1877438134" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
@@ -505,6 +495,16 @@
 							<inputType id="com.qnx.qcc.inputType.assembler.1995010572" superClass="com.qnx.qcc.inputType.assembler"/>
 						</tool>
 					</fileInfo>
+					<fileInfo id="com.qnx.qcc.configuration.exe.profile.coverage.2128233679.536693408" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.483492359.168355956">
+						<tool id="com.qnx.qcc.tool.assembler.483492359.168355956" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.483492359">
+							<option id="com.qnx.qcc.option.assembler.qccoptions.107131003" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
+								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
+								<listOptionValue builtIn="false" value="-marm"/>
+								<listOptionValue builtIn="false" value="-mfpu=neon"/>
+							</option>
+							<inputType id="com.qnx.qcc.inputType.assembler.177597270" superClass="com.qnx.qcc.inputType.assembler"/>
+						</tool>
+					</fileInfo>
 					<sourceEntries>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
 					</sourceEntries>
@@ -539,6 +539,7 @@
 								<option id="com.qnx.qcc.option.compiler.security.1257406027" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
 								<option id="com.qnx.qcc.option.compiler.defines.1727063462" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HAVE_RPNG"/>
+									<listOptionValue builtIn="false" value="HAVE_OPENGL"/>
 									<listOptionValue builtIn="false" value="HAVE_BB10"/>
 									<listOptionValue builtIn="false" value="HAVE_EGL"/>
 									<listOptionValue builtIn="false" value="HAVE_RJPEG"/>
@@ -547,7 +548,6 @@
 									<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
 									<listOptionValue builtIn="false" value="HAVE_ALSA"/>
 									<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
-									<listOptionValue builtIn="false" value="HAVE_MAIN"/>
 									<listOptionValue builtIn="false" value="HAVE_XMB"/>
 									<listOptionValue builtIn="false" value="HAVE_GLUI"/>
 									<listOptionValue builtIn="false" value="HAVE_RGUI"/>
@@ -611,16 +611,6 @@
 							<tool id="com.qnx.qcc.tool.archiver.987519416" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="com.qnx.qcc.configuration.exe.debug.647263012.789881881" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.2099172774.690326989">
-						<tool id="com.qnx.qcc.tool.assembler.2099172774.690326989" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.2099172774">
-							<option id="com.qnx.qcc.option.assembler.qccoptions.258310796" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
-								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
-								<listOptionValue builtIn="false" value="-marm"/>
-								<listOptionValue builtIn="false" value="-mfpu=neon"/>
-							</option>
-							<inputType id="com.qnx.qcc.inputType.assembler.1709199876" superClass="com.qnx.qcc.inputType.assembler"/>
-						</tool>
-					</fileInfo>
 					<fileInfo id="com.qnx.qcc.configuration.exe.debug.647263012.1858756515" name="sinc_neon.S" rcbsApplicability="disable" resourcePath="src/sinc_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.2099172774.486453221">
 						<tool id="com.qnx.qcc.tool.assembler.2099172774.486453221" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.2099172774">
 							<option id="com.qnx.qcc.option.assembler.qccoptions.1756931693" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
@@ -631,6 +621,16 @@
 							<inputType id="com.qnx.qcc.inputType.assembler.919891290" superClass="com.qnx.qcc.inputType.assembler"/>
 						</tool>
 					</fileInfo>
+					<fileInfo id="com.qnx.qcc.configuration.exe.debug.647263012.789881881" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.2099172774.690326989">
+						<tool id="com.qnx.qcc.tool.assembler.2099172774.690326989" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.2099172774">
+							<option id="com.qnx.qcc.option.assembler.qccoptions.258310796" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
+								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
+								<listOptionValue builtIn="false" value="-marm"/>
+								<listOptionValue builtIn="false" value="-mfpu=neon"/>
+							</option>
+							<inputType id="com.qnx.qcc.inputType.assembler.1709199876" superClass="com.qnx.qcc.inputType.assembler"/>
+						</tool>
+					</fileInfo>
 					<sourceEntries>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
 					</sourceEntries>
@@ -666,6 +666,7 @@
 								<option id="com.qnx.qcc.option.compiler.security.183506287" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
 								<option id="com.qnx.qcc.option.compiler.defines.969286898" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HAVE_RPNG"/>
+									<listOptionValue builtIn="false" value="HAVE_OPENGL"/>
 									<listOptionValue builtIn="false" value="HAVE_BB10"/>
 									<listOptionValue builtIn="false" value="HAVE_EGL"/>
 									<listOptionValue builtIn="false" value="HAVE_RJPEG"/>
@@ -674,7 +675,6 @@
 									<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
 									<listOptionValue builtIn="false" value="HAVE_ALSA"/>
 									<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
-									<listOptionValue builtIn="false" value="HAVE_MAIN"/>
 									<listOptionValue builtIn="false" value="HAVE_XMB"/>
 									<listOptionValue builtIn="false" value="HAVE_GLUI"/>
 									<listOptionValue builtIn="false" value="HAVE_RGUI"/>
@@ -739,16 +739,6 @@
 							<tool id="com.qnx.qcc.tool.archiver.189229959" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="com.qnx.qcc.configuration.exe.profile.398924846.187017604" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.752341444.1503771397">
-						<tool id="com.qnx.qcc.tool.assembler.752341444.1503771397" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.752341444">
-							<option id="com.qnx.qcc.option.assembler.qccoptions.1622160611" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
-								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
-								<listOptionValue builtIn="false" value="-marm"/>
-								<listOptionValue builtIn="false" value="-mfpu=neon"/>
-							</option>
-							<inputType id="com.qnx.qcc.inputType.assembler.73976963" superClass="com.qnx.qcc.inputType.assembler"/>
-						</tool>
-					</fileInfo>
 					<fileInfo id="com.qnx.qcc.configuration.exe.profile.398924846.1522534830" name="sinc_neon.S" rcbsApplicability="disable" resourcePath="src/sinc_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.752341444.244474138">
 						<tool id="com.qnx.qcc.tool.assembler.752341444.244474138" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.752341444">
 							<option id="com.qnx.qcc.option.assembler.qccoptions.651615185" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
@@ -759,6 +749,16 @@
 							<inputType id="com.qnx.qcc.inputType.assembler.251174326" superClass="com.qnx.qcc.inputType.assembler"/>
 						</tool>
 					</fileInfo>
+					<fileInfo id="com.qnx.qcc.configuration.exe.profile.398924846.187017604" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.752341444.1503771397">
+						<tool id="com.qnx.qcc.tool.assembler.752341444.1503771397" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.752341444">
+							<option id="com.qnx.qcc.option.assembler.qccoptions.1622160611" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
+								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
+								<listOptionValue builtIn="false" value="-marm"/>
+								<listOptionValue builtIn="false" value="-mfpu=neon"/>
+							</option>
+							<inputType id="com.qnx.qcc.inputType.assembler.73976963" superClass="com.qnx.qcc.inputType.assembler"/>
+						</tool>
+					</fileInfo>
 					<sourceEntries>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
 					</sourceEntries>
@@ -794,6 +794,7 @@
 								<option id="com.qnx.qcc.option.compiler.security.735354154" name="Enhanced Security (-fstack-protector-strong)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
 								<option id="com.qnx.qcc.option.compiler.defines.1893860105" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HAVE_RPNG"/>
+									<listOptionValue builtIn="false" value="HAVE_OPENGL"/>
 									<listOptionValue builtIn="false" value="HAVE_BB10"/>
 									<listOptionValue builtIn="false" value="HAVE_EGL"/>
 									<listOptionValue builtIn="false" value="HAVE_RJPEG"/>
@@ -802,7 +803,6 @@
 									<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
 									<listOptionValue builtIn="false" value="HAVE_ALSA"/>
 									<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
-									<listOptionValue builtIn="false" value="HAVE_MAIN"/>
 									<listOptionValue builtIn="false" value="HAVE_XMB"/>
 									<listOptionValue builtIn="false" value="HAVE_GLUI"/>
 									<listOptionValue builtIn="false" value="HAVE_RGUI"/>
@@ -867,16 +867,6 @@
 							<tool id="com.qnx.qcc.tool.archiver.42203404" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="com.qnx.qcc.configuration.exe.profile.coverage.817388964.948765454" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.435181371.50421175">
-						<tool id="com.qnx.qcc.tool.assembler.435181371.50421175" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.435181371">
-							<option id="com.qnx.qcc.option.assembler.qccoptions.1447558744" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
-								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
-								<listOptionValue builtIn="false" value="-marm"/>
-								<listOptionValue builtIn="false" value="-mfpu=neon"/>
-							</option>
-							<inputType id="com.qnx.qcc.inputType.assembler.1731015472" superClass="com.qnx.qcc.inputType.assembler"/>
-						</tool>
-					</fileInfo>
 					<fileInfo id="com.qnx.qcc.configuration.exe.profile.coverage.817388964.209316731" name="sinc_neon.S" rcbsApplicability="disable" resourcePath="src/sinc_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.435181371.1251968865">
 						<tool id="com.qnx.qcc.tool.assembler.435181371.1251968865" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.435181371">
 							<option id="com.qnx.qcc.option.assembler.qccoptions.1241557846" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
@@ -887,6 +877,16 @@
 							<inputType id="com.qnx.qcc.inputType.assembler.528382439" superClass="com.qnx.qcc.inputType.assembler"/>
 						</tool>
 					</fileInfo>
+					<fileInfo id="com.qnx.qcc.configuration.exe.profile.coverage.817388964.948765454" name="audio_utils_neon.S" rcbsApplicability="disable" resourcePath="src/audio_utils_neon.S" toolsToInvoke="com.qnx.qcc.tool.assembler.435181371.50421175">
+						<tool id="com.qnx.qcc.tool.assembler.435181371.50421175" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler.435181371">
+							<option id="com.qnx.qcc.option.assembler.qccoptions.1447558744" name="QCC Options" superClass="com.qnx.qcc.option.assembler.qccoptions" valueType="stringList">
+								<listOptionValue builtIn="false" value="-mcpu=cortex-a9"/>
+								<listOptionValue builtIn="false" value="-marm"/>
+								<listOptionValue builtIn="false" value="-mfpu=neon"/>
+							</option>
+							<inputType id="com.qnx.qcc.inputType.assembler.1731015472" superClass="com.qnx.qcc.inputType.assembler"/>
+						</tool>
+					</fileInfo>
 					<sourceEntries>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
 					</sourceEntries>
diff --git a/pkg/qnx/bb10/.project b/pkg/qnx/bb10/.project
index dc43609cd5..1c291d4605 100644
--- a/pkg/qnx/bb10/.project
+++ b/pkg/qnx/bb10/.project
@@ -30,20 +30,30 @@
 		<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>src/cc_resampler_neon.S</name>
+			<type>1</type>
+			<location>/Users/squarepusher/libretro-super/retroarch/audio/drivers_resampler/cc_resampler_neon.S</location>
+		</link>
 		<link>
 			<name>src/float_to_s16_neon.S</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/libretro-common/conversion/float_to_s16_neon.S</locationURI>
+			<location>/Users/squarepusher/libretro-super/retroarch/libretro-common/conversion/float_to_s16_neon.S</location>
 		</link>
 		<link>
 			<name>src/griffin.c</name>
 			<type>1</type>
 			<location>/Users/squarepusher/libretro-super/retroarch/griffin/griffin.c</location>
 		</link>
+		<link>
+			<name>src/s16_to_float_neon.S</name>
+			<type>1</type>
+			<location>/Users/squarepusher/libretro-super/retroarch/libretro-common/conversion/s16_to_float_neon.S</location>
+		</link>
 		<link>
 			<name>src/sinc_neon.S</name>
 			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/audio/drivers_resampler/sinc_resampler_neon.S</locationURI>
+			<location>/Users/squarepusher/libretro-super/retroarch/audio/drivers_resampler/sinc_resampler_neon.S</location>
 		</link>
 	</linkedResources>
 </projectDescription>