diff --git a/lib-jpeg-turbo/macos/osx-arm-64/libturbojpeg.a b/lib-jpeg-turbo/macos/osx-arm-64/libturbojpeg.a new file mode 100644 index 0000000..6b621a4 Binary files /dev/null and b/lib-jpeg-turbo/macos/osx-arm-64/libturbojpeg.a differ diff --git a/makefile b/makefile index 1c76399..a045671 100644 --- a/makefile +++ b/makefile @@ -65,7 +65,8 @@ # ARCHID=2 # Windows Console x86 64 bit # ARCHID=3 # Windows Service x86 32 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=6 # Linux x86 64 bit # make linux ARCHID=7 # Linux MIPS @@ -190,13 +191,25 @@ KVM = 1 LMS = 1 endif -# Official MacOS x86 64bit +# Official macOS x86 64bit ifeq ($(ARCHID),16) ARCHNAME = osx-x86-64 KVM = 1 LMS = 0 +MACOSARCH = -mmacosx-version-min=10.5 +CC = gcc -arch x86_64 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 ifeq ($(ARCHID),7) ARCHNAME = mips @@ -533,7 +546,7 @@ linux: $(STRIP) 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) $(STRIP) diff --git a/openssl/libstatic/macos/osx-arm-64/libcrypto.a b/openssl/libstatic/macos/osx-arm-64/libcrypto.a new file mode 100644 index 0000000..1ea0503 Binary files /dev/null and b/openssl/libstatic/macos/osx-arm-64/libcrypto.a differ diff --git a/openssl/libstatic/macos/osx-arm-64/libssl.a b/openssl/libstatic/macos/osx-arm-64/libssl.a new file mode 100644 index 0000000..17582c9 Binary files /dev/null and b/openssl/libstatic/macos/osx-arm-64/libssl.a differ