Changeset 15290

Timestamp:

06/19/13 23:02:40 (12 years ago)

Author:

glperez

Message:

CHG: Matlab related macro change for Windows build.

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -125 +125 @@
                                 if  test $VENDOR = intel-win7-32; then
                                         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" 
-               MEXLINK="-no-undefined -Wl,/export:mexFunction" 
-                                elif  test $VENDOR = intel-win7-64; then
+               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_ROOT}/extern/lib/win32/microsoft` -no-undefined -Wl,/export:mexFunction" 
+                                elif  test l-win7-64; then
                                         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" 
-               MEXLINK="-no-undefined -Wl,/export:mexFunction" 
+               MEXLINK="`cygpath -m ${MATLAB_ROOT}/extern/lib/win64/microsoft` -no-undefined -Wl,/export:mexFunction" 
                                 fi
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`