Merge pull request #2014 from The-SamminAter/master

Add ability to compile on iOS

CHANGELOG.md

@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Added support for compiling on iOS (@The-SamminAter)
  - Fixed viewing MFC dump - border char is now white (@iceman1001)
  - Changed `data diff` - to print filenames in header if it fits (@iceman1001)
  - Changed viewing MFC dump files - it now colors ACL + GPB bytes (@iceman1001)

Makefile.defs

@@ -75,7 +75,15 @@ else
 endif
 
 ifeq ($(platform),Darwin)
-  USE_BREW ?= 1
+    ifeq ($(shell uname -p),arm64)
+        # The platform is iOS
+        USE_BREW ?= 0
+        # iOS refuses to compile unless this is set
+        export IPHONEOS_DEPLOYMENT_TARGET=11.0
+    else
+        # M* macOS devices return arm
+        USE_BREW ?= 1
+    endif
   USE_MACPORTS ?= 0
   AR= /usr/bin/ar rcs
   RANLIB= /usr/bin/ranlib
@@ -132,6 +140,10 @@ ifeq ($(shell expr $(CC_VERSION) \>= 10), 1)
   endif
 endif
 ifeq ($(platform),Darwin)
+  ifeq ($(shell uname -p),arm64)
+    # iOS will refuse to compile without the minimum target of iOS 11.0
+    DEFCFLAGS += -mios-version-min=11.0
+  endif
   # their readline has strict-prototype issues
   DEFCFLAGS += -Wno-strict-prototypes
   # some warnings about braced initializers on structs we want to ignore

client/CMakeLists.txt

@@ -380,7 +380,13 @@ message(STATUS "CMAKE_SYSTEM_PROCESSOR := ${CMAKE_SYSTEM_PROCESSOR}")
 if (APPLE)
     message(STATUS "Apple device detected.")
     set(ADDITIONAL_SRC ${PM3_ROOT}/client/src/util_darwin.h  ${PM3_ROOT}/client/src/util_darwin.m ${ADDITIONAL_SRC})
-    set(ADDITIONAL_LNK "-framework Foundation" "-framework AppKit")
+    if (EXISTS /private/var/mobile)
+        message(STATUS "iOS detected.")
+        set(ADDITIONAL_LNK "-framework Foundation" "-framework UIKit")
+    else
+        message(STATUS "macOS detected.")
+        set(ADDITIONAL_LNK "-framework Foundation" "-framework AppKit")
+    endif (EXISTS /private/var/mobile)
 endif (APPLE)
 
 if ((NOT SKIPQT EQUAL 1) AND (Qt5_FOUND))

client/Makefile

@@ -434,7 +434,13 @@ LDFLAGS += $(MYLDFLAGS)
 
 PM3LDFLAGS = $(LDFLAGS)
 ifeq ($(platform),Darwin)
-    PM3LDFLAGS += -framework Foundation -framework AppKit
+    ifeq ($(shell uname -p),arm64)
+        # The platform is iOS
+        PM3LDFLAGS += -framework Foundation -framework UIKit
+    else
+        # M* macOS devices return arm
+        PM3LDFLAGS += -framework Foundation -framework AppKit
+    endif
 endif
 
 ###################

client/deps/hardnested/Makefile

@@ -22,6 +22,9 @@ endif
 ifneq ($(findstring aarch64, $(cpu_arch)), )
     IS_SIMD_ARCH=arm64
 endif
+ifneq ($(findstring iP, $(cpu_arch)), )
+    IS_SIMD_ARCH=arm64
+endif
 
 ifneq ($(IS_SIMD_ARCH), )
     MULTIARCHSRCS = hardnested_bf_core.c hardnested_bitarray_core.c

client/experimental_lib/CMakeLists.txt

@@ -380,7 +380,13 @@ message(STATUS "CMAKE_SYSTEM_PROCESSOR := ${CMAKE_SYSTEM_PROCESSOR}")
 if (APPLE)
     message(STATUS "Apple device detected.")
     set(ADDITIONAL_SRC ${PM3_ROOT}/client/src/util_darwin.h  ${PM3_ROOT}/client/src/util_darwin.m ${ADDITIONAL_SRC})
-    set(ADDITIONAL_LNK "-framework Foundation" "-framework AppKit")
+    if (EXISTS /private/var/mobile)
+        message(STATUS "iOS detected.")
+        set(ADDITIONAL_LNK "-framework Foundation" "-framework UIKit")
+    else
+        message(STATUS "macOS detected.")
+        set(ADDITIONAL_LNK "-framework Foundation" "-framework AppKit")
+    endif (EXISTS /private/var/mobile)
 endif (APPLE)
 
 if ((NOT SKIPQT EQUAL 1) AND (Qt5_FOUND))

tools/mfd_aes_brute/Makefile

@@ -9,6 +9,9 @@ MYLDLIBS = -lcrypto
 cpu_arch = $(shell uname -m)
 ifneq ($(findstring arm64, $(cpu_arch)), )
     MYCFLAGS += -mcpu=native
+# iOS 'fun'
+else ifneq ($(findstring iP, $(cpu_arch)), )
+    MYCFLAGS += -mcpu=native
 else
     MYCFLAGS += -march=native
 endif