MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-11 05:43:33 +00:00
Code Issues Releases Wiki Activity

Added support for macOS running on Apple Silicon

Browse Source
This commit is contained in:
Bryan Roe
2020-11-12 00:28:40 -08:00
parent dfb62e8580
commit d96a6b9e03
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib-jpeg-turbo/macos/osx-arm-64/libturbojpeg.a Normal file
View File

Binary file not shown.

19
makefile
View File

@@ -65,7 +65,8 @@
# ARCHID=2 # Windows Console x86 64 bit # ARCHID=2 # Windows Console x86 64 bit
# ARCHID=3 # Windows Service x86 32 bit # ARCHID=3 # Windows Service x86 32 bit
# ARCHID=4 # Windows Service x86 64 bit # ARCHID=4 # Windows Service x86 64 bit
# make macos ARCHID=16 # Mac OS x86 64 bit # make macos ARCHID=16 # macOS x86 64 bit
# make macos ARCHID=29 # macOS ARM 64 bit
# make linux ARCHID=5 # Linux x86 32 bit # make linux ARCHID=5 # Linux x86 32 bit
# make linux ARCHID=6 # Linux x86 64 bit # make linux ARCHID=6 # Linux x86 64 bit
# make linux ARCHID=7 # Linux MIPS # make linux ARCHID=7 # Linux MIPS
@@ -190,13 +191,25 @@ KVM = 1
LMS = 1 LMS = 1
endif endif
# Official MacOS x86 64bit # Official macOS x86 64bit
ifeq ($(ARCHID),16) ifeq ($(ARCHID),16)
ARCHNAME = osx-x86-64 ARCHNAME = osx-x86-64
KVM = 1 KVM = 1
LMS = 0 LMS = 0
MACOSARCH = -mmacosx-version-min=10.5
CC = gcc -arch x86_64
endif endif
# Official macOS ARM 64bit
ifeq ($(ARCHID),29)
ARCHNAME = osx-arm-64
KVM = 1
LMS = 0
MACOSARCH = -target arm64-apple-macos11
CC = gcc -arch arm64
endif
# Official Linux MIPS # Official Linux MIPS
ifeq ($(ARCHID),7) ifeq ($(ARCHID),7)
ARCHNAME = mips ARCHNAME = mips
@@ -533,7 +546,7 @@ linux:
$(STRIP) $(STRIP)
macos: macos:
$(MAKE) $(MAKEFILE) EXENAME="$(EXENAME)_$(ARCHNAME)" ADDITIONALSOURCES="$(MACOSKVMSOURCES)" CFLAGS="-arch x86_64 -mmacosx-version-min=10.5 -std=gnu99 -Wall -DJPEGMAXBUF=$(KVMMaxTile) -DMESH_AGENTID=$(ARCHID) -D_POSIX -D_NOILIBSTACKDEBUG -D_NOHECI -DMICROSTACK_PROXY -D__APPLE__ $(CWEBLOG) -fno-strict-aliasing $(INCDIRS) $(CFLAGS) $(CEXTRA)" LDFLAGS="$(MACSSL) $(MACOSFLAGS) -L. -lpthread -ldl -lz -lutil -framework IOKit -framework ApplicationServices -framework SystemConfiguration -framework CoreFoundation -fconstant-cfstrings $(LDFLAGS) $(LDEXTRA)" $(MAKE) $(MAKEFILE) EXENAME="$(EXENAME)_$(ARCHNAME)" ADDITIONALSOURCES="$(MACOSKVMSOURCES)" CFLAGS="$(MACOSARCH) -std=gnu99 -Wall -DJPEGMAXBUF=$(KVMMaxTile) -DMESH_AGENTID=$(ARCHID) -D_POSIX -D_NOILIBSTACKDEBUG -D_NOHECI -DMICROSTACK_PROXY -D__APPLE__ $(CWEBLOG) -fno-strict-aliasing $(INCDIRS) $(CFLAGS) $(CEXTRA)" LDFLAGS="$(MACSSL) $(MACOSFLAGS) -L. -lpthread -ldl -lz -lutil -framework IOKit -framework ApplicationServices -framework SystemConfiguration -framework CoreFoundation -fconstant-cfstrings $(LDFLAGS) $(LDEXTRA)"
$(SYMBOLCP) $(SYMBOLCP)
$(STRIP) $(STRIP)

BIN
openssl/libstatic/macos/osx-arm-64/libcrypto.a Normal file
View File

Binary file not shown.

BIN
openssl/libstatic/macos/osx-arm-64/libssl.a Normal file
View File

Binary file not shown.