From cc23396cee5ee162eb77f7de02fa7e24e3030350 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 30 Jul 2015 01:34:15 +0200
Subject: [PATCH] (QNX) Some build rule changes

---
 libretro-build.sh  | 11 ++++++++---
 libretro-config.sh |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libretro-build.sh b/libretro-build.sh
index f1f64871..59c8b81a 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -129,7 +129,7 @@ build_default_cores() {
 	libretro_build_core bsnes
 	libretro_build_core bsnes_cplusplus98
 	libretro_build_core bsnes_mercury
-	libretro_build_core dinothawr
+
 	libretro_build_core emux
 	libretro_build_core fuse
 	libretro_build_core genesis_plus_gx
@@ -151,14 +151,19 @@ build_default_cores() {
 	libretro_build_core mupen64plus
 	libretro_build_core picodrive
 	libretro_build_core scummvm
-	libretro_build_core stonesoup
 	libretro_build_core yabause
 
+	if [ $platform != "qnx" ]; then
+		# C++11 cores - not supported yet for these targets
+		libretro_build_core dinothawr
+		libretro_build_core stonesoup
+	fi
+
 	if [ $platform != "win" ]; then
 		libretro_build_core pcsx_rearmed
 	fi
 
-	if [ $platform != "ios" ]; then
+	if [ $platform != "ios" ] && [ $platform != "qnx" ]; then
 		libretro_build_core ffmpeg
 		libretro_build_core ppsspp
 
diff --git a/libretro-config.sh b/libretro-config.sh
index 7cc97643..1b9f1607 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -43,8 +43,8 @@ case "$platform" in
 		FORMAT_COMPILER_TARGET_ALT=qnx
 
 		CC="qcc -Vgcc_ntoarmv7le"
-		CXX="QCC -Vgcc_ntoarmv7le"
-		CXX11="QCC -Vgcc_ntoarmv7le"
+		CXX="QCC -Vgcc_ntoarmv7le_cpp"
+		CXX11="QCC -Vgcc_ntoarmv7le_cpp"
 		;;
 
 	ps3)