rm nlopt for win

bin/makefile

@@ -109,7 +109,7 @@ CFLAGS   = $(COMMON_FLAGS)
 CXXFLAGS = $(COMMON_FLAGS) -std=$(CPP_STD) $(WARN_FLAGS)
 
 ##included libraries
-NLOPT_SRC_PATH := $(shell realpath ../src/nlopt/nlopt-2.4.2)
+NLOPT_SRC_PATH := $(shell realpath ../src/nlopt)
 
 NLOPT_PATH = $(shell realpath $(NLOPT_PREFIX))
 NLOPT_INC_PATH = $(NLOPT_PREFIX)/include

src/nlopt/COPYING

@@ -1,40 +1,40 @@
-NLopt combines several free/open-source nonlinear optimization
-libraries by various authors.  See the COPYING, COPYRIGHT, and README
-files in the subdirectories for the original copyright and licensing
-information of these packages.
-
-The compiled NLopt library, i.e. the combined work of all of the
-included optimization routines, is licensed under the conjunction of
-all of these licensing terms.  Currently, the most restrictive terms
-are for the code in the "luksan" directory, which is licensed under
-the GNU Lesser General Public License (GNU LGPL), version 2.1 or
-later (see luksan/COPYRIGHT).
-
-That means that the compiled NLopt library is governed by the terms of
-the LGPL.
-
----------------------------------------------------------------------------
-
-Other portions of NLopt, including any modifications to the abovementioned
-packages, are licensed under the standard "MIT License:"
-
-Copyright (c) 2007-2011 Massachusetts Institute of Technology
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+NLopt combines several free/open-source nonlinear optimization
+libraries by various authors.  See the COPYING, COPYRIGHT, and README
+files in the subdirectories for the original copyright and licensing
+information of these packages.
+
+The compiled NLopt library, i.e. the combined work of all of the
+included optimization routines, is licensed under the conjunction of
+all of these licensing terms.  Currently, the most restrictive terms
+are for the code in the "luksan" directory, which is licensed under
+the GNU Lesser General Public License (GNU LGPL), version 2.1 or
+later (see luksan/COPYRIGHT).
+
+That means that the compiled NLopt library is governed by the terms of
+the LGPL.
+
+---------------------------------------------------------------------------
+
+Other portions of NLopt, including any modifications to the abovementioned
+packages, are licensed under the standard "MIT License:"
+
+Copyright (c) 2007-2011 Massachusetts Institute of Technology
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/nlopt/README

@@ -1,39 +1,39 @@
-NLopt is a library for nonlinear local and global optimization, for
-functions with and without gradient information.  It is designed as
-as simple, unified interface and packaging of several free/open-source
-nonlinear optimization libraries.
-
-The latest release and a complete manual may be found at the NLopt
-home page: http://ab-initio.mit.edu/nlopt
-
-It is compiled and installed with the standard GNU autoconf/automake
-commands:
-
-    ./configure
-    make
-    make install
-
-See `./configure --help` or the `INSTALL` file for other options.  To
-build the latest development sources:
-
-    git clone git://github.com/stevengj/nlopt
-    cd nlopt
-    sh autogen.sh
-    make
-
-(To build from git, you will need GNU autoconf, automake, and libtool
-installed, along with SWIG and Unix tools such as m4, perl, and sed.)
-
-Once it is installed, `#include <nlopt.h>` in your C/C++ programs and
-link it with `-lnlopt -lm`.  You may need to use the C++ compiler to link
-in order to include the C++ libraries (which are used internally by NLopt,
-even though it has a C API).
-
-The minimization function, `nlopt_minimize`, is described in the [man
-page](http://en.wikipedia.org/wiki/Man_page) (`api/nlopt_minimize.3`,
-which is installed by `make install`.  See also the manual on our
-web page.
-
-There are also interfaces for Fortran, Python, Matlab, Octave, OCaml,
-GNU Guile, GNU R, Lua, and Julia.  Interfaces for other languages may
-be added in the future.
+NLopt is a library for nonlinear local and global optimization, for
+functions with and without gradient information.  It is designed as
+as simple, unified interface and packaging of several free/open-source
+nonlinear optimization libraries.
+
+The latest release and a complete manual may be found at the NLopt
+home page: http://ab-initio.mit.edu/nlopt
+
+It is compiled and installed with the standard GNU autoconf/automake
+commands:
+
+    ./configure
+    make
+    make install
+
+See `./configure --help` or the `INSTALL` file for other options.  To
+build the latest development sources:
+
+    git clone git://github.com/stevengj/nlopt
+    cd nlopt
+    sh autogen.sh
+    make
+
+(To build from git, you will need GNU autoconf, automake, and libtool
+installed, along with SWIG and Unix tools such as m4, perl, and sed.)
+
+Once it is installed, `#include <nlopt.h>` in your C/C++ programs and
+link it with `-lnlopt -lm`.  You may need to use the C++ compiler to link
+in order to include the C++ libraries (which are used internally by NLopt,
+even though it has a C API).
+
+The minimization function, `nlopt_minimize`, is described in the [man
+page](http://en.wikipedia.org/wiki/Man_page) (`api/nlopt_minimize.3`,
+which is installed by `make install`.  See also the manual on our
+web page.
+
+There are also interfaces for Fortran, Python, Matlab, Octave, OCaml,
+GNU Guile, GNU R, Lua, and Julia.  Interfaces for other languages may
+be added in the future.