Windows build fixed, version incremented to 0.25.3, updated changelog.

This commit is contained in:
Matthias Koefferlein 2018-05-02 21:47:30 +02:00
parent 74cc8eea07
commit d075c37cb4
5 changed files with 17 additions and 2 deletions

View File

@ -1,5 +1,8 @@
0.25.3
* Enhancement: Compile option to use libcurl instead of QtNetwork
This workaround enables builds on the native CentOS6
configuration with the package manager functional.
* Enhancement: Pass label (text) layers through DRC script
The "labels" method now allows copying labels from a layer
to the output.

View File

@ -45,7 +45,6 @@ equals(HAVE_PYTHON, "1") {
equals(HAVE_CURL, "1") {
DEFINES += HAVE_CURL
LIBS += -lcurl
}
equals(HAVE_RUBY, "1") {

View File

@ -8,6 +8,13 @@ DEFINES += MAKE_TL_LIBRARY
LIBS += -lz
equals(HAVE_CURL, "1") {
LIBS += -lcurl
win32 {
LIBS += -lwsock32 # required because we do "select"
}
}
FORMS =
SOURCES = \

View File

@ -1276,6 +1276,12 @@ InputPipe::reset ()
throw tl::Exception (tl::to_string (QObject::tr ("pipeline input files not available on Windows")));
}
void
InputPipe::close ()
{
throw tl::Exception (tl::to_string (QObject::tr ("pipeline input files not available on Windows")));
}
// ---------------------------------------------------------------
// OutputPipe delegate implementation

View File

@ -2,7 +2,7 @@
# This script is sourced to define the main version parameters
# The main version
KLAYOUT_VERSION="0.25.2"
KLAYOUT_VERSION="0.25.3"
# The build date
KLAYOUT_VERSION_DATE=$(date "+%Y-%m-%d")