Skip to content

Commit dfafa74

Browse files
ahbarnettahbarnett
committed
sprinkle some /opt/homebrew/ lib and include paths into make.in.macosx* as per R Neder; seems to be for M1 silicon. Have not tested
1 parent 09176c4 commit dfafa74

6 files changed

+15
-15
lines changed

‎make.inc.macosx_arm64

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ CC=clang
2626
CFLAGS += -I include -I/usr/local/include -I/opt/homebrew/include
2727
FFLAGS = $(CFLAGS)
2828
CXXFLAGS = $(CFLAGS)
29-
LIBS += -L/usr/local/lib
29+
LIBS += -L/usr/local/lib -L/opt/homebrew/lib
3030

3131
# OpenMP with clang needs following...
3232
OMPFLAGS = -Xpreprocessor -fopenmp
@@ -39,7 +39,7 @@ FFTWOMPSUFFIX=threads
3939
# make.inc.macosx_clang_matlab
4040

4141
# Some of these will depend on your FFTW library location...
42-
MFLAGS += -I/usr/local/include -L/usr/local/lib -lm
42+
MFLAGS += -I/usr/local/include -I/opt/homebrew/include -L/usr/local/lib -L/opt/homebrew/lib -lm
4343
# may need to edit for your MATLAB version location...
4444
MEX = $(shell ls -d /Applications/MATLAB_R20**.app)/bin/mex
4545
# Also see docs/install.rst for possible edits to MATLAB's MEX XML file.

‎make.inc.macosx_arm64_matlab2022b_beta

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ CC=clang
2727
CFLAGS += -I include -I/usr/local/include -I/opt/homebrew/include
2828
FFLAGS = $(CFLAGS)
2929
CXXFLAGS = $(CFLAGS)
30-
LIBS += -L/usr/local/lib
30+
LIBS += -L/usr/local/lib -L/opt/homebrew/lib
3131

3232
# Use MATLAB's shipped OpenMP (not gomp otherwise segfaults), with clang...
3333
MOMPFLAGS = -D_OPENMP
@@ -43,7 +43,7 @@ FFTWOMPSUFFIX=threads
4343
# MATLAB interface:
4444
# some of these will depend on your FFTW library location, but this is where
4545
# brew should put things...
46-
MFLAGS += -I/usr/local/include -L/usr/local/lib -lm
46+
MFLAGS += -I/usr/local/include -I/opt/homebrew/include -L/usr/local/lib -L/opt/homebrew/lib -lm
4747
# should work, or edit for your MATLAB version location...
4848
MEX = $(shell ls -d /Applications/MATLAB_R2022b_Beta.app)/bin/mex
4949

‎make.inc.macosx_clang

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ CXX=clang++
2323
CC=clang
2424

2525
# taken from makefile...
26-
CFLAGS += -I include -I/usr/local/include -I/usr/local/opt/libomp/include
26+
CFLAGS += -I include -I/usr/local/include -I/usr/local/opt/libomp/include -I/opt/homebrew/include
2727
FFLAGS = $(CFLAGS)
2828
CXXFLAGS = $(CFLAGS)
29-
LIBS += -L/usr/local/lib
29+
LIBS += -L/usr/local/lib -L/opt/homebrew/lib
3030

3131
# OpenMP with clang needs following...
3232
OMPFLAGS = -Xpreprocessor -fopenmp

‎make.inc.macosx_clang_matlab

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ CXX=clang++
2121
CC=clang
2222

2323
# taken from makefile...
24-
CFLAGS += -I include -I/usr/local/include
24+
CFLAGS += -I include -I/usr/local/include -I/opt/homebrew/include
2525
FFLAGS = $(CFLAGS)
2626
CXXFLAGS = $(CFLAGS)
27-
LIBS += -L/usr/local/lib
27+
LIBS += -L/usr/local/lib -L/opt/homebrew/lib
2828

2929
# Use MATLAB's shipped OpenMP (not gomp otherwise segfaults), with clang...
3030
MOMPFLAGS = -D_OPENMP
@@ -40,7 +40,7 @@ FFTWOMPSUFFIX=threads
4040
# MATLAB interface:
4141
# some of these will depend on your FFTW library location, but this is where
4242
# brew should put things...
43-
MFLAGS += -I/usr/local/include -L/usr/local/lib -lm
43+
MFLAGS += -I/usr/local/include -I/opt/homebrew/include -L/usr/local/lib -L/opt/homebrew/lib -lm
4444
# should work, or edit for your MATLAB version location...
4545
MEX = $(shell ls -d /Applications/MATLAB_R20**.app)/bin/mex
4646

‎make.inc.macosx_gcc-10

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ CFLAGS +=
2424
#CFLAGS += "-mmacosx-version-min=<OLDER OSX VERSION NUMBER>"
2525

2626
# as in makefile, but with the brew /usr/local/ stuff...
27-
CFLAGS += -I src -I/usr/local/include
27+
CFLAGS += -I src -I/usr/local/include -I/opt/homebrew/include
2828
FFLAGS = $(CFLAGS)
2929
CXXFLAGS = $(CFLAGS)
30-
LIBS += -L/usr/local/lib
30+
LIBS += -L/usr/local/lib -L/opt/homebrew/lib
3131

3232
# OpenMP with GCC on OSX needs following...
3333
OMPFLAGS = -fopenmp
@@ -37,7 +37,7 @@ FFTWOMPSUFFIX=threads
3737

3838
# MATLAB interface:
3939
# some of these will depend on your FFTW library location...
40-
MFLAGS += -I/usr/local/include -L/usr/local/lib -lm
40+
MFLAGS += -I/usr/local/include -I/opt/homebrew/include -L/usr/local/lib -L/opt/homebrew/lib -lm
4141
# edit for your MATLAB version location...
4242
MEX = $(shell ls -d /Applications/MATLAB_R20**.app)/bin/mex
4343
# Also see docs/install.rst for possible edits to MATLAB's MEX XML file.

‎make.inc.macosx_gcc-8

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ CFLAGS +=
2525
#CFLAGS += "-mmacosx-version-min=<OLDER OSX VERSION NUMBER>"
2626

2727
# as in makefile, but with the brew /usr/local/ stuff...
28-
CFLAGS += -I src -I/usr/local/include
28+
CFLAGS += -I src -I/usr/local/include -I/opt/homebrew/include
2929
FFLAGS = $(CFLAGS)
3030
CXXFLAGS = $(CFLAGS)
31-
LIBS += -L/usr/local/lib
31+
LIBS += -L/usr/local/lib -L/opt/homebrew/lib
3232

3333
# OpenMP with GCC on OSX needs following...
3434
OMPFLAGS = -fopenmp
@@ -38,7 +38,7 @@ FFTWOMPSUFFIX=threads
3838

3939
# MATLAB interface:
4040
# some of these will depend on your FFTW library location...
41-
MFLAGS += -I/usr/local/include -L/usr/local/lib -lm
41+
MFLAGS += -I/usr/local/include -I/opt/homebrew/include -L/usr/local/lib -L/opt/homebrew/lib -lm
4242
# edit for your MATLAB version location...
4343
MEX = $(shell ls -d /Applications/MATLAB_R20**.app)/bin/mex
4444
# Also see docs/install.rst for possible edits to MATLAB's MEX XML file.

0 commit comments

Comments
 (0)