mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-09 00:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Playbook) Fixes Playbook build

Browse Source
This commit is contained in:
twinaphex 2014-05-20 02:33:09 +02:00
parent 16f999abeb
commit 701a805737
6 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blackberry-qnx/playbook/.cproject
View File

@ -29,7 +29,7 @@
</option>
<option id="com.qnx.qcc.option.compiler.security.209097800" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1775248205" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=0"/>
<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
<listOptionValue builtIn="false" value="HAVE_CC"/>
@ -154,7 +154,7 @@
</option>
<option id="com.qnx.qcc.option.compiler.security.421937377" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.426935293" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=0"/>
<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
<listOptionValue builtIn="false" value="HAVE_CC"/>
@ -281,7 +281,7 @@
</option>
<option id="com.qnx.qcc.option.compiler.security.1305803908" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.213513124" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=0"/>
<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
<listOptionValue builtIn="false" value="HAVE_CC"/>
@ -403,7 +403,7 @@
</option>
<option id="com.qnx.qcc.option.compiler.security.521807592" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="false" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1725725626" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=0"/>
<listOptionValue builtIn="false" value="HAVE_DYLIB"/>
<listOptionValue builtIn="false" value="RARCH_INTERNAL"/>
<listOptionValue builtIn="false" value="HAVE_CC"/>

2
blackberry-qnx/playbook/.project
View File

@ -27,7 +27,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/RetroArch/Device-Release}</value>
<value>${workspace_loc:/RetroArch/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>

7
blackberry-qnx/qnx_input.c
View File

@ -662,11 +662,10 @@ static bool qnx_input_key_pressed(void *data, int key)
static void qnx_input_free_input(void *data)
{
qnx_input_t *qnx = (qnx_input_t*)data;
if (!data)
return;
if (qnx)
free(qnx);
qnx = 0;
//free(data);
}
static void qnx_input_set_keybinds(void *data, unsigned device, unsigned port,

4
driver.c
View File

@ -1663,10 +1663,10 @@ void uninit_video_input(void)
}
#endif
if (driver.input_data != driver.video_data && driver.input)
if (driver.input_data != driver.video_data && driver.input && driver.input->free)
input_free_func();
if (driver.video_data && driver.video)
if (driver.video_data && driver.video && driver.video->free)
video_free_func();
deinit_pixel_converter();

14
frontend/frontend.c
View File

@ -29,17 +29,21 @@
#include "../file_ext.h"
#ifdef RARCH_CONSOLE
#if defined(RARCH_CONSOLE) || defined(__QNX__)
#include "../config.def.h"
#ifdef RARCH_CONSOLE
default_paths_t default_paths;
#endif
static void rarch_get_environment_console(void)
{
#ifdef RARCH_CONSOLE
path_mkdir(default_paths.port_dir);
path_mkdir(default_paths.system_dir);
path_mkdir(default_paths.savestate_dir);
path_mkdir(default_paths.sram_dir);
#endif
config_load();
@ -88,25 +92,25 @@ static void rarch_get_environment_console(void)
#define ra_preinited false
#endif
#if defined(HAVE_BB10) || defined(RARCH_CONSOLE)
#if defined(__QNX__) || defined(RARCH_CONSOLE)
#define attempt_load_game false
#else
#define attempt_load_game true
#endif
#if defined(RARCH_CONSOLE) || defined(HAVE_BB10) || defined(ANDROID)
#if defined(RARCH_CONSOLE) || defined(__QNX__) || defined(ANDROID)
#define initial_menu_lifecycle_state (1ULL << MODE_LOAD_GAME)
#else
#define initial_menu_lifecycle_state (1ULL << MODE_GAME)
#endif
#if !defined(RARCH_CONSOLE) && !defined(HAVE_BB10) && !defined(ANDROID)
#if !defined(RARCH_CONSOLE) && !defined(__QNX__) && !defined(ANDROID)
#define attempt_load_game_push_history true
#else
#define attempt_load_game_push_history false
#endif
#ifndef RARCH_CONSOLE
#if !defined(RARCH_CONSOLE) || !defined(__QNX__)
#define rarch_get_environment_console() (void)0
#endif

3
input/linuxraw_input.c
View File

@ -179,6 +179,9 @@ static void linuxraw_input_free(void *data)
{
linuxraw_input_t *linuxraw = (linuxraw_input_t*)data;
if (!linuxraw)
return;
if (linuxraw->joypad)
linuxraw->joypad->destroy();