Changeset 15117

Timestamp:

05/26/13 23:04:47 (12 years ago)

Author:

Eric.Larour

Message:

CHG: issm optoins for win7 in parallel

File:

• issm/trunk-jpl/patches/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/patches/issm_options.m4

@@ -115 +115 @@
 
                 AC_MSG_CHECKING(for matlab headers and libraries in $MATLAB_ROOT)
-                MATLABINCL=-I `cygpath -wa /cygdrive/c/Program\ Files/MATLAB/R2011b/extern/include`;
-                
+                MATLABINCL="-I$MATLAB_ROOT/extern/include"
+
                 dnl 4. get MEXLIB MEXLINK and MEXEXT (experimental)
       dnl OS-dependent variables and checks
@@ -148 +148 @@
                         *cygwin*) 
                                 if  test $VENDOR = intel-win7-32; then
-                                        MEXLIB="/link /DLL /export:mexFunction libmx.lib libmex.lib libmat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libf2cblas.lib libf2clapack.lib" 
+                                        MATLABLIB="$MATLAB_ROOT/extern/lib/win32/microsoft"
+                                        MEXLIB="/link /DLL /export:mexFunction libmx.lib libmex.lib libmat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" 
                                 elif  test $VENDOR = intel-win7-64; then
-                                        MEXLIB="/DLL /export:mexFunction -L$MATLAB_ROOT\extern\lib\win64\microsoft\ libmx.lib libmex.lib libmat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  -NOLOGO -INCREMENTAL:NO -manifest" 
+                                        MATLABLIB="$MATLAB_ROOT/extern/lib/win64/microsoft"
+                                        MEXLIB="/link /DLL /export:mexFunction -L$MATLABLIB libmx.lib libmex.lib libmat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib " 
                                 fi
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`