diff --git a/Installation/include/CGAL/auto_link.h b/Installation/include/CGAL/auto_link.h deleted file mode 100644 index 52072042c5e..00000000000 --- a/Installation/include/CGAL/auto_link.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2007 GeometryFactory (France). All rights reserved. -// -// This file is part of CGAL (www.cgal.org); you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; version 2.1 of the License. -// See the file LICENSE.LGPL distributed with CGAL. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL$ -// $Id$ -// -// -// Author(s) : Fernando Cacciola (fernando.cacciola@geometryfactory.com) - -// -// This file is for non-windows compilers running in non-windows platforms (such as cl.exe via cygwin) -// The real file (for MSVC) is in /CGAL/config/msvc/CGAL/auto_link.h -// -#if defined(CGAL_LIB_NAME) -# undef CGAL_LIB_NAME -#endif - -#if defined(CGAL_AUTO_LINK_NOMANGLE) -# undef CGAL_AUTO_LINK_NOMANGLE -#endif diff --git a/Installation/include/CGAL/auto_link/CGAL.h b/Installation/include/CGAL/auto_link/CGAL.h index 0f77a9b6209..d427b98e253 100644 --- a/Installation/include/CGAL/auto_link/CGAL.h +++ b/Installation/include/CGAL/auto_link/CGAL.h @@ -1,8 +1,4 @@ -// Copyright (c) 2007 Utrecht University (The Netherlands), -// ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), -// INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg -// (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), -// and Tel-Aviv University (Israel). All rights reserved. +// Copyright (c) 2007 GeometryFactory (France). All rights reserved. // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as @@ -25,6 +21,6 @@ #define CGAL_AUTO_LINK_CGAL_H #define CGAL_LIB_NAME CGAL -#include +#include -#endif // CGAL_AUTO_LINK_CGAL_H \ No newline at end of file +#endif // CGAL_AUTO_LINK_CGAL_H diff --git a/Installation/include/CGAL/auto_link/CGALQt.h b/Installation/include/CGAL/auto_link/CGALQt.h index d72ed508169..5ce0ac0453f 100644 --- a/Installation/include/CGAL/auto_link/CGALQt.h +++ b/Installation/include/CGAL/auto_link/CGALQt.h @@ -1,4 +1,4 @@ -// Copyright (c) 2007 GeometryFactory (France). All rights reserved. +// Copyright (c) 2007 GeometryFactory (France). All rights reserved. // // This file is part of CGAL (www.cgal.org); you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public License as @@ -21,6 +21,6 @@ #define CGAL_AUTO_LINK_CGALQT_H #define CGAL_LIB_NAME CGALQt -#include +#include -#endif // CGAL_AUTO_LINK_CGALQT_H \ No newline at end of file +#endif // CGAL_AUTO_LINK_CGALQT_H diff --git a/Installation/include/CGAL/auto_link/CORE.h b/Installation/include/CGAL/auto_link/CORE.h index dd324a88edd..45109281d55 100644 --- a/Installation/include/CGAL/auto_link/CORE.h +++ b/Installation/include/CGAL/auto_link/CORE.h @@ -21,6 +21,6 @@ #define CGAL_AUTO_LINK_CORE_H #define CGAL_LIB_NAME core++ -#include +#include -#endif // CGAL_AUTO_LINK_CORE_H \ No newline at end of file +#endif // CGAL_AUTO_LINK_CORE_H diff --git a/Installation/include/CGAL/auto_link/GMP.h b/Installation/include/CGAL/auto_link/GMP.h index a5a37e4e981..614f0b0f298 100644 --- a/Installation/include/CGAL/auto_link/GMP.h +++ b/Installation/include/CGAL/auto_link/GMP.h @@ -22,6 +22,6 @@ #define CGAL_AUTO_LINK_NOMANGLE #define CGAL_LIB_NAME gmp -#include +#include -#endif // CGAL_AUTO_LINK_GMP_H \ No newline at end of file +#endif // CGAL_AUTO_LINK_GMP_H diff --git a/Installation/include/CGAL/auto_link/MPFR.h b/Installation/include/CGAL/auto_link/MPFR.h index 04ab056a5b2..5abeb948127 100644 --- a/Installation/include/CGAL/auto_link/MPFR.h +++ b/Installation/include/CGAL/auto_link/MPFR.h @@ -22,6 +22,6 @@ #define CGAL_AUTO_LINK_NOMANGLE #define CGAL_LIB_NAME mpfr -#include +#include -#endif // CGAL_AUTO_LINK_MPFR_H \ No newline at end of file +#endif // CGAL_AUTO_LINK_MPFR_H diff --git a/wininst/include/CGAL/config/msvc/CGAL/auto_link.h b/Installation/include/CGAL/auto_link/auto_link.h similarity index 99% rename from wininst/include/CGAL/config/msvc/CGAL/auto_link.h rename to Installation/include/CGAL/auto_link/auto_link.h index 559348b64d1..c98f3463cb0 100644 --- a/wininst/include/CGAL/config/msvc/CGAL/auto_link.h +++ b/Installation/include/CGAL/auto_link/auto_link.h @@ -307,6 +307,8 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, #endif // _MSC_VER || __BORLANDC__ +#endif // CGAL_NO_AUTOLINK + // // finally undef any macros we may have set: // @@ -334,7 +336,6 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used, # undef CGAL_LIB_FULL_NAME #endif -#endif // CGAL_NO_AUTOLINK diff --git a/Installation/install_cgal b/Installation/install_cgal index a5969792331..d36a2075606 100755 --- a/Installation/install_cgal +++ b/Installation/install_cgal @@ -822,7 +822,7 @@ set_compiler_flags() case ${CGAL_OS_COMPILER} in *bcc32.exe*|*BCC32*) #### settings Borland C++ compiler - ADDITIONAL_CXXFLAGS="-P -vi- -w-inl" + ADDITIONAL_CXXFLAGS="-P -vi- -w-inl -DCGAL_NO_AUTOLINK" CGAL_LIB_CXXFLAGS="-P" CGAL_STATIC_LIB_CREATE="tlib /C /P512 ''" CGAL_OBJ_PREFIX="+" @@ -845,7 +845,7 @@ set_compiler_flags() #### settings Intel C++ compiler WINDOWS_COMPILER="y" CYGWIN_COMPILER="y" - ADDITIONAL_CXXFLAGS="-Op -TP -GR -EHsc -Zm900 -nologo -Zc:wchar_t -Zc:forScope -MD" + ADDITIONAL_CXXFLAGS="-Op -TP -GR -EHsc -Zm900 -nologo -Zc:wchar_t -Zc:forScope -MD -DCGAL_NO_AUTOLINK" ADDITIONAL_LDFLAGS="-nologo" # CGAL_LIB_CXXFLAGS="-TP" CGAL_STATIC_LIB_CREATE="LIB /OUT:" @@ -869,7 +869,7 @@ set_compiler_flags() #### settings Microsoft Visual C++ compiler WINDOWS_COMPILER="y" CYGWIN_COMPILER="y" - ADDITIONAL_CXXFLAGS="-TP -GR -EHsc -Zm900 -nologo -MD" + ADDITIONAL_CXXFLAGS="-TP -GR -EHsc -Zm900 -nologo -MD -DCGAL_NO_AUTOLINK" ADDITIONAL_LDFLAGS="-nologo" # CGAL_LIB_CXXFLAGS="-TP" CGAL_STATIC_LIB_CREATE="LIB /OUT:"