Update submodules

[picodrive.git] / Makefile.libretro

diff --git a/Makefile.libretro b/Makefile.libretro
index d1a7502..5d16ca7 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -23,6 +23,7 @@ AS ?= as
 CC_AS ?= $(CC)
 CFLAGS ?=
 
+STATIC_LINKING:= 0
 TARGET_NAME := picodrive
 LIBM := -lm
 GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
@@ -39,9 +40,15 @@ asm_cdmemory = 0
 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
@@ -49,7 +56,8 @@ ifeq ($(platform), unix)
 
 # 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 :=
@@ -58,7 +66,8 @@ else ifeq ($(platform), linux-portable)
 
 # OS X
 else ifeq ($(platform), osx)
-       TARGET := $(TARGET_NAME)_libretro.dylib
+       EXT ?= dylib
+       TARGET := $(TARGET_NAME)_libretro.$(EXT)
        SHARED := -dynamiclib
    fpic := -fPIC
        APPLE := 1
@@ -79,11 +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
@@ -97,8 +105,8 @@ else ifeq ($(platform), staticios)
        use_fame = 1
        use_drz80 = 0
        use_cz80 = 1
-       use_sh2drc = 1
-       use_svpdrc = 1
+       use_sh2drc = 0
+       use_svpdrc = 0
 
 # iOS
 else ifneq (,$(findstring ios,$(platform)))