(QNX) Change __BLACKBERRY_QNX__ define to __QNX__

blackberry-qnx/cascades/RetroArch-Cascades.pro

@@ -8,7 +8,7 @@ LIBS += -lbbcascadespickers -lbbdata -lbbdevice
 DEFINES += HAVE_RGUI HAVE_MENU HAVE_NEON RARCH_MOBILE \
            SINC_LOWER_QUALITY RARCH_INTERNAL \
            HAVE_FBO HAVE_GRIFFIN __LIBRETRO__ \
-           HAVE_DYNAMIC HAVE_ZLIB __BLACKBERRY_QNX__ HAVE_OPENGLES \
+           HAVE_DYNAMIC HAVE_ZLIB HAVE_OPENGLES \
            HAVE_OPENGLES2 HAVE_NULLINPUT HAVE_BUILTIN_FILTERS \
            HAVE_AL HAVE_THREADS WANT_MINIZ HAVE_OVERLAY HAVE_GLSL \
            USING_GL20 HAVE_OPENGL __STDC_CONSTANT_MACROS HAVE_BB10

blackberry-qnx/playbook/.cproject

@@ -43,7 +43,6 @@
 									<listOptionValue builtIn="false" value="__LIBRETRO__"/>
 									<listOptionValue builtIn="false" value="HAVE_DYNAMIC"/>
 									<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
-									<listOptionValue builtIn="false" value="__BLACKBERRY_QNX__"/>
 									<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
 									<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
 									<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
@@ -168,7 +167,6 @@
 									<listOptionValue builtIn="false" value="__LIBRETRO__"/>
 									<listOptionValue builtIn="false" value="HAVE_DYNAMIC"/>
 									<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
-									<listOptionValue builtIn="false" value="__BLACKBERRY_QNX__"/>
 									<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
 									<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
 									<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
@@ -295,7 +293,6 @@
 									<listOptionValue builtIn="false" value="__LIBRETRO__"/>
 									<listOptionValue builtIn="false" value="HAVE_DYNAMIC"/>
 									<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
-									<listOptionValue builtIn="false" value="__BLACKBERRY_QNX__"/>
 									<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
 									<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
 									<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>
@@ -417,7 +414,6 @@
 									<listOptionValue builtIn="false" value="__LIBRETRO__"/>
 									<listOptionValue builtIn="false" value="HAVE_DYNAMIC"/>
 									<listOptionValue builtIn="false" value="HAVE_ZLIB"/>
-									<listOptionValue builtIn="false" value="__BLACKBERRY_QNX__"/>
 									<listOptionValue builtIn="false" value="HAVE_OPENGLES"/>
 									<listOptionValue builtIn="false" value="HAVE_OPENGLES2"/>
 									<listOptionValue builtIn="false" value="HAVE_NULLINPUT"/>

config.def.h

@@ -235,7 +235,7 @@ enum
 
 #if defined(XENON) || defined(_XBOX360) || defined(__CELLOS_LV2__)
 #define DEFAULT_ASPECT_RATIO 1.7778f
-#elif defined(_XBOX1) || defined(GEKKO) || defined(ANDROID) || defined(__BLACKBERRY_QNX__)
+#elif defined(_XBOX1) || defined(GEKKO) || defined(ANDROID) || defined(__QNX__)
 #define DEFAULT_ASPECT_RATIO 1.3333f
 #else
 #define DEFAULT_ASPECT_RATIO -1.0f

driver.c

@@ -175,7 +175,7 @@ static const input_driver_t *input_drivers[] = {
 #if defined(IOS) || defined(OSX) //< Don't use __APPLE__ as it breaks basic SDL builds
    &input_apple,
 #endif
-#ifdef __BLACKBERRY_QNX__
+#ifdef __QNX__
    &input_qnx,
 #endif
 #ifdef EMSCRIPTEN

file_path.c

@@ -23,7 +23,7 @@
 #include "compat/posix_string.h"
 #include "miscellaneous.h"
 
-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__BLACKBERRY_QNX__) || defined(PSP)
+#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
 #include <unistd.h> //stat() is defined here
 #endif
 

gfx/gfx_context.c

@@ -47,7 +47,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
 #if defined(ANDROID)
    &gfx_ctx_android,
 #endif
-#if defined(__BLACKBERRY_QNX__)
+#if defined(__QNX__)
    &gfx_ctx_bbqnx,
 #endif
 #if defined(IOS) || defined(OSX) //< Don't use __APPLE__ as it breaks basic SDL builds

griffin/griffin.c

@@ -107,7 +107,7 @@ VIDEO CONTEXT
 #include "../gfx/context/d3d_ctx.cpp"
 #elif defined(ANDROID)
 #include "../gfx/context/androidegl_ctx.c"
-#elif defined(__BLACKBERRY_QNX__)
+#elif defined(__QNX__)
 #include "../gfx/context/bbqnx_ctx.c"
 #elif defined(IOS) || defined(OSX)
 #include "../gfx/context/apple_gl_ctx.c"
@@ -310,7 +310,7 @@ INPUT
 #elif defined(IOS) || defined(OSX)
 #include "../input/apple_input.c"
 #include "../input/apple_joypad.c"
-#elif defined(__BLACKBERRY_QNX__)
+#elif defined(__QNX__)
 #include "../blackberry-qnx/qnx_input.c"
 #elif defined(EMSCRIPTEN)
 #include "../input/rwebinput_input.c"

libretro-test-gl/Makefile

@@ -47,7 +47,7 @@ else ifeq ($(platform), qnx)
 
    CC = qcc -Vgcc_ntoarmv7le
    AR = qcc -Vgcc_ntoarmv7le
-   CFLAGS += -D__BLACKBERRY_QNX__ -DGLES
+   CFLAGS += -DGLES
    GL_LIB := -lGLESv2
 else ifneq (,$(findstring armv,$(platform)))
    CC = gcc