Merge branch 'master' of https://github.com/libretro/picodrive

diff --combined Makefile.libretro
index 9b68191,4d34134..5d16ca7
--- 1/Makefile.libretro
--- 2/Makefile.libretro
+++ b/Makefile.libretro
@@@ -23,7 -23,6 +23,7 @@@ AS ?= a
  CC_AS ?= $(CC)
  CFLAGS ?=
  
 +STATIC_LINKING:= 0
  TARGET_NAME := picodrive
  LIBM := -lm
  GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
@@@ -40,15 -39,9 +40,15 @@@ asm_cdmemory = 
  asm_mix = 0
  
  fpic :=
 +
 +ifeq ($(STATIC_LINKING),1)
 +EXT=a
 +endif
 +
  # Unix
  ifeq ($(platform), unix)
 -      TARGET := $(TARGET_NAME)_libretro.so
 +      EXT ?= so
 +      TARGET := $(TARGET_NAME)_libretro.$(EXT)
     fpic := -fPIC
        SHARED := -shared
        DONT_COMPILE_IN_ZLIB = 1
@@@ -56,8 -49,7 +56,8 @@@
  
  # Portable Linux
  else ifeq ($(platform), linux-portable)
 -      TARGET := $(TARGET_NAME)_libretro.so
 +      EXT ?= so
 +      TARGET := $(TARGET_NAME)_libretro.$(EXT)
        SHARED := -shared -nostdlib
     fpic := -fPIC
        LIBM :=
@@@ -66,8 -58,7 +66,8 @@@
  
  # OS X
  else ifeq ($(platform), osx)
 -      TARGET := $(TARGET_NAME)_libretro.dylib
 +      EXT ?= dylib
 +      TARGET := $(TARGET_NAME)_libretro.$(EXT)
        SHARED := -dynamiclib
     fpic := -fPIC
        APPLE := 1
@@@ -88,11 -79,10 +88,10 @@@ else ifeq ($(platform), staticios
        ifeq ($(IOSSDK),)
                IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
        endif
-       CC = clang -arch armv7 -isysroot $(IOSSDK)
-       CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
+       CC = clang -arch armv7 -arch arm64 -isysroot $(IOSSDK)
+       CXX = clang++ -arch armv7 -arch arm64 -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
+       CFLAGS += -marm 
        CFLAGS += -DIOS
  
        CC     += -miphoneos-version-min=8.0