Merge pull request #9 from warmenhoven/warmenhoven/pr/apple

Add osx, ios, tvos builds

Author: zoltanvb

.gitlab-ci.yml

@@ -31,21 +31,21 @@ include:
   #  file: '/linux-i686.yml'
 
   # MacOS 64-bit
-  #- project: 'libretro-infrastructure/ci-templates'
-  #  file: '/osx-x64.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-x64.yml'
 
   # MacOS ARM 64-bit
-  #- project: 'libretro-infrastructure/ci-templates'
-  #  file: '/osx-arm64.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-arm64.yml'
 
   ################################## CELLULAR ################################
   # Android
   #- project: 'libretro-infrastructure/ci-templates'
   #  file: '/android-jni.yml'
 
   # iOS
-  #- project: 'libretro-infrastructure/ci-templates'
-  #  file: '/ios-arm64.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/ios-arm64.yml'
 
   # iOS (armv7)
   #- project: 'libretro-infrastructure/ci-templates'
@@ -77,8 +77,8 @@ include:
   #  file: '/libnx-static.yml'
 
   # tvOS (AppleTV)
-  #- project: 'libretro-infrastructure/ci-templates'
-  #  file: '/tvos-arm64.yml'
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/tvos-arm64.yml'
 
   # OpenDingux
   #- project: 'libretro-infrastructure/ci-templates'
@@ -129,16 +129,16 @@ libretro-build-linux-x64:
 #    - .core-defs
 
 # MacOS 64-bit
-#libretro-build-osx-x64:
-#  extends:
-#    - .libretro-osx-x64-make-default
-#    - .core-defs
+libretro-build-osx-x64:
+  extends:
+    - .libretro-osx-x64-make-default
+    - .core-defs
 
 # MacOS ARM 64-bit
-#libretro-build-osx-arm64:
-#  extends:
-#    - .libretro-osx-arm64-make-default
-#    - .core-defs
+libretro-build-osx-arm64:
+  extends:
+    - .libretro-osx-arm64-make-default
+    - .core-defs
 
 ################################### CELLULAR #################################
 # Android ARMv7a
@@ -166,10 +166,10 @@ libretro-build-linux-x64:
 #    - .core-defs
 
 # iOS
-#libretro-build-ios-arm64:
-#  extends:
-#    - .libretro-ios-arm64-make-default
-#    - .core-defs
+libretro-build-ios-arm64:
+  extends:
+    - .libretro-ios-arm64-make-default
+    - .core-defs
 
 # iOS (armv7) [iOS 9 and up]
 #libretro-build-ios9:
@@ -178,10 +178,10 @@ libretro-build-linux-x64:
 #    - .core-defs
 
 # tvOS
-#libretro-build-tvos-arm64:
-#  extends:
-#    - .libretro-tvos-arm64-make-default
-#    - .core-defs
+libretro-build-tvos-arm64:
+  extends:
+    - .libretro-tvos-arm64-make-default
+    - .core-defs
 
 ################################### CONSOLES #################################
 # PlayStation Vita

src/libretro/Makefile

@@ -77,6 +77,8 @@ else ifeq ($(platform), osx)
 	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
 	ifeq ($(OSX_LT_MAVERICKS),"YES")
 		MINVERSION = -mmacosx-version-min=10.5
+	else
+		MINVERSION = -mmacosx-version-min=10.12
 	endif
 	fpic += $(MINVERSION)
 
@@ -88,8 +90,8 @@ else ifeq ($(platform), osx)
 		LDFLAGS  += $(TARGET_RULE)
    endif
 
-	CFLAGS  += $(ARCHFLAGS)
-	CXXFLAGS  += $(ARCHFLAGS)
+	CFLAGS  += $(ARCHFLAGS) -DSYSTEM_HAVE_STRLCPY
+	CXXFLAGS  += $(ARCHFLAGS) -DSYSTEM_HAVE_STRLCPY
 	LDFLAGS += $(ARCHFLAGS)
 
 # iOS
@@ -120,6 +122,10 @@ else
 endif
 	PLATFORM_DEFINES := $(MINVERSION)
 
+	CFLAGS  += $(ARCHFLAGS) -DSYSTEM_HAVE_STRLCPY -DIOS
+	CXXFLAGS  += $(ARCHFLAGS) -DSYSTEM_HAVE_STRLCPY -DIOS
+	LDFLAGS += $(ARCHFLAGS)
+
 # tvOS
 else ifeq ($(platform), tvos-arm64)
 	TARGET := $(TARGET_NAME)_libretro_tvos.dylib
@@ -134,6 +140,11 @@ else ifeq ($(platform), tvos-arm64)
 	CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
 	CXX   = c++ -arch arm64 -isysroot $(IOSSDK)
 
+	PLATFORM_DEFINES := -mappletvos-version-min=11.0
+
+	CFLAGS  += $(ARCHFLAGS) -DSYSTEM_HAVE_STRLCPY -DIOS
+	CXXFLAGS  += $(ARCHFLAGS) -DSYSTEM_HAVE_STRLCPY -DIOS
+	LDFLAGS += $(ARCHFLAGS)
 
 # Lightweight PS3 Homebrew SDK
 else ifneq (,$(filter $(platform), ps3 psl1ght))

src/libretro/Makefile.common

@@ -55,7 +55,7 @@ SOURCES_C := \
 	$(CORE_DIR)/shared/c/path.c \
 
 
-ifneq (,$(findstring osx,$(platform)))
+ifneq (,$(filter osx ios-arm64 tvos-arm64,$(platform)))
 SOURCES_CPP += \
 	$(CORE_DIR)/shared/c/system_osx.cpp \
 

src/shared/c/system_osx.cpp

@@ -20,14 +20,21 @@
 #include <vector>
 #include <string>
 #include <mach/mach_time.h>
+#include <pthread.h>
+#ifndef IOS
 #include <sys/proc_info.h>
+#else
+#include <TargetConditionals.h>
+#endif
 //#define THREAD_NAME_SIZE (MAXTHREADNAMESIZE)
 
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 
 /* If true, use `atos' to get higher-quality backtrace symbols. */
+#ifndef IOS
 #define USE_ATOS 1
+#endif
 
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////

src/shared/h/shared/system.h

@@ -13,6 +13,7 @@
 #include <stddef.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <errno.h>
 #ifdef _MSC_VER
 // This is the relevant part of intrin.h. Don't #include it; it is somewhat slow
 // to parse (for whatever reason) and it saves a few seconds in a full rebuild