libretro, more fixes and cleanups for windows and osx

This commit is contained in:
kub 2020-07-08 20:46:46 +02:00
parent 0198149a72
commit 6b67b6aa13
6 changed files with 61 additions and 96 deletions

View file

@ -37,6 +37,8 @@ asm_ym2612 = 0
asm_misc = 0
asm_cdmemory = 0
asm_mix = 0
asm_32xdraw = 0
asm_32xmemory = 0
fpic :=
@ -48,7 +50,7 @@ endif
ifeq ($(platform), unix)
EXT ?= so
TARGET := $(TARGET_NAME)_libretro.$(EXT)
fpic := -fPIC
fpic := -fPIC
SHARED := -shared
DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -DFAMEC_NO_GOTOS
@ -59,7 +61,7 @@ else ifeq ($(platform), linux-portable)
EXT ?= so
TARGET := $(TARGET_NAME)_libretro.$(EXT)
SHARED := -shared -nostdlib
fpic := -fPIC
fpic := -fPIC
LIBM :=
DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -DFAMEC_NO_GOTOS
@ -70,7 +72,7 @@ else ifeq ($(platform), osx)
EXT ?= dylib
TARGET := $(TARGET_NAME)_libretro.$(EXT)
SHARED := -dynamiclib
fpic := -fPIC
fpic := -fPIC
APPLE := 1
arch = intel
ifeq ($(shell uname -p),powerpc)
@ -78,6 +80,8 @@ else ifeq ($(platform), osx)
endif
ifeq ($(arch),ppc)
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
else
use_sh2drc = 1
endif
OSXVER = `sw_vers -productVersion | cut -d. -f 2`
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
@ -99,21 +103,21 @@ else ifeq ($(platform), staticios)
CXX += -miphoneos-version-min=8.0
CC_AS += -miphoneos-version-min=8.0
CFLAGS += -miphoneos-version-min=8.0
ARCH := arm
ARCH := aarch64
STATIC_LINKING = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 0
use_sh2drc = 1
use_svpdrc = 0
# iOS
else ifneq (,$(findstring ios,$(platform)))
TARGET := $(TARGET_NAME)_libretro_ios.dylib
SHARED := -dynamiclib
fpic := -fPIC
fpic := -fPIC
APPLE := 1
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
@ -155,17 +159,11 @@ else ifeq ($(platform), ps3)
NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
asm_memory = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
asm_cdpico = 0
asm_cdmemory = 0
asm_mix = 0
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
# sncps3
else ifeq ($(platform), sncps3)
@ -177,17 +175,11 @@ else ifeq ($(platform), sncps3)
NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
asm_memory = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
asm_cdpico = 0
asm_cdmemory = 0
asm_mix = 0
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
# Lightweight PS3 Homebrew SDK
else ifeq ($(platform), psl1ght)
@ -199,17 +191,11 @@ else ifeq ($(platform), psl1ght)
NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
asm_memory = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
asm_cdpico = 0
asm_cdmemory = 0
asm_mix = 0
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
# PSP
else ifeq ($(platform), psp1)
@ -222,17 +208,12 @@ else ifeq ($(platform), psp1)
NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
asm_memory = 0
asm_render = 1
asm_ym2612 = 0
asm_misc = 0
asm_cdpico = 0
asm_cdmemory = 0
asm_mix = 0
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
# CTR (3DS)
else ifeq ($(platform), ctr)
@ -250,14 +231,6 @@ else ifeq ($(platform), ctr)
ARCH = arm
ARM_ASM = 1
asm_memory = 1
asm_render = 1
asm_ym2612 = 1
asm_misc = 1
asm_cdpico = 1
asm_cdmemory = 1
asm_mix = 1
use_cyclone = 1
use_fame = 0
use_drz80 = 1
@ -280,14 +253,6 @@ else ifeq ($(platform), raspberrypi)
fpic := -fPIC
DONT_COMPILE_IN_ZLIB = 1
asm_memory = 1
asm_render = 1
asm_ym2612 = 1
asm_misc = 1
asm_cdpico = 1
asm_cdmemory = 1
asm_mix = 1
use_cyclone = 1
use_fame = 0
use_drz80 = 1
@ -309,14 +274,8 @@ else ifeq ($(platform), vita)
NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1
ARCH = arm
ARM_ASM = 1
asm_memory = 1
asm_render = 1
asm_ym2612 = 1
asm_misc = 1
asm_cdpico = 1
asm_cdmemory = 1
asm_mix = 1
use_cyclone = 1
use_fame = 0
use_drz80 = 1
@ -348,7 +307,7 @@ else ifeq ($(platform), wii)
# QNX
else ifeq ($(platform), qnx)
TARGET := $(TARGET_NAME)_libretro_$(platform).so
fpic := -fPIC
fpic := -fPIC
CC = qcc -Vgcc_ntoarmv7le
CC_AS = $(CC)
CFLAGS += -DBASE_ADDR_FIXED=0 -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
@ -367,7 +326,7 @@ else ifeq ($(platform), qnx)
else ifneq (,$(findstring armv,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so
SHARED := -shared -Wl,--no-undefined,-Bsymbolic
fpic := -fPIC
fpic := -fPIC
ifneq (,$(findstring cortexa5,$(platform)))
CFLAGS += -marm -mcpu=cortex-a5
ASFLAGS += -mcpu=cortex-a5
@ -408,21 +367,14 @@ else ifeq ($(platform), emscripten)
# GCW0
else ifeq ($(platform), gcw0)
TARGET := $(TARGET_NAME)_libretro.so
CC = /opt/gcw0-toolchain/usr/bin/mipsel-linux-gcc
AR = /opt/gcw0-toolchain/usr/bin/mipsel-linux-ar
CC = mipsel-linux-gcc
AR = mipsel-linux-ar
SHARED := -shared -nostdlib
fpic := -fPIC
fpic := -fPIC
LIBM :=
DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
asm_memory = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
asm_cdpico = 0
asm_cdmemory = 0
asm_mix = 0
use_cyclone = 0
use_fame = 1
use_drz80 = 0
@ -452,6 +404,8 @@ asm_ym2612 = 1
asm_misc = 1
asm_cdmemory = 1
asm_mix = 1
asm_32xdraw = 1
asm_32xmemory = 1
endif
CFLAGS += $(fpic)