diff --git a/.gitattributes b/.gitattributes index 0e7a3620daa..cd4a3e444b8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -648,12 +648,14 @@ Installation/config/support/S46b-SUNPERFORMANCEGCC -text Installation/config/support/S47-SGICOMPLIB -text Installation/config/support/S48-MKL64 -text Installation/config/support/S49-MKL32 -text -Installation/config/support/S50-MKLWIN -text +Installation/config/support/S50a-MKLWIN64 -text +Installation/config/support/S50b-MKLWIN32 -text Installation/config/support/S51-LAPACKSHARED -text Installation/config/support/S52-BLASIFORTATLAS -text Installation/config/support/S53-BLASGCCATLAS -text Installation/config/support/S54-BLASWINATLAS -text -Installation/config/support/S55-REFBLASLINUXGCC -text +Installation/config/support/S55a-REFBLASLINUXGCC -text +Installation/config/support/S55b-REFBLASCYGWINGCC -text Installation/config/support/S56-REFBLASWIN -text Installation/config/support/S58-LIDIA -text Installation/config/support/S60-LEDA -text @@ -664,8 +666,8 @@ Installation/config/support/S64-LEDAWIN -text Installation/config/support/S65-LEDAWINMS -text Installation/config/support/S70-OPENGL -text Installation/config/support/S71-OPENGL_W32 -text -Installation/config/support/S72-LAPACKATLAS -text -Installation/config/support/S74-LAPACKWINATLAS -text +Installation/config/support/S72-LAPACK -text +Installation/config/support/S74-LAPACKWIN -text Installation/config/support/S75-REFLAPACKLINUXGCC -text Installation/config/support/S76-REFLAPACKWIN -text Installation/config/support/S80-QT3MT -text diff --git a/Installation/config/support/S50a-MKLWIN64 b/Installation/config/support/S50a-MKLWIN64 new file mode 100644 index 00000000000..1981fb31880 --- /dev/null +++ b/Installation/config/support/S50a-MKLWIN64 @@ -0,0 +1,18 @@ +# BLAS (Basic Linear Algebra Subprograms) +# Intel MKL provides BLAS and LAPACK +# This configuration has *not* been tested. + +DESCRIPTION = Intel MKL for MS Windows 64 bits +PROVIDES = BLAS LAPACK +CXXFLAGS = -DCGAL_USE_F2C +LDFLAGS = +LIBS = mkl_dll libguide40 vcf2c +REQUIRES = DOLLAR_WINDOWS_COMPILER +INCOMPATIBLE = +STDINCLDIRS = +INCLTHING = +STDLIBDIRS = +LIBTHING = +COMPILETESTFLAGS = + +# EOF diff --git a/Installation/config/support/S50-MKLWIN b/Installation/config/support/S50b-MKLWIN32 similarity index 70% rename from Installation/config/support/S50-MKLWIN rename to Installation/config/support/S50b-MKLWIN32 index 9091e1e9e9d..02f1e8966a9 100644 --- a/Installation/config/support/S50-MKLWIN +++ b/Installation/config/support/S50b-MKLWIN32 @@ -1,7 +1,8 @@ # BLAS (Basic Linear Algebra Subprograms) # Intel MKL provides BLAS and LAPACK +# Note: this configuration has been tested with MKL 9.0 and VisualC++ 7.1. -DESCRIPTION = Intel MKL for VisualC++ +DESCRIPTION = Intel MKL for MS Windows 32 bits PROVIDES = BLAS LAPACK CXXFLAGS = -DCGAL_USE_F2C LDFLAGS = diff --git a/Installation/config/support/S54-BLASWINATLAS b/Installation/config/support/S54-BLASWINATLAS index e37f6bc4940..e0c59eb17fb 100644 --- a/Installation/config/support/S54-BLASWINATLAS +++ b/Installation/config/support/S54-BLASWINATLAS @@ -1,6 +1,7 @@ # BLAS (Basic Linear Algebra Subprograms) +# Note: this configuration has been tested with VisualC++ 7.1. -DESCRIPTION = ATLAS for VisualC++ +DESCRIPTION = ATLAS for MS Windows PROVIDES = BLAS CXXFLAGS = -DCGAL_USE_F2C LDFLAGS = diff --git a/Installation/config/support/S55-REFBLASLINUXGCC b/Installation/config/support/S55a-REFBLASLINUXGCC similarity index 100% rename from Installation/config/support/S55-REFBLASLINUXGCC rename to Installation/config/support/S55a-REFBLASLINUXGCC diff --git a/Installation/config/support/S55b-REFBLASCYGWINGCC b/Installation/config/support/S55b-REFBLASCYGWINGCC new file mode 100644 index 00000000000..c3f674653db --- /dev/null +++ b/Installation/config/support/S55b-REFBLASCYGWINGCC @@ -0,0 +1,20 @@ +# BLAS (Basic Linear Algebra Subprograms) +# We search for the BLAS reference implementation (http://www.netlib.org/blas) +# compiled by g77. +# This configuration *must* be the last try as this library is notably slow. +# Note: this configuration has been tested with Cygwin/gcc. + +DESCRIPTION = Reference BLAS for gcc/Cygwin +PROVIDES = BLAS +CXXFLAGS = -DCGAL_USE_F2C +LDFLAGS = +LIBS = blas g2c +REQUIRES = +INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER +STDINCLDIRS = +INCLTHING = +STDLIBDIRS = +LIBTHING = +COMPILETESTFLAGS = + +# EOF diff --git a/Installation/config/support/S56-REFBLASWIN b/Installation/config/support/S56-REFBLASWIN index fd93e9dffb8..c58a46b214e 100644 --- a/Installation/config/support/S56-REFBLASWIN +++ b/Installation/config/support/S56-REFBLASWIN @@ -1,8 +1,9 @@ # BLAS (Basic Linear Algebra Subprograms) # We search for the BLAS reference implementation (http://www.netlib.org/blas). # This configuration *must* be the last try as this library is notably slow. +# Note: this configuration has been tested with VisualC++ 7.1. -DESCRIPTION = Reference BLAS for VisualC++ +DESCRIPTION = Reference BLAS for MS Windows PROVIDES = BLAS CXXFLAGS = -DCGAL_USE_F2C LDFLAGS = diff --git a/Installation/config/support/S72-LAPACK b/Installation/config/support/S72-LAPACK new file mode 100644 index 00000000000..59f9434c775 --- /dev/null +++ b/Installation/config/support/S72-LAPACK @@ -0,0 +1,19 @@ +# LAPACK is a linear algebra library. +# We search for a LAPACK library named "liblapack.a". It may be an hybrid LAPACK/Atlas library, +# which is the solution recommended by ATLAS. See http://math-atlas.sourceforge.net/errata.html#completelp. +# Note: this configuration has been tested with gcc/Linux and gcc/Cygwin. + +DESCRIPTION = Unix default +PROVIDES = LAPACK +CXXFLAGS = -DCGAL_USE_F2C +LDFLAGS = +LIBS = lapack +REQUIRES = BLAS +INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER +STDINCLDIRS = +INCLTHING = +STDLIBDIRS = +LIBTHING = +COMPILETESTFLAGS = + +# EOF diff --git a/Installation/config/support/S72-LAPACKATLAS b/Installation/config/support/S72-LAPACKATLAS deleted file mode 100644 index a35427af6be..00000000000 --- a/Installation/config/support/S72-LAPACKATLAS +++ /dev/null @@ -1,18 +0,0 @@ -# LAPACK is a linear algebra library. -# We search for an hybrid LAPACK/Atlas library. This is the solution recommended -# by ATLAS. See http://math-atlas.sourceforge.net/errata.html#completelp. - -DESCRIPTION = Hybrid LAPACK/Atlas on Unix -PROVIDES = LAPACK -CXXFLAGS = -DCGAL_USE_F2C -LDFLAGS = -LIBS = lapack -REQUIRES = BLAS -INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER -STDINCLDIRS = -INCLTHING = -STDLIBDIRS = -LIBTHING = -COMPILETESTFLAGS = - -# EOF diff --git a/Installation/config/support/S74-LAPACKWIN b/Installation/config/support/S74-LAPACKWIN new file mode 100644 index 00000000000..a1836dfe643 --- /dev/null +++ b/Installation/config/support/S74-LAPACKWIN @@ -0,0 +1,19 @@ +# LAPACK is a linear algebra library. +# We search for a LAPACK library named "liblapack.lib". It may be an hybrid LAPACK/Atlas library, +# which is the solution recommended by ATLAS. See http://math-atlas.sourceforge.net/errata.html#completelp. +# Note: this configuration has been tested with VisualC++ 7.1. + +DESCRIPTION = MS Windows default +PROVIDES = LAPACK +CXXFLAGS = -DCGAL_USE_F2C +LDFLAGS = +LIBS = liblapack +REQUIRES = BLAS DOLLAR_WINDOWS_COMPILER +INCOMPATIBLE = +STDINCLDIRS = +INCLTHING = +STDLIBDIRS = +LIBTHING = +COMPILETESTFLAGS = + +# EOF diff --git a/Installation/config/support/S74-LAPACKWINATLAS b/Installation/config/support/S74-LAPACKWINATLAS deleted file mode 100644 index 9078eb54623..00000000000 --- a/Installation/config/support/S74-LAPACKWINATLAS +++ /dev/null @@ -1,18 +0,0 @@ -# LAPACK is a linear algebra library. -# We search for an hybrid LAPACK/Atlas library. This is the solution recommended -# by ATLAS. See http://math-atlas.sourceforge.net/errata.html#completelp. - -DESCRIPTION = Hybrid LAPACK/Atlas for VisualC++ -PROVIDES = LAPACK -CXXFLAGS = -DCGAL_USE_F2C -LDFLAGS = -LIBS = liblapack -REQUIRES = BLAS DOLLAR_WINDOWS_COMPILER -INCOMPATIBLE = -STDINCLDIRS = -INCLTHING = -STDLIBDIRS = -LIBTHING = -COMPILETESTFLAGS = - -# EOF diff --git a/Installation/config/support/S75-REFLAPACKLINUXGCC b/Installation/config/support/S75-REFLAPACKLINUXGCC index 9c15d1c6b63..a4030643b11 100644 --- a/Installation/config/support/S75-REFLAPACKLINUXGCC +++ b/Installation/config/support/S75-REFLAPACKLINUXGCC @@ -1,7 +1,7 @@ # LAPACK is a linear algebra library. # We search for the LAPACK reference implementation (http://www.netlib.org/lapack). -# Note: should be the last try as this library is slower than an hybrid LAPACK/Atlas -# library. See http://math-atlas.sourceforge.net/errata.html#completelp. +# This configuration *must* be the last try as this library is slower than an hybrid +# LAPACK/Atlas library. See http://math-atlas.sourceforge.net/errata.html#completelp. DESCRIPTION = Reference LAPACK for gcc/Linux PROVIDES = LAPACK diff --git a/Installation/config/support/S76-REFLAPACKWIN b/Installation/config/support/S76-REFLAPACKWIN index 623afd40b83..51c0af3fd97 100644 --- a/Installation/config/support/S76-REFLAPACKWIN +++ b/Installation/config/support/S76-REFLAPACKWIN @@ -1,9 +1,10 @@ # LAPACK is a linear algebra library. # We search for the LAPACK reference implementation (http://www.netlib.org/lapack). -# Note: should be the last try as this library is slower than an hybrid LAPACK/Atlas -# library. See http://math-atlas.sourceforge.net/errata.html#completelp. +# This configuration *must* be the last try as it is notably slow. See +# http://math-atlas.sourceforge.net/errata.html#completelp. +# Note: this configuration has been tested with VisualC++ 7.1. -DESCRIPTION = Reference LAPACK for VisualC++ +DESCRIPTION = Reference LAPACK for MS Windows PROVIDES = LAPACK CXXFLAGS = -DCGAL_USE_F2C LDFLAGS = diff --git a/Installation/config/support/S91-TAUCSWIN b/Installation/config/support/S91-TAUCSWIN index 3a9033cbac7..0faed11cf42 100644 --- a/Installation/config/support/S91-TAUCSWIN +++ b/Installation/config/support/S91-TAUCSWIN @@ -1,6 +1,7 @@ # TAUCS, a Library of Sparse Linear Solvers (http://www.tau.ac.il/~stoledo/taucs/) +# Note: this configuration has been tested with VisualC++ 7.1. -DESCRIPTION = VisualC++ +DESCRIPTION = MS Windows PROVIDES = TAUCS CXXFLAGS = LDFLAGS =