From: notaz <notasas@gmail.com>
Date: Mon, 10 Dec 2012 21:41:06 +0000 (+0200)
Subject: Merge branch 'libretro'
X-Git-Tag: r18~49
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3601e36bd526c63c842f68b2ff6cac82954e5e7e;p=pcsx_rearmed.git

Merge branch 'libretro'

Conflicts:
	frontend/libretro.c
---

3601e36bd526c63c842f68b2ff6cac82954e5e7e
diff --cc frontend/libretro.c
index 0eef0593,bdcf519b..4e509a0a
--- a/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();