From: notaz <notasas@gmail.com>
Date: Mon, 1 Apr 2013 23:10:18 +0000 (+0300)
Subject: Merge branch 'master' into libretro
X-Git-Tag: r24l~952
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4b7d708b35f00c17f27133695342f2feb00f5f0;hp=a95a5e2e0c4bd0da035729d2fd16c068cbd0f633;p=pcsx_rearmed.git

Merge branch 'master' into libretro
---

diff --git a/Makefile.libretro b/Makefile.libretro
index 2b20dfaa..36e0531b 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -20,16 +20,16 @@ CC_AS ?= $(CC)
 CFLAGS ?=
 
 ifeq ($(platform), unix)
-   TARGET := libretro_pcsx_rearmed.so
+   TARGET := pcsx_rearmed_libretro.so
    fpic := -fPIC
    SHARED := -shared -Wl,--version-script=libretro/link.T
 else ifeq ($(platform), osx)
-   TARGET := libretro_pcsx_rearmed.dylib
+   TARGET := pcsx_rearmed_libretro.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
 else ifeq ($(platform), ios)
 ARCH := arm
-   TARGET := libretro_pcsx_rearmed.dylib
+   TARGET := pcsx_rearmed_libretro.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
 
@@ -89,7 +89,7 @@ else ifeq ($(platform), qnx)
    CFLAGS += -DBASE_ADDR_FIXED=0 -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
    ASFLAGS +=  -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp
 else ifeq ($(platform), arm)
-   TARGET := libretro_pcsx_rearmed.so
+   TARGET := pcsx_rearmed_libretro.so
    HAVE_NEON = 1
    USE_DYNAREC = 1
    DRC_CACHE_BASE = 0
diff --git a/frontend/main.c b/frontend/main.c
index 2cf5ee0b..2ef5f521 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -795,6 +795,7 @@ void SysPrintf(const char *fmt, ...) {
 	va_start(list, fmt);
 	vfprintf(emuLog, fmt, list);
 	va_end(list);
+	fflush(emuLog);
 }
 
 #else