Skip to content

Make: Support Apple Silicon in Universal Build #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 9, 2022
Merged

Make: Support Apple Silicon in Universal Build #348

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
517cd05
Make: Support Apple Silicon in universal build
sanssecours Feb 6, 2022
dcf0443
Make: Remove 32 bit support from universal build
sanssecours Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config/Makefile.darwin-universal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Needs to be clang toolchain for universal: -arch i386 -arch x86_64
# Needs to be clang toolchain for universal: -arch x86_64 -arch arm64
#
GLEW_DEST = /usr/local
NAME = $(GLEW_NAME)
Expand All @@ -11,8 +11,8 @@ STRIP =
CFLAGS.EXTRA = -dynamic -fno-common
CFLAGS.EXTRA += -pedantic
CFLAGS.EXTRA += -fPIC
CFLAGS.EXTRA += -arch i386 -arch x86_64
LDFLAGS.EXTRA = -arch i386 -arch x86_64
CFLAGS.EXTRA += -arch x86_64 -arch arm64
LDFLAGS.EXTRA = -arch x86_64 -arch arm64
ifneq (undefined, $(origin GLEW_APPLE_GLX))
CFLAGS.EXTRA += -std=c99
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
Expand Down