Commit Graph

113 Commits

Author SHA1 Message Date
Georg Baum
78e17b1579 Configure included zlib with autotools
The included zlib should not be used on Linux or OS X, but (depending on
local configuration) it might be needed for crosscompiling a mingw target
from Linux. Now the user can choose whether to use the included zlib or not.
cmake does already support that.

zconf.h.in was taken from the original zlib 1.2.8 package. The generation of
zconf.h was made equivalent to the one generated by cmake.
2016-05-29 17:55:43 -04:00
Peter Kümmel
fc459bd977 files are already part of boost 2016-02-16 11:00:34 +01:00
Peter Kümmel
6de524e6cf Add missing boost files to source package
and remove Visual Studio files, we build with CMake on Windows.
2016-02-13 19:03:42 +01:00
Georg Baum
ff9ba203ff Add missing files to source package
The windows build for beta1 showed that some files were missing by accident.
2016-02-11 21:04:58 +01:00
Peter Kümmel
132cc83871 remove warning about alreday defined Z_PREFIX 2016-01-19 17:54:43 +01:00
Peter Kümmel
dde4f93894 zlib: enable prefix, fix mingw build 2016-01-12 20:11:31 +01:00
Jean-Marc Lasgouttes
a69d649626 Do not setup building of 3rdparty/libiconv
This causes build problems with automake < 1.14 because two files have the same name. This only works well when using subdir-objects, which we only do after 1.14.

We do not want to build libiconv on target which support autotools anyway, but rely on a built-in one.

This fixes building on oldish ubuntu 12.04.
2016-01-01 18:44:18 +01:00
Peter Kümmel
bd74a15ebd update boost to 1.60 2015-12-20 14:04:54 +01:00
Peter Kümmel
3c3141dc23 3rdparty/boost: build with cmake 2015-12-20 13:41:00 +01:00
Peter Kümmel
a8d78905b6 3rdparty/boost: build with autotools 2015-12-20 13:06:59 +01:00
Peter Kümmel
b7a3831289 move boost to 3rdparty directory 2015-12-20 12:49:10 +01:00
Georg Baum
c829eeebb7 Add 3rdparty to source package
The new 3rdparty libraries are not added to the autotools build system, so
that they appear in the source package. They cannot be compiled yet with
autotools (although this would make sense for cross compilation with mingw),
but adding configure support for enabling/disabling these like we do for
boost is a bit more work, so I did not do it for now. Nevertheless, the
three new Makefile.am are already prepared for compilation.
2015-12-19 16:49:52 +01:00
Peter Kümmel
3bd2cfecf0 move 3rdparty dir out of src/ 2015-12-15 13:20:13 +01:00