From 133c655bfcec8e3105ea4d1fc028c6d2ba9e4cdb Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 15 Mar 2021 14:42:12 +0100 Subject: [PATCH] Add more targets --- .gitlab-ci.yml | 51 +++++++++++++++++++++++++++++++ Makefile | 81 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 121 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d160d0ed..71ef2360 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,27 @@ include: - project: 'libretro-infrastructure/ci-templates' file: '/linux-x64.yml' + # Linux 32-bit + - project: 'libretro-infrastructure/ci-templates' + file: '/linux-i686.yml' + + # MacOS 64-bit + - project: 'libretro-infrastructure/ci-templates' + file: '/osx-x64.yml' + + ################################## CELLULAR ################################ + # iOS + - project: 'libretro-infrastructure/ci-templates' + file: '/ios-arm64.yml' + + # iOS (armv7) + - project: 'libretro-infrastructure/ci-templates' + file: '/ios9.yml' + + ################################## CONSOLES ################################ + + #################################### MISC ################################## + # Stages for building stages: - build-prepare @@ -67,3 +88,33 @@ libretro-build-linux-x64: HAVE_THR_AL: 1 HAVE_PARALLEL: 1 HAVE_PARALLEL_RSP: 1 + +# Linux 32-bit +libretro-build-linux-i686: + extends: + - .core-defs + - .libretro-linux-i686-make-default + variables: + WITH_DYNAREC: i686 + HAVE_THR_AL: 1 + HAVE_PARALLEL: 1 + HAVE_PARALLEL_RSP: 1 + +# MacOS 64-bit +libretro-build-osx-x64: + extends: + - .libretro-osx-x64-make-default + - .core-defs + +################################### CELLULAR ################################# +# iOS +libretro-build-ios-arm64: + extends: + - .libretro-ios-arm64-make-default + - .core-defs + +# iOS (armv7) [iOS 9 and up] +libretro-build-ios9: + extends: + - .libretro-ios9-make-default + - .core-defs diff --git a/Makefile b/Makefile index 07aeb8ad..16bc2e85 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,8 @@ GLIDEN64CORE=0 GLIDEN64ES=0 HAVE_RSP_DUMP=0 HAVE_RDP_DUMP=0 +HAVE_GLIDE64=1 +HAVE_GLN64=1 HAVE_RICE=1 HAVE_PARALLEL?=0 HAVE_PARALLEL_RSP?=0 @@ -68,6 +70,9 @@ ifeq ($(shell uname -a),) else ifneq ($(findstring Darwin,$(shell uname -a)),) system_platform = osx arch = intel + ifeq ($(shell uname -p),arm) + arch = arm + endif ifeq ($(shell uname -p),powerpc) arch = ppc endif @@ -284,24 +289,51 @@ else ifneq (,$(findstring imx6,$(platform))) else ifneq (,$(findstring osx,$(platform))) TARGET := $(TARGET_NAME)_libretro.dylib LDFLAGS += -dynamiclib + MINVERSION := -mmacosx-version-min=10.7 OSXVER = `sw_vers -productVersion | cut -d. -f 2` OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` - LDFLAGS += -mmacosx-version-min=10.7 + LDFLAGS += $(MINVERSION) LDFLAGS += -stdlib=libc++ fpic = -fPIC HAVE_THR_AL=1 HAVE_PARALLEL=0 PLATCFLAGS += -D__MACOSX__ -DOSX - GL_LIB := -framework OpenGL PLATFORM_EXT := unix PLATCFLAGS += -DHAVE_POSIX_MEMALIGN + # Disable hardware rendered graphics plugins for ARM for now + ifeq ($(shell uname -p),arm) + WITH_DYNAREC = + CFLAGS += -DDONT_WANT_ARM_OPTIMIZATIONS + HAVE_OPENGL=0 + else + GL_LIB := -framework OpenGL + endif + # Target Dynarec ifeq ($(ARCH), $(filter $(ARCH), ppc)) WITH_DYNAREC = endif + ifeq ($(CROSS_COMPILE),1) + TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT) + CFLAGS += $(TARGET_RULE) + CPPFLAGS += $(TARGET_RULE) + CXXFLAGS += $(TARGET_RULE) + LDFLAGS += $(TARGET_RULE) + + ifeq ($(arch),arm) + HAVE_OPENGL=0 + WITH_DYNAREC = + CFLAGS += -DDONT_WANT_ARM_OPTIMIZATIONS + endif + endif + + CFLAGS += $(ARCHFLAGS) + CXXFLAGS += $(ARCHFLAGS) + LDFLAGS += $(ARCHFLAGS) + # iOS else ifneq (,$(findstring ios,$(platform))) ifeq ($(IOSSDK),) @@ -313,6 +345,7 @@ else ifneq (,$(findstring ios,$(platform))) GLES = 1 WITH_DYNAREC= PLATFORM_EXT := unix + MINVERSION := HAVE_PARALLEL=0 PLATCFLAGS += -DHAVE_POSIX_MEMALIGN -DNO_ASM @@ -337,17 +370,43 @@ else ifneq (,$(findstring ios,$(platform))) HAVE_NEON=1 endif CC_AS = perl ./tools/gas-preprocessor.pl $(CC) - ifeq ($(platform),ios9) - CC += -miphoneos-version-min=8.0 - CC_AS += -miphoneos-version-min=8.0 - CXX += -miphoneos-version-min=8.0 - PLATCFLAGS += -miphoneos-version-min=8.0 +ifeq ($(platform),$(filter $(platform),ios9 ios-arm64)) + MINVERSION = -miphoneos-version-min=8.0 else - CC += -miphoneos-version-min=5.0 - CC_AS += -miphoneos-version-min=5.0 - CXX += -miphoneos-version-min=5.0 - PLATCFLAGS += -miphoneos-version-min=5.0 + MINVERSION = -miphoneos-version-min=5.0 endif + PLATCFLAGS += $(MINVERSION) + +else ifeq ($(platform), tvos-arm64) + ifeq ($(IOSSDK),) + IOSSDK := $(shell xcodebuild -version -sdk appletvos Path) + endif + + TARGET := $(TARGET_NAME)_libretro_tvos.dylib + DEFINES += -DIOS + GLES = 1 + WITH_DYNAREC= + PLATFORM_EXT := unix + MINVERSION := + + HAVE_PARALLEL=0 + PLATCFLAGS += -DHAVE_POSIX_MEMALIGN -DNO_ASM + PLATCFLAGS += -DIOS -marm + CPUFLAGS += -DNO_ASM -DARM -D__arm__ -DARM_ASM -D__NEON_OPT + LDFLAGS += -dynamiclib + + fpic = -fPIC + GL_LIB := -framework OpenGLES + CC = cc -arch arm64 -isysroot $(IOSSDK) + CXX = c++ -arch arm64 -isysroot $(IOSSDK) + CFLAGS += -DDONT_WANT_ARM_OPTIMIZATIONS + FORCE_GLES=1 + CXXFLAGS += -Wc++11-extensions -std=c++11 -stdlib=libc++ -Wc++11-long-long + CPUFLAGS += -marm -mfpu=neon -mfloat-abi=softfp + HAVE_NEON=0 + CC_AS = perl ./tools/gas-preprocessor.pl $(CC) + MINVERSION = -miphoneos-version-min=8.0 + PLATCFLAGS += $(MINVERSION) # Theos iOS else ifneq (,$(findstring theos_ios,$(platform)))