[19102] | 1 | Index: ../trunk-jpl/m4/issm_options.m4
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/m4/issm_options.m4 (revision 18641)
|
---|
| 4 | +++ ../trunk-jpl/m4/issm_options.m4 (revision 18642)
|
---|
| 5 | @@ -263,12 +263,14 @@
|
---|
| 6 | if test $VENDOR = intel-win7-32; then
|
---|
| 7 | MEXLIB="-Wl,./../../c/libISSMCore.a -Wl,libISSMApi.a -Wl,libISSMMatlab.a -Wl,./../../c/libISSMModules.a -Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib"
|
---|
| 8 | MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_ROOT}/extern/lib/win32/microsoft` -no-undefined -Wl,/export:mexFunction"
|
---|
| 9 | + MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
|
---|
| 10 | + MEXEXT=".$MEXEXT"
|
---|
| 11 | elif test l-win7-64; then
|
---|
| 12 | MEXLIB="-Wl,./../../c/libISSMCore.a -Wl,libISSMApi.a -Wl,libISSMMatlab.a -Wl,./../../c/libISSMModules.a -Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib"
|
---|
| 13 | MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_ROOT}/extern/lib/win64/microsoft` -no-undefined -Wl,/export:mexFunction"
|
---|
| 14 | + MEXEXT=".mexw64"
|
---|
| 15 | fi
|
---|
| 16 | - MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
|
---|
| 17 | - MEXEXT=".$MEXEXT"
|
---|
| 18 | +
|
---|
| 19 | ;;
|
---|
| 20 | *)
|
---|
| 21 | MEXLINK=$($MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDFLAGS | sed -e "s/ LDFLAGS = //g")
|
---|