Changeset 11443

Timestamp:

02/14/12 11:53:34 (13 years ago)

Author:

Eric.Larour

Message:

New settings, macros and paths for Win7 compile.

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -90 +90 @@
                         ;;
                         *cygwin*)
-                                MEXLIB="-dll -export:mexFunction -LIBPATH:\"$MATLAB_ROOT\extern\lib\win32\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"
+                                MEXLIB="-dll -export:mexFunction -LIBPATH:\"$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" 
+
 
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
@@ -155 +156 @@
                 HAVE_TRIANGLE=yes
                 TRIANGLEINCL=-I$TRIANGLE_ROOT/
-                TRIANGLELIB=$TRIANGLE_ROOT/triangle.a
+
+                case "${host_os}" in
+                                *cygwin*)
+                                TRIANGLELIB=$TRIANGLE_ROOT/triangle.lib
+                                ;;
+                                *linux*)
+                                TRIANGLELIB=$TRIANGLE_ROOT/triangle.a
+                                ;;
+                                *darwin*)
+                                TRIANGLELIB=$TRIANGLE_ROOT/triangle.a
+                                ;;
+                        esac
 
                 AC_DEFINE([_HAVE_TRIANGLE_],[1],[with Triangle in ISSM src])
@@ -315 +327 @@
                                                                   
                 if test "$METIS_VERSION" = "4" ; then
-
+                        
+                        METISINCL=-I"$METIS_ROOT/Lib" 
                         case "${host_os}" in
                                 *cygwin*)
@@ -328 +341 @@
                         esac
 
-                        METISINCL=-I"$METIS_ROOT/Lib" 
                         AC_DEFINE([_METIS_VERSION_],[4],[ Metis version number])
                 fi
@@ -432 +444 @@
         AC_MSG_CHECKING(for Petsc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH)
         
+        
         if test -d "$PETSC_ROOT"; then
 
@@ -438 +451 @@
                 case "${host_os}" in
                         *cygwin*)
-                        PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/$PETSC_ARCH/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libpetscksp.lib  libpetscdm.lib  libpetscmat.lib  libpetscvec.lib libpetscsnes.lib libpetscts.lib libmpiuni.lib libpetsc.lib"
+                        if test "$PETSC_MAJOR" = "2" ; then
+                                PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/$PETSC_ARCH/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libpetscksp.lib  libpetscdm.lib  libpetscmat.lib  libpetscvec.lib libpetscsnes.lib libpetscts.lib libmpiuni.lib libpetsc.lib"
+                        else
+                                PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/$PETSC_ARCH/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libpetsc.lib"
+                        fi
                         ;;
                         *linux*)
@@ -501 +518 @@
                 case "${host_os}" in
                         *cygwin*)
-                        MPILIB="-link -LIBPATH:\"$PETSC_ROOT/$PETSC_ARCH/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libmpiuni.lib"
+                        dnl MPILIB="-link -LIBPATH:\"$PETSC_ROOT/$PETSC_ARCH/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libmpiuni.lib"
                         ;;
                         *linux*)
@@ -826 +843 @@
         if test -n "$VENDOR"; then
 
-                if  test $VENDOR = intel-win; then
+                if  test $VENDOR = intel-win32; then
                         export CC=icl
                         export CXX=icl
+                        export CFLAGS="-DWIN32 -D_INTEL_WIN_"
                         export CXXFLAGS="-DWIN32 -D_INTEL_WIN_"
+                elif  test $VENDOR = intel-win7; then
+                        export CC=cccl
+                        export CXX=cccl
+                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export AR=lib
+                        export RANLIB=true
                 elif test $VENDOR = intel-linux; then
                         export CC=icc
                         export CXX=icpc
+                        export CFLAGS=" -D_INTEL_LINUX_"
                         export CXXFLAGS=" -D_INTEL_LINUX_"
                 elif test $VENDOR = intel-pleiades; then
@@ -838 +864 @@
                         export CXX=icpc
                         export CXXFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
+                        export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
                 else
                 AC_MSG_ERROR([unknow compiler vendor!])