notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update libretro.h
[pcsx_rearmed.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
6f7b29a
..
7c16422
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-25,25
+25,40
@@
ifeq ($(platform), unix)
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
SHARED := -shared -Wl,--version-script=libretro/link.T
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
SHARED := -shared -Wl,--version-script=libretro/link.T
+ BUILTIN_GPU = neon
+ CFLAGS += -DNEON_PC
else ifeq ($(platform), osx)
TARGET := $(TARGET_NAME)_libretro.dylib
fpic := -fPIC
SHARED := -dynamiclib
else ifeq ($(platform), osx)
TARGET := $(TARGET_NAME)_libretro.dylib
fpic := -fPIC
SHARED := -dynamiclib
+ BUILTIN_GPU = neon
+ CFLAGS += -DNEON_PC
+OSXVER = `sw_vers -productVersion | cut -c 4`
+ifneq ($(OSXVER),9)
+ fpic += -mmacosx-version-min=10.5
+endif
else ifeq ($(platform), ios)
ARCH := arm
TARGET := $(TARGET_NAME)_libretro_ios.dylib
fpic := -fPIC
SHARED := -dynamiclib
else ifeq ($(platform), ios)
ARCH := arm
TARGET := $(TARGET_NAME)_libretro_ios.dylib
fpic := -fPIC
SHARED := -dynamiclib
- CC = clang -arch armv7 -isysroot $(IOSSDK)
-miphoneos-version-min=5.0
- CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
-miphoneos-version-min=5.0
- CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
-miphoneos-version-min=5.0
- CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
-miphoneos-version-min=5.0
+ CC = clang -arch armv7 -isysroot $(IOSSDK)
+ CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
+ CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
+ CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
HAVE_NEON = 1
BUILTIN_GPU = neon
USE_DYNAREC = 1
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
HAVE_NEON = 1
BUILTIN_GPU = neon
USE_DYNAREC = 1
- CFLAGS += -DIOS -miphoneos-version-min=5.0
+ CFLAGS += -DIOS
+OSXVER = `sw_vers -productVersion | cut -c 4`
+ifneq ($(OSXVER),9)
+ CC += -miphoneos-version-min=5.0
+ CXX += -miphoneos-version-min=5.0
+ CC_AS += -miphoneos-version-min=5.0
+ CFLAGS += -miphoneos-version-min=5.0
+endif
else ifeq ($(platform), ps3)
TARGET := $(TARGET_NAME)_libretro_ps3.a
CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
else ifeq ($(platform), ps3)
TARGET := $(TARGET_NAME)_libretro_ps3.a
CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
@@
-118,12
+133,14
@@
endif
ARCH = arm
USE_DYNAREC = 1
else
ARCH = arm
USE_DYNAREC = 1
else
- TARGET := $(TARGET_NAME)_retro.dll
+ TARGET := $(TARGET_NAME)_
lib
retro.dll
CC = gcc
fpic := -fPIC
LD_FLAGS := -fPIC
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=libretro/link.T
CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
CC = gcc
fpic := -fPIC
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
endif
CFLAGS += -fPIC
endif
CFLAGS += -fPIC
@@
-144,11
+161,6
@@
NO_CONFIG_MAK = yes
include Makefile
include Makefile
-# workaround segfault for this file seen on:
-# Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn)
-libpcsxcore/new_dynarec/pcsxmem.o: libpcsxcore/new_dynarec/pcsxmem.c
- $(CC) -c -o $@ $< $(CPPFLAGS) $(CFLAGS) -Os
-
# no special AS needed for gpu_neon
plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o: plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S
$(CC) $(CFLAGS) -c $^ -o $@
# no special AS needed for gpu_neon
plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o: plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S
$(CC) $(CFLAGS) -c $^ -o $@