From 9601ed79f1d5b32848545c408ef6ab3faf2a33fa Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 27 Sep 2017 18:07:48 +0530 Subject: [PATCH] Travis build fixes --- .travis.yml | 4 ++++ setup.py | 2 ++ 2 files changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index e55c989bb..7e0e4ae46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ matrix: - libxinerama-dev - libxcursor-dev - libunistring-dev + - libpng-dev - os: linux dist: trusty @@ -38,6 +39,7 @@ matrix: - libxinerama-dev - libxcursor-dev - libunistring-dev + - libpng-dev - os: linux dist: trusty @@ -57,6 +59,7 @@ matrix: - libxinerama-dev - libxcursor-dev - libunistring-dev + - libpng-dev - clang - os: osx language: generic @@ -82,6 +85,7 @@ install: | brew install python3; brew install glfw; brew install libunistring; + brew install libpng; else mkdir -p $SW; curl https://download.calibre-ebook.com/travis/kitty/osx.tar.xz | tar xJ -C $SW; diff --git a/setup.py b/setup.py index b8adafff7..a209608bb 100755 --- a/setup.py +++ b/setup.py @@ -175,6 +175,8 @@ def init_env(debug=False, sanitize=False, native_optimizations=True, profile=Fal ldpaths = pylib + glew_libs + font_libs + glfw_ldflags + libpng + ['-lunistring'] if not isosx: ldpaths += ['-lrt'] + if '-lz' not in ldpaths: + ldpaths.append('-lz') try: os.mkdir(build_dir)