source: issm/oecreview/Archive/19101-20495/ISSM-20402-20403.diff

Last change on this file was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495
File size: 1.4 KB
RevLine 
[20498]1Index: ../trunk-jpl/m4/issm_options.m4
2===================================================================
3--- ../trunk-jpl/m4/issm_options.m4 (revision 20402)
4+++ ../trunk-jpl/m4/issm_options.m4 (revision 20403)
5@@ -280,7 +280,6 @@
6 if test "x$HAVE_MATLAB" = "xyes"; then
7
8 AC_DEFINE([_HAVE_MATLAB_],[1],[with matlab in ISSM src])
9- MATLABINCL="-I$MATLAB_ROOT/extern/include/"
10
11 dnl 4. get MEXLIB MEXLINK and MEXEXT (experimental) except for windows
12 AC_MSG_CHECKING([matlab's mex compilation flags])
13@@ -298,10 +297,12 @@
14 elif test $VENDOR = MSVC-Win64 || test $VENDOR = MSVC-Win64-par; then
15 MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib"
16 MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/link -Wl,/EXPORT:mexFunction -Wl,/DLL"
17+ MATLABINCL="-I`cygpath -m $MATLAB_ROOT/extern/include/`"
18 MEXEXT=".mexw64"
19 fi
20 ;;
21 *)
22+ MATLABINCL="-I$MATLAB_ROOT/extern/include/"
23 MEXLINK=$($MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDFLAGS | sed -e "s/ LDFLAGS = //g")
24 MEXLIB=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep CXXLIBS | sed -e "s/ CXXLIBS = //g")
25 MEXEXT=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDEXTENSION | sed -e "s/ LDEXTENSION = //g")
Note: See TracBrowser for help on using the repository browser.