diff options
| author | Twinaphex | 2014-12-20 20:43:18 +0100 |
|---|---|---|
| committer | Twinaphex | 2014-12-20 20:43:18 +0100 |
| commit | 247fc699be6b3bd95fd9126541e0804cc8dffdd4 (patch) | |
| tree | d38e169e68e48a3ccbf8a3805f9cb87197ed894a /Makefile.libretro | |
| parent | 3e5b01fcef8ef20dacca45ea7a7b0c461e6bd666 (diff) | |
| parent | 7931825ed8ef51dab3e37475d8126103ebc9fb6f (diff) | |
| download | pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.gz pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.bz2 pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.zip | |
Merge pull request #11 from notaz/upstream_merge
Upstream merge
Diffstat (limited to 'Makefile.libretro')
| -rw-r--r-- | Makefile.libretro | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Makefile.libretro b/Makefile.libretro index 6a90717..ae95639 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -1,8 +1,5 @@ # Makefile for PCSX ReARMed (libretro) -DEBUG=1 -MMAP_WIN32=0 - ifeq ($(platform),) platform = unix ifeq ($(shell uname -a),) @@ -24,21 +21,19 @@ CFLAGS ?= TARGET_NAME := pcsx_rearmed +MMAP_WIN32=0 + # Unix ifeq ($(platform), unix) TARGET := $(TARGET_NAME)_libretro.so fpic := -fPIC SHARED := -shared -Wl,--version-script=libretro/link.T - BUILTIN_GPU = neon - CFLAGS += -DNEON_PC # OS X else ifeq ($(platform), osx) TARGET := $(TARGET_NAME)_libretro.dylib fpic := -fPIC SHARED := -dynamiclib - BUILTIN_GPU = neon - CFLAGS += -DNEON_PC OSXVER = `sw_vers -productVersion | cut -d. -f 2` OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` ifeq ($(OSX_LT_MAVERICKS),"YES") @@ -173,10 +168,7 @@ else LD_FLAGS := -fPIC SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=libretro/link.T CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__ - BUILTIN_GPU = neon - CFLAGS += -DNEON_PC MMAP_WIN32=1 - endif CFLAGS += -fPIC |