a2d9129782
Kill off set_fbo_state and get_fbo_state function pointers
2013-04-06 06:21:11 +02:00
f94ddb2eab
(RMenu) Remove now redundant enum ID
2013-04-06 05:58:26 +02:00
eb0feac9e3
(PS3/All) Purge fixed-style shaders again - this time avoiding
...
breakage on PS3. Maister -you will need to redo shader_parse.c
again though - and this time I need to test it on PS3 to avoid
a regression that happened two pages prior again
2013-04-06 05:46:09 +02:00
4f1cd6a5ee
Revert "(PS3) Remove fixed shader slots"
...
This reverts commit f58a038a5f
2013-04-06 03:54:57 +02:00
cbb300f863
Revert "(RMenu XUI) Take out fixed second pass shader slot"
...
This reverts commit a61437c3db
2013-04-06 03:54:47 +02:00
cbfe5ff111
Revert "More scrubbing - no more render_to_texture, fbo_scale_x / fbo_scale_y,"
...
This reverts commit 7155dd9ca9
2013-04-06 03:53:57 +02:00
09c123859d
Revert "(RMenu) take out no longer used HAVE_FBO ifdef"
...
This reverts commit 5f6601ac7e
2013-04-06 03:53:18 +02:00
5f6601ac7e
(RMenu) take out no longer used HAVE_FBO ifdef
2013-04-06 00:24:11 +02:00
7155dd9ca9
More scrubbing - no more render_to_texture, fbo_scale_x / fbo_scale_y,
...
etc
2013-04-06 00:16:10 +02:00
a61437c3db
(RMenu XUI) Take out fixed second pass shader slot
2013-04-06 00:03:09 +02:00
f58a038a5f
(PS3) Remove fixed shader slots
2013-04-05 23:58:30 +02:00
ed01b57036
(iOS) Fix stale sram and state paths after loading a game through RGUI.
2013-04-05 12:09:33 -04:00
cf92211254
Update overlay when in RGUI.
2013-04-04 23:10:38 +02:00
7c3e4ef12d
Fix unsigned bug in RGUI.
2013-04-04 22:27:16 +02:00
d7797f8497
Core options work in RGUI.
2013-04-04 22:08:23 +02:00
435eec44f0
Start adding core options to RGUI.
...
Broken atm.
2013-04-04 21:48:09 +02:00
262b867ae0
Update MSVC2010 build.
...
Add RGUI, add folder query for Windows, fix GL HW render bug.
2013-04-04 20:25:41 +02:00
896d5d66d6
(RGUI) Add 'Change Game' option to RGUI Settings
2013-04-04 04:56:04 +02:00
6d657d6fab
(iOS Thread) Make the pause menu's exit button work again
2013-04-03 12:08:27 -04:00
ca4921d6c0
(iOS Thread) Use pthread, rather than Grand Central Dispatch, to create the emulator thread
2013-04-03 11:58:18 -04:00
c778844852
(iOS Thread) Use an event queue to pass events (reset, state load, etc) to the retroarch thread
2013-04-02 22:38:33 -04:00
1ab77945da
(iOS Thread) Handle the cases where the retroarch thread ends
2013-04-02 21:07:04 -04:00
f4a3345f0b
(iOS Thread) Rough draft, needs a lot of work
2013-04-02 20:39:51 -04:00
52d6c0158f
(RMenu) Fixes INGAME_MENU_CHANGE_GAME
2013-04-01 09:53:31 +02:00
f5667f0297
(RMenu) Fixed 'Change Game' action
2013-04-01 09:38:16 +02:00
5d3949c610
(RMenu) Rewritten ingame menu
2013-04-01 09:18:30 +02:00
6f8a008d1b
(RMenu) Change menu labels
2013-04-01 06:31:17 +02:00
684197ee77
(RGUI) Sets and resets MODE_MENU_INGAME flag for whenever we go
...
in and out of Settings
2013-03-31 06:15:56 +02:00
241ed9286a
(RGUI) Menu toggle now goes to 'Settings' screen by default when
...
already ingame - will make the 'home screen' configurable to either
filebrowser or settings menu later on
2013-03-31 06:04:32 +02:00
d2521204a0
(RMenu) Change 'Return to menu' to 'Change game'
2013-03-31 01:47:00 +01:00
57b4de45a3
(RMenu) Can now use L3 + R3 to exit ingame menu
2013-03-30 19:56:16 +01:00
43a4979dc9
(360) RMenu XUI build fix
2013-03-30 08:16:58 +01:00
58a98e3043
(GX RGUI) Resolution additions for Wii - by request
2013-03-30 05:38:22 +01:00
426b3a255d
Revert "(PS3) Add third-pass shaders (ifdeffed for PS3 for now - could" -
...
going to do this better
This reverts commit 8b4e6bed93
2013-03-29 01:55:08 +01:00
8b4e6bed93
(PS3) Add third-pass shaders (ifdeffed for PS3 for now - could
...
be added to PC as well)
2013-03-28 20:59:49 +01:00
fa80fbf5bb
(RMenu) select_setting - cleanups
2013-03-26 15:26:16 +01:00
d58122c655
(RMenu) select_setting refactor pt. 2 - don't put array of struct
...
on heap anymore
2013-03-26 15:15:38 +01:00
32791fe59c
(RMenu) Refactor of select_setting
2013-03-26 15:06:08 +01:00
7d9ca5bf6a
(RMenu) Rewrite select_setting
2013-03-26 08:15:48 +01:00
0fb415fa82
(RMenu) Move pressed_down/pressed_up logic inside for loop - select_settings
2013-03-26 00:23:05 +01:00
d1b691a696
(RMenu) Take input states out of rmenu_state
2013-03-25 22:37:40 +01:00
f0794daa34
(RMenu) Pass input states by value instead of by reference
2013-03-25 22:31:09 +01:00
9b893e2154
(RMenu) More cleanups pt. 2
2013-03-25 21:55:42 +01:00
afda4b1a63
(RMenu) More cleanups
2013-03-25 21:24:51 +01:00
8568246454
(RMenu) Clean up init_filebrowser and free_filebrowser - make part of
...
RMenu
2013-03-25 21:01:04 +01:00
fee0d9d77a
Embed menu_stack into rmenu.c
2013-03-25 20:41:53 +01:00
d57484e6eb
Revert "(RMenu) RMenu cleanups pt. 3"
...
This reverts commit bcc5f906b6
2013-03-25 20:19:43 +01:00
bcc5f906b6
(RMenu) RMenu cleanups pt. 3
2013-03-25 19:04:23 +01:00
986806ca78
(RMenu) RMenu cleanups pt. 2
2013-03-25 18:36:15 +01:00
5a8aa57ae9
(RMenu) Cleanups
2013-03-25 17:47:47 +01:00
f004e98f85
(RMenu) Fix build
2013-03-25 08:06:40 +01:00
c9e2dd937d
(Android) Update overlays - now adds an RGUI toggle button
...
(RMenu PS3) Clean up some unneeded function callbacks
2013-03-25 03:07:58 +01:00
a7ea3b3ec7
(Blackberry) Replace strcpy with strlcpy
2013-03-25 02:07:13 +01:00
1e58421c84
(BlackBerry) Get input overlay to show when booting to RGUI
2013-03-24 20:42:09 -04:00
6905a38476
(PC) Fix RGUI build
...
(RGUI) Swap Start and Select buttons - Start is more commonly
found on gamepads than Select - Start does 'settings screen switch'
now and Select does 'reset to default' setting
2013-03-24 06:45:35 +01:00
9a1cbdce85
(RGUI) Add 'Resume Game' option
2013-03-24 06:32:42 +01:00
5c42e2fc98
(Libretro core management) Cleanups to libretro_install_core
2013-03-24 03:50:55 +01:00
fce2bdb3b2
Cleanups to libretro_install_core
2013-03-24 03:13:10 +01:00
1c332e42f8
Remove frontend_console.h header
2013-03-24 02:02:15 +01:00
82329cf097
(Blackberry) Starts up in RGUI mode now - should (hopefully) allow
...
for dynamic changing of libretro core and selection of ROM instead
of hardcoded paths.
2013-03-24 01:00:00 +01:00
0fa8c04984
Remove menu_settings.c
2013-03-23 19:34:38 +01:00
9058143953
Move create_menu_item_label to rmenu_xui.cpp
2013-03-23 18:11:03 +01:00
c9673dbae6
Merge pull request #162 from CatalystG/bb_rgui
...
(BlackBerry) Add initial in-game RGUI support.
2013-03-23 09:48:13 -07:00
6d8871c76c
Combine menu_settings_set and menu_settings_set_default and
...
move to settings.c
2013-03-23 17:21:42 +01:00
f6c2c2c57d
(BlackBerry) Add initial in-game RGUI support.
2013-03-23 12:21:30 -04:00
82d80cf24f
(PS3) Multiman cleanups
2013-03-23 05:17:39 +01:00
adee2430b9
Move platform_inl.h to frontend_console.c
2013-03-23 04:35:30 +01:00
ab93fa6bd2
Use more approriate namespacing.
...
Replace get_libretro_core_name namespacing.
2013-03-22 23:42:34 +01:00
f7e75d69fa
(Salamander) Split up Salamander into its own separate file
2013-03-22 21:27:34 +01:00
7e0afcf610
move get _libretro_core_name to dynamic.c
2013-03-22 20:54:33 +01:00
8fb9ab16d4
(GX) Fix build
2013-03-22 17:49:37 +01:00
7465b25483
block_config_read is set to true in config_set_defaults
2013-03-22 17:01:59 +01:00
fefb65b84a
(Blackberry) Move libscreen initialization to Blackberry graphics
...
context driver
2013-03-22 16:30:10 +01:00
3af61aeac7
(Blackberry) Get rid of bbutil - we don't need it
2013-03-20 01:27:05 +01:00
2e70c297e3
(Blackberry) Build fix
2013-03-20 01:17:10 +01:00
70ac48a685
(iOS) Compile griffin.c - meancoot - check out if everything still
...
works in the iOS port
2013-03-19 05:57:51 +01:00
a8a277ec3b
(RMenu) Cleanups
2013-03-18 18:31:14 +01:00
93522723b0
(RMenu) Replace more snprintfs in rmenu.c
2013-03-18 18:05:15 +01:00
2dc3adcde3
(Filebrowser) Remove redundant filebrowser_get_current_dir
2013-03-18 05:25:18 +01:00
cf7f868e0a
(RMenu) Replace more snprintfs with strlcpy
2013-03-18 05:11:36 +01:00
8930afd11c
(RMENU) Replace snprintfs with strlcpy
2013-03-18 03:49:54 +01:00
8abe9802b5
(RGUI) Replace as much snprintfs with strlcpy as possible
...
for safety reasons
2013-03-18 02:01:14 +01:00
aa24755956
Make initial RGUI directory configurable.
2013-03-17 21:39:28 +01:00
374975da34
Move core selection to top on PC.
2013-03-17 21:23:28 +01:00
94ece08f44
Core selection works on PC/RGUI.
2013-03-17 21:18:56 +01:00
af4bbb947d
Block config read after first main_init.
2013-03-17 16:02:11 +01:00
2588e60180
Add relative-to-application querying to config.
2013-03-17 12:28:26 +01:00
e3c85b174c
Can toggle rewind enable in runtime.
2013-03-16 14:28:34 +01:00
92fba644b7
(RGUI) Ditch GX naming convention for menu bind IDs
2013-03-16 14:20:11 +01:00
7b716ac837
Fix unsecure snprintf.
2013-03-16 12:28:25 +01:00
1aca911fe3
Fix file browser on PC.
2013-03-16 11:16:55 +01:00
8f6f35b2d9
Poll overlay on PC in RGUI.
2013-03-16 11:06:03 +01:00
8360dff3ca
Fix RGUI input on PC, but ugly.
2013-03-16 11:01:47 +01:00
aa1275a22d
Check explicitly for video_poke interface.
2013-03-16 10:47:01 +01:00
12cc1c43d4
Can almost run RGUI on PC.
...
Input in menu is broken. Binds are set up wrongly for PC.
2013-03-16 10:35:22 +01:00
15099f8e4f
RGUI builds on PC.
2013-03-16 09:55:08 +01:00
11b2ca07b5
(RMenu) Build fix
2013-03-15 02:26:34 +01:00
0166ce4585
(RGUI) RGUI input code now no longer GEKKO-specific
2013-03-15 01:22:52 +01:00
375aa08e58
Remove rarch_conole_input - runtime button remapping should have
...
no more RARCH_CONSOLE dependencies
2013-03-14 21:55:10 +01:00
fd05b5a25c
rarch_input_set_keybind refactored away - input driver's set_keybinds
...
function now provides the functionality
2013-03-14 15:01:36 +01:00
53e1154bc4
(RMenu XUI) Build fixes
2013-03-14 02:37:14 +01:00
ede829c354
Refactor set_default_keybinds callback into set_keybinds - remove
...
set_analog_dpad_mapping and have it go through set_keybinds - expand
functionality of set_keybinds
2013-03-14 02:24:57 +01:00
4fa8d0f3c6
(Android) Rewritten input_autodetect- now implements set_default_keybinds
2013-03-13 23:17:33 +01:00
ece717f2cc
Rename set_default_keybind_lut to set_default_keybinds
2013-03-13 16:30:01 +01:00
4bd0999940
Remove rarch_input_set_default_keybinds - merge with function
...
pointer set_default_keybind_lut
2013-03-13 16:06:13 +01:00
7edb3866f8
Move get_libretro_core_name to HAE_LIBRETRO_MANAGEMENT ifdef
2013-03-13 06:43:18 +01:00
c28bb3a3fd
Move init_console_drivers and uninit_console_drivers to driver.c
...
and rename them global_init_drivers and global_unit_drivers -
we'll need this for Blackberry, starting RetroArch with RGUI
at startup AND consoles
2013-03-13 04:16:56 +01:00
d67e96c603
(RARCH_CONSOLE) Remove rarch_default_libretro_keybind_name_lut
2013-03-13 03:27:21 +01:00
17022672fc
(Filebrowser) Clea up filebrowser code
2013-03-13 02:52:41 +01:00
afc90aa33d
(XDK) Cleanup xdk_resources.cpp
2013-03-13 01:51:03 +01:00
713aa0ecbe
(Input) Remove dpad_emulation_name_lut
2013-03-13 01:07:27 +01:00
545911d4da
(Input) Remove post_init and make it part of input_init
2013-03-13 00:34:46 +01:00
42bdd80ec4
Combine rarch_input_set_controls_default and post_init
2013-03-13 00:12:29 +01:00
9fb92127aa
(RGUI) rgui_list_push - changed first parameter to void*
2013-03-12 01:03:07 +01:00
e9d8b2848f
(RMenu XUI) Use video_poke set_osd_msg
2013-03-11 23:46:57 +01:00
b4108eb343
Add set_osd_msg to video_poke
2013-03-11 21:42:02 +01:00
63883a1131
Combine render_msg and render_msg_place with params argument
2013-03-11 20:05:05 +01:00
d9c3a99d0b
Update some credits
2013-03-11 07:13:11 +01:00
370fca304d
rarch_console.h - cut down on executable_extension variable as well
...
and move it to config.def.h
2013-03-11 06:59:53 +01:00
ce42e7fb65
Remove default_paths.salamander_file and make hardcoded constant
...
in config.def.h
2013-03-11 06:48:58 +01:00
4d062b869c
(RGUI) Use fill_pathname_join for core switching
2013-03-11 06:41:22 +01:00
5730f6487d
(RGUI) Use fill_pathname_join to get correct concatenated file paths
2013-03-11 06:23:14 +01:00
76482bcffe
(RGUI) No longer check for '..' and '.' - filtered out by
...
dir_list_new now
2013-03-11 06:05:01 +01:00
660e7297e8
(RGUI) Clean up more ifdefs
2013-03-11 05:34:25 +01:00
da48316d7f
(RGUI) Use dir_list_sort and get rid of RGUI sorting
2013-03-11 05:22:05 +01:00
91d35e2e41
(RGUI) Cut down on ifdef party
2013-03-11 04:57:17 +01:00
2a1bfde771
(RGUI) Remove folder_cb callback
2013-03-11 04:21:40 +01:00
435b281ff6
(RGUI) Renamed folder_buf to selection_buf, renamed path_stack to menu_stack
2013-03-11 03:56:06 +01:00
a7e651fe0c
(RGUI) Rename rgui->directory_ptr to rgui->selection_ptr
2013-03-11 03:53:28 +01:00
8601102cdd
(RGUI) Don't use path_buf anymore
2013-03-11 03:44:30 +01:00
05e306b599
Cleanups in RGUI file_list
2013-03-11 03:40:44 +01:00
b348e3f390
Rename ptr member to more sensible name 'size' and kill rgui_list_size
2013-03-11 03:31:19 +01:00
e06b125ab2
rgui_list_back and rgui_list_at renamed
2013-03-11 03:22:45 +01:00
50c2dd8e52
(RGUI) Replace RGUI_MENU_ITEM macros with rgui_list_push for clarity's sake
2013-03-11 02:51:33 +01:00
47b6eb262f
Revert "(RGUI) Add some patches for _WIN32 - still broken path handling"
...
This reverts commit d17a43220f
2013-03-11 02:08:09 +01:00
946bc52061
Revert "(RGUI) Add more WIN32 path handling fixes"
...
This reverts commit b942b76b3c
2013-03-11 02:08:00 +01:00
039fc644d5
Revert "Menu toggle without delay timers (more testing might be needed -"
...
This reverts commit 54a6175a55
2013-03-11 02:07:50 +01:00
edf600e0c7
Revert "don't immediately exit if we leave the menu by means other than the menu button"
...
This reverts commit 7bd8de8dbd
2013-03-11 02:07:38 +01:00
dcf14aae38
Revert "(RMenu) Attempt same glitch fix as in RGUI for 'exit immediately"
...
This reverts commit 95342e7638
2013-03-11 02:07:11 +01:00
95342e7638
(RMenu) Attempt same glitch fix as in RGUI for 'exit immediately
...
on first menu toggle press'
2013-03-11 01:51:50 +01:00
7bd8de8dbd
don't immediately exit if we leave the menu by means other than the menu button
2013-03-10 20:28:01 -04:00
54a6175a55
Menu toggle without delay timers (more testing might be needed -
...
tested on PS3 RMenu and seemed to work well enough)
2013-03-11 01:12:19 +01:00
cb2f2b706a
(RGUI) Add drive mappings for PS3
2013-03-11 00:26:55 +01:00
b942b76b3c
(RGUI) Add more WIN32 path handling fixes
2013-03-11 00:15:53 +01:00
d17a43220f
(RGUI) Add some patches for _WIN32 - still broken path handling
...
in directory_cb
2013-03-10 23:58:38 +01:00
e5ca995fac
(RGUI) Add checks in case set_rgui_texture is not bound
2013-03-10 23:18:34 +01:00
6a60d459d0
HAVE_SCREENSHOTS define in RGUI
2013-03-10 17:54:46 -04:00
71e9dd3a6a
(RGUI) Portable folder_cb code
2013-03-10 22:40:20 +01:00
bffdd1a439
(RGUI) Fix warnings
2013-03-10 21:20:36 +01:00
eb82bd2127
implement driver.current_msg
...
fix RGUI to no longer use driver.video_data casting
2013-03-10 16:02:10 -04:00
e6eb583b23
(RMenu XUI) Use get_fbo_state from video_poke
2013-03-10 20:20:14 +01:00
7be75b29dc
(PS3/XDK) Remove gfx_ctx_set_overscan
2013-03-10 20:13:06 +01:00
adc7c665e2
(RGUI) use apply_state_changes from video_poke interface - could
...
cut down on device_ptr dependency if we implement viewport_info
for GX
2013-03-10 19:58:22 +01:00
63d946c69f
Add set_rgui_texture interface to video_poke.
2013-03-10 19:14:28 +01:00
e741cc77c6
start/stop/restart ifdeffed for RARCH_CONSOLE instead of
...
HAVE_RMENU - transfer of control bypasses initialization of variables
in RGUI - issues fixed
2013-03-10 17:40:34 +01:00
96dd31fcf2
(RGUI Xbox 1) Down to 7 compiler errors
2013-03-10 16:49:37 +01:00
8d67705bc6
(Xbox 1) Build fix in rgui.c
2013-03-10 16:43:24 +01:00
a750cbd7f5
(RGUI) Don't use rgui_file_type_t - use unsigned instead
2013-03-10 16:40:36 +01:00
b54cf4cd87
(RGUI) Can't have VLAs for Xbox 1 / MSVC
2013-03-10 16:37:34 +01:00
ae9ddf362b
(Xbox 1) Make xdk_ctx independent of HAVE_RMENU
2013-03-10 16:29:08 +01:00
92573940bd
Move rmenu_set_default_pos to rmenu.c
2013-03-10 15:52:36 +01:00
d74b7156fa
Move more RMenu stuff to rmenu.c and out of the context drivers
2013-03-10 15:23:34 +01:00
4a5668d66c
(Android/RARCH_CONSOLE) Added video_poke function pointer checks
2013-03-10 04:16:35 +01:00
a8696713f6
(RGUI Android) Hardware filtering toggle works now
2013-03-10 04:12:38 +01:00
59ff094b3b
Add set_blend to video_poke interface
2013-03-10 03:53:42 +01:00
76b62788be
(360) Build fix
2013-03-10 03:42:39 +01:00
79a27e34ed
(XDK) Start to implement video_poke interface
2013-03-10 03:34:37 +01:00
91e3355268
(RMenu) Use video_poke interface for RMenu as well
2013-03-10 02:58:55 +01:00
7f986357be
(GX) Use video_poke interface for GX as well
2013-03-10 02:42:16 +01:00
0af20af5ec
(RGUI) Use new video_poke interface
2013-03-10 02:26:51 +01:00
f8f384d8b3
(RGUI) Enable all menu features for Android
2013-03-10 01:30:41 +01:00
e983684359
(RGUI Android)Filebrowser ROM loading works after initial ROM
...
(one time - after that, can't return to RGUI anymore - not sure
why right now)
2013-03-10 00:43:25 +01:00
a6a023b03c
frontend_console cleanups
2013-03-09 22:57:42 +01:00
13de2c5acd
(360) Move class definitions to rmenu_xui.cpp instead of header
2013-03-09 22:31:13 +01:00
18769094e6
(360) Move menu_settings_create_menu_item_label_w to rmenu_xui.cpp
2013-03-09 22:23:40 +01:00
04c9b14b7e
Remove S_DELAY macros
2013-03-09 22:21:53 +01:00
43d865cc5e
Rename rmenu_settings to menu_settings
2013-03-09 22:19:25 +01:00
b4fad2dab2
(RGUI) Get rid of rmenu_ namespace
2013-03-09 22:15:20 +01:00
544acdf8e1
(RGUI) folder_cb now the same for both GEKKO and non-GEKKO targets
2013-03-09 21:30:40 +01:00
d6661cf714
(RGUI) Add DECLARE_DEVICE_PTR macro for D3D8/D3D9
2013-03-09 19:15:51 +01:00
e92fd90776
Remove strings.h include (file_list.c)
2013-03-09 19:12:26 +01:00
ca72bb420a
Replace rgui_file_type_t in file_list with unsigned
2013-03-09 19:05:11 +01:00
66e7606b25
HAVE_RGUI and HAVE_RMENU are now mutually exclusive - no longer
...
have to be defined both for (say) the Android port
2013-03-09 17:42:19 +01:00
e7f206be79
Revert "Move rmenu_settings.c to settings.c + add header file"
...
This reverts commit b827075d55
2013-03-09 17:09:40 +01:00
b827075d55
Move rmenu_settings.c to settings.c + add header file
2013-03-09 17:00:52 +01:00
5e53be4b25
Rename rmenu_iterate to menu_iterate
2013-03-09 16:22:11 +01:00
0b6e5a6388
Rename RARCH_RMENU_TOGGLE to RARCH_MENU_TOGGLE
2013-03-09 16:14:26 +01:00
18ba3ef3e5
Integrate rmenu_genric.c into rgui.c
2013-03-09 15:33:44 +01:00
34515fd7f5
(RARCH_CONSOLE) Integrate rarch-console_video into gfx_common
2013-03-09 03:20:59 +01:00
1422ed3bb0
fix touch controls
2013-03-07 14:38:41 -05:00
f560963ad1
(RGUI) use same rgui_iterate code for both GEKKO and non-Gekko
2013-03-07 16:11:35 +01:00
361363d423
Standardize rmenu_generic code more
2013-03-07 15:59:47 +01:00
36c9a32436
compile fix
2013-03-06 14:58:53 -05:00
9b6b174812
filebrowser setting
...
to be used for CD switching, commented out for now
2013-03-06 12:42:58 -05:00
809ae0ab06
get messages working again on android
2013-03-06 12:19:56 -05:00
fcf6d98fb0
don't pop menu stack if it's the last one
2013-03-05 19:28:20 -05:00
62963d7510
Combine rmenu_generic.c and rmenu_gx.c
2013-03-04 21:41:10 +01:00
5c16cff2e7
Merge branch 'android-rgui' of https://github.com/Themaister/RetroArch into android-rgui
...
Conflicts:
android/native/jni/input_android.c
2013-03-04 17:00:43 +01:00
b4490ae496
(Android) Don't define HAVE_ASYNC_POLL for now
2013-03-04 14:21:37 +01:00
acffc05494
(Android) Make HAVE_ASYNC_POLL optional
2013-03-04 14:15:47 +01:00
twinaphex