Index: ../trunk-jpl/m4/issm_options.m4 =================================================================== --- ../trunk-jpl/m4/issm_options.m4 (revision 20402) +++ ../trunk-jpl/m4/issm_options.m4 (revision 20403) @@ -280,7 +280,6 @@ if test "x$HAVE_MATLAB" = "xyes"; then AC_DEFINE([_HAVE_MATLAB_],[1],[with matlab in ISSM src]) - MATLABINCL="-I$MATLAB_ROOT/extern/include/" dnl 4. get MEXLIB MEXLINK and MEXEXT (experimental) except for windows AC_MSG_CHECKING([matlab's mex compilation flags]) @@ -298,10 +297,12 @@ elif test $VENDOR = MSVC-Win64 || test $VENDOR = MSVC-Win64-par; then MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/link -Wl,/EXPORT:mexFunction -Wl,/DLL" + MATLABINCL="-I`cygpath -m $MATLAB_ROOT/extern/include/`" MEXEXT=".mexw64" fi ;; *) + MATLABINCL="-I$MATLAB_ROOT/extern/include/" MEXLINK=$($MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDFLAGS | sed -e "s/ LDFLAGS = //g") MEXLIB=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep CXXLIBS | sed -e "s/ CXXLIBS = //g") MEXEXT=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDEXTENSION | sed -e "s/ LDEXTENSION = //g")