diff options
| author | Twinaphex | 2014-12-09 22:48:03 +0100 |
|---|---|---|
| committer | Twinaphex | 2014-12-09 22:48:03 +0100 |
| commit | dee3a94edb31049e908cdba347edfbf0c6a654c8 (patch) | |
| tree | 778184a60e7ae944d4ff5470760614a99269f9e7 | |
| parent | 8d2578eefc3c56d8af317f9a8488442b662e673a (diff) | |
| download | picogpsp-dee3a94edb31049e908cdba347edfbf0c6a654c8.tar.gz picogpsp-dee3a94edb31049e908cdba347edfbf0c6a654c8.tar.bz2 picogpsp-dee3a94edb31049e908cdba347edfbf0c6a654c8.zip | |
Start adding ARCH_ARM rules
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | Makefile.common | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -72,6 +72,7 @@ else ifeq ($(platform), ios) TARGET := $(TARGET_NAME)_libretro_ios.dylib fpic := -fPIC SHARED := -dynamiclib + CPU_ARCH := arm ifeq ($(IOSSDK),) IOSSDK := $(shell xcrun -sdk iphoneos -show-sdk-path) @@ -211,6 +212,10 @@ OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_ASM:.S=.o) DEFINES = -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline -DPC_BUILD -Wall +ifeq ($(CPU_ARCH), arm) +DEFINES += -DARM_ARCH +endif + WARNINGS_DEFINES = CODE_DEFINES = diff --git a/Makefile.common b/Makefile.common index 6a371be..259e4c3 100644 --- a/Makefile.common +++ b/Makefile.common @@ -23,7 +23,7 @@ SOURCES_ASM += $(CORE_DIR)/x86/x86_stub.S endif ifeq ($(CPU_ARCH), arm) SOURCES_ASM += $(CORE_DIR)/arm/arm_stub.S \ - $(CORE_DIR)/arm/video_blend.S + $(CORE_DIR)/arm/video_blend.S endif INCFLAGS := -I$(CORE_DIR) |