Merge branch 'libretro'

Conflicts:
	frontend/libretro.c

diff --cc frontend/libretro.c
index 0eef059,bdcf519..4e509a0
--- 1/frontend/libretro.c
--- 2/frontend/libretro.c
+++ b/frontend/libretro.c
@@@ -233,11 -278,12 +278,12 @@@ void retro_cheat_set(unsigned index, bo
  
  bool retro_load_game(const struct retro_game_info *info)
  {
+ #ifdef FRONTEND_SUPPORTS_RGB565
        enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
        if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) {
-               native_rgb565 = 1;
 -              fprintf(stderr, "RGB565 supported, using it\n");
 +              SysPrintf("RGB565 supported, using it\n");
        }
+ #endif
  
        if (plugins_opened) {
                ClosePlugins();