add missing LIBZLIB from oct target

NeuroJSON · Jun 23, 2023 · 4399014 · 4399014
1 parent d0e4210
commit 4399014
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/run_test.yml b/.github/workflows/run_test.yml
@@ -76,10 +76,10 @@ jobs:
         if: ${{ runner.os != 'Windows' }}
         run: |
           if [ "$RUNNER_OS" == "macOS" ]; then
-              make -C src oct CC=gcc CXX=g++ MEXLDFLAG="-static"
+              make -C src oct CC=gcc CXX=g++ MEXLINKOPT="-static"
               otool -L zipmat.mex
           else
-              make -C src oct CC=gcc CXX=g++ MEXLDFLAG="-static-libgcc -static-libstdc++ -Wl,-Bstatic -lm -Wl,-Bdynamic"
+              make -C src oct CC=gcc CXX=g++ MEXLINKOPT="-static-libgcc -static-libstdc++ -Wl,-Bstatic -lm -Wl,-Bdynamic"
               ldd zipmat.mex
           fi
           strip -S zipmat.mex

diff --git a/src/Makefile b/src/Makefile
@@ -146,7 +146,7 @@ dll:   AROUTPUT   :=-o
 
 oct mex: CPPOPT+= $(DLLFLAG)
 oct:   OUTPUT_DIR=..
-oct:   AR= CXXFLAGS="-O3" LDFLAGS="$(MEXLDFLAG)" mkoctfile zmat.cpp
+oct:   AR= CXXFLAGS="-O3" LDFLAGS="$(MEXLINKOPT) $(LIBZLIB)" mkoctfile zmat.cpp
 oct:   BINARY=zmat.mex
 oct:   ARFLAGS    :=
 oct:   LINKOPT+=--mex $(INCLUDEDIRS)