Changeset 19578

Timestamp:

09/24/15 18:02:28 (9 years ago)

Author:

glperez

Message:

CHG: changed a great deal of flags for Windows build to change from CCCL to CL. Most of the changes involve changing the flags from tailored to CCCL to Cl

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -176 +176 @@
                 elif  test $VENDOR = intel-win7-32; then
                         export CC=cl
-                        export CXX=cccl
+                        export CXX=cl
                         export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
                         export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
@@ -186 +186 @@
                 elif  test $VENDOR = intel-win7-64; then
                         export CC=cl
-                        export CXX=cccl
+                        export CXX=cl
                         export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
                         export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
@@ -196 +196 @@
                 elif  test $VENDOR = MSVC-Win64; then
                         export CC=cl
-                        export CXX=cccl
+                        export CXX=cl
                         export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -D_HAVE_PETSC_MPI_ -EHsc"
                         export CFLAGS="-DWIN32 -D_INTEL_WIN_ -D_HAVE_PETSC_MPI_ -EHsc"
@@ -206 +206 @@
                 elif  test $VENDOR = MSVC-Win64-par; then
                         export CC=cl
-                        export CXX=cccl
+                        export CXX=cl
                         export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
                         export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
@@ -289 +289 @@
                                 if  test $VENDOR = intel-win7-32; then
                                         MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
-               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win32/microsoft` -Wl,/export:mexFunction -Wl,/LD"
+               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win32/microsoft` -Wl,/link -Wl,/EXPORT:mexFunction -Wl,/DLL"
                                         MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
                                         MEXEXT=".$MEXEXT"
                                 elif test $VENDOR = intel-win7-64; then
                                         MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
-               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/export:mexFunction -Wl,/LD" 
+               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/link -Wl,/EXPORT:mexFunction -Wl,/DLL" 
                                         MEXEXT=".mexw64"
                                 elif test $VENDOR = MSVC-Win64 || test $VENDOR = MSVC-Win64-par; then
                                         MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib ${OSLIBS} -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
-               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/export:mexFunction -Wl,/LD" 
+               MEXLINK="-Wl,/LIBPATH:`cygpath -m ${MATLAB_DIR}/extern/lib/win64/microsoft` -Wl,/link -Wl,/EXPORT:mexFunction -Wl,/DLL" 
                                         MEXEXT=".mexw64"
                                 fi
@@ -368 +368 @@
                 case "${host_os}" in
                                 *cygwin*)
+                                TRIANGLEINCL="/I`cygpath -m $TRIANGLE_ROOT/`"
                                 TRIANGLELIB="-Wl,`cygpath -m $TRIANGLE_ROOT/`triangle.lib"
                                 ;;
@@ -936 +937 @@
 
                 if test -z "$MPI_LIBDIR"; then
-                        MPIINCL=-I"$MPI_INCLUDE"
+                        if  test x$IS_WINDOWS = xyes; then
+                                MPIINCL=/I"$MPI_INCLUDE"
+                        else 
+                                MPIINCL=-I"$MPI_INCLUDE"
+                        fi
                         MPILIB="$MPI_LIBFLAGS"
                 else
-                        MPIINCL=-I"$MPI_INCLUDE"
+                        if  test x$IS_WINDOWS = xyes; then
+                                MPIINCL=/I"$MPI_INCLUDE"
+                        else 
+                                MPIINCL=-I"$MPI_INCLUDE"
+                        fi
                         MPILIB="-L$MPI_LIBDIR $MPI_LIBFLAGS"
                 fi
@@ -1014 +1023 @@
                                         PETSCLIB=-Wl,/LIBPATH:`cygpath -w $PETSC_ROOT/lib`  -Wl,libpetscksp.lib  -Wl,libpetscdm.lib  -Wl,libpetscmat.lib  -Wl,libpetscvec.lib  -Wl,libpetscsnes.lib  -Wl,libpetscts.lib  -Wl,libmpiuni.lib  -Wl,libpetsc.lib
                                 else
-                                        PETSCLIB="-L$PETSC_ROOT/lib  -Wl,libpetsc.lib"
+                                        PETSCLIB="/link -Wl,/LIBPATH:`cygpath -m $PETSC_ROOT/lib`  -Wl,libpetsc.lib"
+                                        PETSCINCL="/I`cygpath -m $PETSC_ROOT/include`"
                                 fi
                                 ;;
@@ -1079 +1089 @@
                                 case "${host_os}" in
                                         *cygwin*)
-                                        METISLIB="-L$METIS_ROOT -Wl,libmetis.lib"
+                                        METISINCL="/I`cygpath -m $METIS_ROOT/Lib`" 
+                                        METISLIB="-Wl,/link -Wl,/LIBPATH:`cygpath -m $METIS_ROOT` -Wl,libmetis.lib"
                                         ;;
                                         *linux*)