lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12 from sergiobenrocha2/master 

[ARM]Fix build, disable dynarec for now.
This commit is contained in:
Twinaphex 2015-02-01 22:22:18 +01:00
parent 9f81da3e2f fb984fcaef
commit ad90c5cad0
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Makefile
View File

@ -96,14 +96,13 @@ else ifeq ($(platform), osx)
ifeq ($(HAVE_DYNAREC),1) ifeq ($(HAVE_DYNAREC),1)
HAVE_MMAP = 1 HAVE_MMAP = 1
endif endif
ifndef ($(NOUNIVERSAL))
CFLAGS += $(ARCHFLAGS)
LDFLAGS += $(ARCHFLAGS)
endif
ifndef ($(NOUNIVERSAL)) # iOS
CFLAGS += $(ARCHFLAGS)
LDFLAGS += $(ARCHFLAGS)
endif
else ifeq ($(platform), ios) else ifeq ($(platform), ios)
# iOS
TARGET := $(TARGET_NAME)_libretro_ios.dylib TARGET := $(TARGET_NAME)_libretro_ios.dylib
fpic := -fPIC fpic := -fPIC
SHARED := -dynamiclib SHARED := -dynamiclib
@ -121,8 +120,9 @@ else ifeq ($(platform), ios)
CC += -miphoneos-version-min=5.0 CC += -miphoneos-version-min=5.0
CFLAGS += -miphoneos-version-min=5.0 CFLAGS += -miphoneos-version-min=5.0
endif endif
# iOS Theos
else ifeq ($(platform), theos_ios) else ifeq ($(platform), theos_ios)
# iOS Theos
DEPLOYMENT_IOSVERSION = 5.0 DEPLOYMENT_IOSVERSION = 5.0
TARGET = iphone:latest:$(DEPLOYMENT_IOSVERSION) TARGET = iphone:latest:$(DEPLOYMENT_IOSVERSION)
ARCHS = armv7 armv7s ARCHS = armv7 armv7s
@ -132,10 +132,10 @@ else ifeq ($(platform), theos_ios)
CFLAGS += -DIOS -DHAVE_POSIX_MEMALIGN -marm CFLAGS += -DIOS -DHAVE_POSIX_MEMALIGN -marm
CPU_ARCH := arm CPU_ARCH := arm
LIBRARY_NAME = $(TARGET_NAME)_libretro_ios
LIBRARY_NAME = $(TARGET_NAME)_libretro_ios # QNX
else ifeq ($(platform), qnx) else ifeq ($(platform), qnx)
# QNX
TARGET := $(TARGET_NAME)_libretro_qnx.so TARGET := $(TARGET_NAME)_libretro_qnx.so
fpic := -fPIC fpic := -fPIC
SHARED := -shared -Wl,--version-script=link.T SHARED := -shared -Wl,--version-script=link.T
@ -209,19 +209,20 @@ else ifneq (,$(findstring armv,$(platform)))
SHARED := -shared -Wl,--version-script=link.T SHARED := -shared -Wl,--version-script=link.T
CPU_ARCH := arm CPU_ARCH := arm
fpic := -fPIC fpic := -fPIC
CC = gcc ifneq (,$(findstring cortexa5,$(platform)))
ifneq (,$(findstring cortexa8,$(platform))) CFLAGS += -marm -mcpu=cortex-a5
ASFLAGS += -mcpu=cortex-a5
else ifneq (,$(findstring cortexa8,$(platform)))
CFLAGS += -marm -mcpu=cortex-a8 CFLAGS += -marm -mcpu=cortex-a8
ASFLAGS += -mcpu=cortex-a8 ASFLAGS += -mcpu=cortex-a8
else ifneq (,$(findstring cortexa9,$(platform))) else ifneq (,$(findstring cortexa9,$(platform)))
CFLAGS += -marm -mcpu=cortex-a9 CFLAGS += -marm -mcpu=cortex-a9
ASFLAGS += -mcpu=cortex-a9 ASFLAGS += -mcpu=cortex-a9
endif else ifneq (,$(findstring cortexa15a7,$(platform)))
CFLAGS += -marm CFLAGS += -marm -mcpu=cortex-a15.cortex-a7
ifneq (,$(findstring neon,$(platform))) ASFLAGS += -mcpu=cortex-a15.cortex-a7
CFLAGS += -mfpu=neon else
ASFLAGS += -mfpu=neon CFLAGS += -marm
HAVE_NEON = 1
endif endif
ifneq (,$(findstring softfloat,$(platform))) ifneq (,$(findstring softfloat,$(platform)))
CFLAGS += -mfloat-abi=softfp CFLAGS += -mfloat-abi=softfp
@ -230,9 +231,11 @@ else ifneq (,$(findstring armv,$(platform)))
CFLAGS += -mfloat-abi=hard CFLAGS += -mfloat-abi=hard
ASFLAGS += -mfloat-abi=hard ASFLAGS += -mfloat-abi=hard
endif endif
HAVE_DYNAREC := 1 # Disable dynarec for now, issue 11
CFLAGS += -DARM -DARM_ARCH -DARM_MEMORY_DYNAREC #HAVE_DYNAREC := 1
LDFLAGS := -Wl,--no-undefined #CFLAGS += -DARM -DARM_ARCH -DARM_MEMORY_DYNAREC
CFLAGS += -DARM -DARM_ARCH
LDFLAGS := -Wl,--no-undefined
# emscripten # emscripten
else ifeq ($(platform), emscripten) else ifeq ($(platform), emscripten)