diff options
| author | notaz | 2013-04-02 02:10:18 +0300 |
|---|---|---|
| committer | notaz | 2013-04-02 02:10:18 +0300 |
| commit | c4b7d708b35f00c17f27133695342f2feb00f5f0 (patch) | |
| tree | 47b182b4339ca858539e209c36b9a446ae8420fd | |
| parent | a95a5e2e0c4bd0da035729d2fd16c068cbd0f633 (diff) | |
| parent | 4b5b6cf713480df38c7e79d669cb9e72d70b3ba0 (diff) | |
| download | pcsx_rearmed-c4b7d708b35f00c17f27133695342f2feb00f5f0.tar.gz pcsx_rearmed-c4b7d708b35f00c17f27133695342f2feb00f5f0.tar.bz2 pcsx_rearmed-c4b7d708b35f00c17f27133695342f2feb00f5f0.zip | |
Merge branch 'master' into libretro
| -rw-r--r-- | Makefile.libretro | 8 | ||||
| -rw-r--r-- | frontend/main.c | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.libretro b/Makefile.libretro index 2b20dfa..36e0531 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 2cf5ee0..2ef5f52 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 |