From 0a328699985bf2e2f1f1fac099f0a9b5bac25797 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 25 Feb 2013 03:43:19 +0100 Subject: [PATCH] (Playbook) Seems to compile and link now --- config.def.h | 2 +- console/griffin/griffin.c | 6 +++++- playbook/.cproject | 18 +++++++++--------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/config.def.h b/config.def.h index 779117199b..9de1949269 100644 --- a/config.def.h +++ b/config.def.h @@ -163,7 +163,7 @@ enum #if defined(XENON) || defined(_XBOX360) || defined(__CELLOS_LV2__) #define DEFAULT_ASPECT_RATIO 1.7778f -#elif defined(_XBOX1) || defined(GEKKO) || defined(ANDROID) +#elif defined(_XBOX1) || defined(GEKKO) || defined(ANDROID) || defined(__BLACKBERRY_QNX__) #define DEFAULT_ASPECT_RATIO 1.3333f #else #define DEFAULT_ASPECT_RATIO -1.0f diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index 58afdf5532..66c61f9646 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -106,6 +106,8 @@ VIDEO CONTEXT #include "../../gfx/context/xdk_ctx.c" #elif defined(ANDROID) #include "../../gfx/context/androidegl_ctx.c" +#elif defined(__BLACKBERRY_QNX__) +#include "../../gfx/context/bbqnx_ctx.c" #endif #endif @@ -196,7 +198,9 @@ FONTS #if defined(HAVE_FREETYPE) #include "../../gfx/fonts/freetype.c" -#elif !defined(DONT_HAVE_BITMAPFONTS) +#endif + +#if !defined(DONT_HAVE_BITMAPFONTS) #include "../../gfx/fonts/fonts.c" #include "../../gfx/fonts/bitmapfont.c" #endif diff --git a/playbook/.cproject b/playbook/.cproject index a8013fd458..7d1e37ca98 100644 --- a/playbook/.cproject +++ b/playbook/.cproject @@ -30,6 +30,7 @@