X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.libretro;h=306c8afbb12cc4c296f0b9a20d0c102a5d87cf6e;hb=8baf63e2eb38af5c2e661feea2935d0455193ed8;hp=d1a7502942a26f59124693d542f6879226035541;hpb=9795f2cd889e10510c9dc14ddf8198a0f45f8363;p=picodrive.git

diff --git a/Makefile.libretro b/Makefile.libretro
index d1a7502..306c8af 100644
--- 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)"
@@ -34,14 +35,19 @@ asm_memory = 0
 asm_render = 0
 asm_ym2612 = 0
 asm_misc = 0
-asm_cdpico = 0
 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 +55,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 +65,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 +87,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 +104,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)))
@@ -438,16 +445,16 @@ ifeq ($(NO_MMAP),1)
 endif
 
 ifeq ($(ARM_ASM),1)
-	asm_memory = 1
-	asm_render = 1
-	asm_ym2612 = 1
-	asm_misc = 1
-	asm_cdpico = 1
-	asm_cdmemory = 1
-	asm_mix = 1
+asm_memory = 1
+asm_render = 1
+asm_ym2612 = 1
+asm_misc = 1
+asm_cdmemory = 1
+asm_mix = 1
 endif
 
 CFLAGS += $(fpic)
+
 ifeq ($(findstring Haiku,$(shell uname -a)),)
 	LDLIBS += $(LIBM)
 endif