New define RARCH_MOBILE

This commit is contained in:
twinaphex 2013-05-22 16:02:21 +02:00
parent c315dc90cf
commit 46f29b1178
7 changed files with 14 additions and 6 deletions

View File

@ -48,7 +48,7 @@ ifeq ($(PERF_TEST), 1)
LOCAL_CFLAGS += -DPERF_TEST
endif
LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_RGUI -DHAVE_SCREENSHOTS -DWANT_MINIZ -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 -I../../../deps/miniz
LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_RGUI -DHAVE_SCREENSHOTS -DWANT_MINIZ -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 -I../../../deps/miniz
LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl

View File

@ -5,7 +5,7 @@ CONFIG += qt warn_on cascades10
LIBS += -lscreen -lbps -lOpenAL -lpng -lEGL -lGLESv2
LIBS += -lbbcascadespickers -lbbdata -lbbdevice
DEFINES += HAVE_RGUI HAVE_NEON \
DEFINES += HAVE_RGUI HAVE_NEON RARCH_MOBILE \
SINC_LOWER_QUALITY HAVE_RARCH_MAIN_IMPLEMENTATION \
HAVE_VID_CONTEXT HAVE_FBO HAVE_GRIFFIN __LIBRETRO__ \
HAVE_DYNAMIC HAVE_ZLIB __BLACKBERRY_QNX__ HAVE_OPENGLES \

View File

@ -33,6 +33,7 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="HAVE_RGUI"/>
<listOptionValue builtIn="false" value="HAVE_NEON"/>
<listOptionValue builtIn="false" value="RARCH_MOBILE"/>
<listOptionValue builtIn="false" value="SINC_LOWER_QUALITY"/>
<listOptionValue builtIn="false" value="HAVE_RARCH_MAIN_IMPLEMENTATION"/>
<listOptionValue builtIn="false" value="HAVE_VID_CONTEXT"/>
@ -154,6 +155,7 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="HAVE_RGUI"/>
<listOptionValue builtIn="false" value="HAVE_NEON"/>
<listOptionValue builtIn="false" value="RARCH_MOBILE"/>
<listOptionValue builtIn="false" value="SINC_LOWER_QUALITY"/>
<listOptionValue builtIn="false" value="HAVE_RARCH_MAIN_IMPLEMENTATION"/>
<listOptionValue builtIn="false" value="HAVE_VID_CONTEXT"/>
@ -270,6 +272,7 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="HAVE_RGUI"/>
<listOptionValue builtIn="false" value="HAVE_NEON"/>
<listOptionValue builtIn="false" value="RARCH_MOBILE"/>
<listOptionValue builtIn="false" value="SINC_LOWER_QUALITY"/>
<listOptionValue builtIn="false" value="HAVE_RARCH_MAIN_IMPLEMENTATION"/>
<listOptionValue builtIn="false" value="HAVE_VID_CONTEXT"/>
@ -387,6 +390,7 @@
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="HAVE_RGUI"/>
<listOptionValue builtIn="false" value="HAVE_NEON"/>
<listOptionValue builtIn="false" value="RARCH_MOBILE"/>
<listOptionValue builtIn="false" value="SINC_LOWER_QUALITY"/>
<listOptionValue builtIn="false" value="HAVE_RARCH_MAIN_IMPLEMENTATION"/>
<listOptionValue builtIn="false" value="HAVE_VID_CONTEXT"/>

View File

@ -260,7 +260,7 @@ static unsigned aspect_ratio_idx = ASPECT_RATIO_CONFIG; // Use g_settings.video.
#endif
// Save configuration file on exit
#if defined(RARCH_CONSOLE) || defined(ANDROID) || defined(__QNX__) || defined(IOS)
#if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
static bool config_save_on_exit = true;
#else
static bool config_save_on_exit = false;

View File

@ -830,7 +830,7 @@ void gl_set_viewport(void *data, unsigned width, unsigned height, bool force_ful
gl->vp.height = height;
}
#if defined(ANDROID) || defined(IOS)
#if defined(RARCH_MOBILE)
// In portrait mode, we want viewport to gravitate to top of screen.
if (device_aspect < 1.0f)
gl->vp.y *= 2;

View File

@ -137,7 +137,7 @@ VIDEO IMAGE
#include "../ps3/image.c"
#elif defined(_XBOX1)
#include "../xdk/image.c"
#elif defined(ANDROID) || defined(__BLACKBERRY_QNX__) || defined(IOS)
#elif defined(RARCH_MOBILE)
#include "../gfx/image.c"
#include "../gfx/rpng/rpng.c"
#endif
@ -399,7 +399,7 @@ MAIN
#include "../frontend/frontend_ios.c"
#endif
#if !defined(ANDROID) && !defined(IOS) && !(defined(__BLACKBERRY_QNX__) && defined(HAVE_BB10))
#ifndef RARCH_MOBILE
#include "../frontend/frontend.c"
#endif

View File

@ -387,6 +387,7 @@
"-DHAVE_THREAD",
"-D__LIBRETRO__",
"-DRARCH_PERFORMANCE_MODE",
"-DRARCH_MOBILE",
"-DPACKAGE_VERSION=\\\"0.9.9-wip3\\\"",
"-std=gnu99",
"-DHAVE_COREAUDIO",
@ -436,6 +437,7 @@
"-DHAVE_THREAD",
"-D__LIBRETRO__",
"-DRARCH_PERFORMANCE_MODE",
"-DRARCH_MOBILE",
"-DPACKAGE_VERSION=\\\"0.9.9-wip3\\\"",
"-std=gnu99",
"-DHAVE_COREAUDIO",
@ -482,6 +484,7 @@
"-DLSB_FIRST",
"-D__LIBRETRO__",
"-DRARCH_PERFORMANCE_MODE",
"-DRARCH_MOBILE",
"-DPACKAGE_VERSION=\\\"0.9.9-wip3\\\"",
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
@ -530,6 +533,7 @@
"-DLSB_FIRST",
"-D__LIBRETRO__",
"-DRARCH_PERFORMANCE_MODE",
"-DRARCH_MOBILE",
"-DPACKAGE_VERSION=\\\"0.9.9-wip3\\\"",
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",