mirror of
https://github.com/kovidgoyal/kitty
synced 2026-07-27 18:51:41 +02:00
Travis build fixes
This commit is contained in:
@@ -19,6 +19,7 @@ matrix:
|
|||||||
- libxinerama-dev
|
- libxinerama-dev
|
||||||
- libxcursor-dev
|
- libxcursor-dev
|
||||||
- libunistring-dev
|
- libunistring-dev
|
||||||
|
- libpng-dev
|
||||||
|
|
||||||
- os: linux
|
- os: linux
|
||||||
dist: trusty
|
dist: trusty
|
||||||
@@ -38,6 +39,7 @@ matrix:
|
|||||||
- libxinerama-dev
|
- libxinerama-dev
|
||||||
- libxcursor-dev
|
- libxcursor-dev
|
||||||
- libunistring-dev
|
- libunistring-dev
|
||||||
|
- libpng-dev
|
||||||
|
|
||||||
- os: linux
|
- os: linux
|
||||||
dist: trusty
|
dist: trusty
|
||||||
@@ -57,6 +59,7 @@ matrix:
|
|||||||
- libxinerama-dev
|
- libxinerama-dev
|
||||||
- libxcursor-dev
|
- libxcursor-dev
|
||||||
- libunistring-dev
|
- libunistring-dev
|
||||||
|
- libpng-dev
|
||||||
- clang
|
- clang
|
||||||
- os: osx
|
- os: osx
|
||||||
language: generic
|
language: generic
|
||||||
@@ -82,6 +85,7 @@ install: |
|
|||||||
brew install python3;
|
brew install python3;
|
||||||
brew install glfw;
|
brew install glfw;
|
||||||
brew install libunistring;
|
brew install libunistring;
|
||||||
|
brew install libpng;
|
||||||
else
|
else
|
||||||
mkdir -p $SW;
|
mkdir -p $SW;
|
||||||
curl https://download.calibre-ebook.com/travis/kitty/osx.tar.xz | tar xJ -C $SW;
|
curl https://download.calibre-ebook.com/travis/kitty/osx.tar.xz | tar xJ -C $SW;
|
||||||
|
|||||||
2
setup.py
2
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']
|
ldpaths = pylib + glew_libs + font_libs + glfw_ldflags + libpng + ['-lunistring']
|
||||||
if not isosx:
|
if not isosx:
|
||||||
ldpaths += ['-lrt']
|
ldpaths += ['-lrt']
|
||||||
|
if '-lz' not in ldpaths:
|
||||||
|
ldpaths.append('-lz')
|
||||||
|
|
||||||
try:
|
try:
|
||||||
os.mkdir(build_dir)
|
os.mkdir(build_dir)
|
||||||
|
|||||||
Reference in New Issue
Block a user