1 files changed, 46 insertions, 101 deletions
diff --git a/thirdparty/windows/include/coin/IpoptConfig.h b/thirdparty/windows/include/coin/IpoptConfig.h
index 2552d69..4413357 100644
--- a/thirdparty/windows/include/coin/IpoptConfig.h
+++ b/thirdparty/windows/include/coin/IpoptConfig.h
@@ -1,101 +1,46 @@
-#ifndef HAVE_CONFIG_H
-#define HAVE_CONFIG_H
-#endif
-/*
- * Include file for the configuration of Ipopt.
- *
- * On systems where the code is configured with the configure script
- * (i.e., compilation is always done with HAVE_CONFIG_H defined), this
- * header file includes the automatically generated header file, and
- * undefines macros that might configure with other Config.h files.
- *
- * On systems that are compiled in other ways (e.g., with the
- * Developer Studio), a header files is included to define those
- * macros that depend on the operating system and the compiler.  The
- * macros that define the configuration of the particular user setting
- * (e.g., presence of other COIN packages or third party code) are set
- * here.  The project maintainer needs to remember to update this file
- * and choose reasonable defines.  A user can modify the default
- * setting by editing this file here.
- *
- */
-
-#ifndef __IPOPTCONFIG_H__
-#define __IPOPTCONFIG_H__
-
-#ifdef HAVE_CONFIG_H
-#include "config_ipopt.h"
-
-/* undefine macros that could conflict with those in other config.h
-   files */
-#undef PACKAGE
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef VERSION
-
-#else /* HAVE_CONFIG_H */
-
-/* include the COIN-wide system specific configure header */
-#include "configall_system.h"
-
-#define IPOPT_VERSION "3.8.0"
-
-/***************************************************************************/
-/*             HERE DEFINE THE CONFIGURATION SPECIFIC MACROS               */
-/***************************************************************************/
-
-/* Define to the debug sanity check level (0 is no test) */
-#define COIN_IPOPT_CHECKLEVEL 0
-
-/* Define to the debug verbosity level (0 is no output) */
-#define COIN_IPOPT_VERBOSITY 0
-
-/* If defined, the Ampl Solver Library is available. */
-#define COIN_HAS_ASL 1
-
-/* If defined, the BLAS Library is available. */
-#define COIN_HAS_BLAS 1
-
-/* Define to 1 if the Ipopt package is used */
-#define COIN_HAS_IPOPT 1
-
-/* If defined, the LAPACK Library is available. */
-#define COIN_HAS_LAPACK 1
-
-/* Define to 1 if the linear solver loader should be compiled to allow dynamic
-   loading of shared libraries with linear solvers */
-/* #undef HAVE_LINEARSOLVERLOADER */
-
-/* Define to 1 if MA27 is available */
-#define HAVE_MA27 1
-
-/* Define to 1 if MA57 is available */
-/* #undef HAVE_MA57 */
-
-/* Define to 1 if MC19 is available */
-#define HAVE_MC19 1
-
-/* Define to 1 if MUMPS is available */
-/* #undef HAVE_MUMPS */
-
-/* Define to 1 if Pardiso is available */
-/* #undef HAVE_PARDISO */
-
-/* Define to 1 if you are using the parallel version of Pardiso */
-/* #undef HAVE_PARDISO_PARALLEL */
-
-/* Define to 1 if TAUCS is available */
-/* #undef HAVE_TAUCS */
-
-/* Define to 1 if WSMP is available */
-/* #undef HAVE_WSMP */
-
-#endif /* HAVE_CONFIG_H */
-
-/* Type of Fortran integer translated into C */
-typedef FORTRAN_INTEGER_TYPE ipfint;
-
-#endif /*__IPOPTCONFIG_H__*/
+/* Copyright (C) 2011
+ * All Rights Reserved.
+ * This code is published under the Eclipse Public License.
+ *
+ * $Id: IpoptConfig.h 2005 2011-06-06 12:55:16Z stefan $
+ *
+ * Include file for the configuration of Ipopt.
+ *
+ * On systems where the code is configured with the configure script
+ * (i.e., compilation is always done with HAVE_CONFIG_H defined), this
+ * header file includes the automatically generated header file, and
+ * undefines macros that might configure with other Config.h files.
+ *
+ * On systems that are compiled in other ways (e.g., with the
+ * Developer Studio), a header files is included to define those
+ * macros that depend on the operating system and the compiler.  The
+ * macros that define the configuration of the particular user setting
+ * (e.g., presence of other COIN-OR packages or third party code) are set
+ * by the files config_*default.h. The project maintainer needs to remember
+ * to update these file and choose reasonable defines.
+ * A user can modify the default setting by editing the config_*default.h files.
+ *
+ */
+
+#ifndef __IPOPTCONFIG_H__
+#define __IPOPTCONFIG_H__
+
+#ifdef HAVE_CONFIG_H
+
+#ifdef IPOPT_BUILD
+#include "config.h"
+#else
+#include "config_ipopt.h"
+#endif
+
+#else /* HAVE_CONFIG_H */
+
+#ifdef IPOPT_BUILD
+#include "config_default.h"
+#else
+#include "config_ipopt_default.h"
+#endif
+
+#endif /* HAVE_CONFIG_H */
+
+#endif /*__IPOPTCONFIG_H__*/