mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-23 08:47:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Run the linux bundle on Travis

Browse Source
This commit is contained in:
Kovid Goyal
2018-06-01 15:33:08 +05:30
parent 35fb8ea1bf
commit 091e74d618
2 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
setup.py
View File

@@ -36,7 +36,6 @@ version = tuple(
)
_plat = sys.platform.lower()
is_macos = 'darwin' in _plat
is_travis = os.environ.get('TRAVIS') == 'true'
env = None
PKGCONFIG = os.environ.get('PKGCONFIG_EXE', 'pkg-config')
@@ -162,7 +161,7 @@ class Env:
self.cc, self.cppflags, self.cflags, self.ldflags, self.ldpaths = cc, cppflags, cflags, ldflags, ldpaths
def copy(self):
return Env(self.cc, list(self.cppflags), list(self.cflags), list(self.ldflags), list(self.ldflags))
return Env(self.cc, list(self.cppflags), list(self.cflags), list(self.ldflags), list(self.ldpaths))
def init_env(
@@ -220,7 +219,8 @@ def init_env(
cppflags.append('-DWITH_PROFILER')
cflags.append('-g3')
ldflags.append('-lprofiler')
return Env(cc, cppflags, cflags, ldflags)
ldpaths = []
return Env(cc, cppflags, cflags, ldflags, ldpaths=ldpaths)
def kitty_env():
@@ -247,9 +247,6 @@ def kitty_env():
ans.ldpaths += pylib + font_libs + gl_libs + libpng
if is_macos:
ans.ldpaths.extend('-framework Cocoa'.split())
if is_travis and 'SW' in os.environ:
cflags.append('-I{}/include'.format(os.environ['SW']))
ans.ldpaths.append('-L{}/lib'.format(os.environ['SW']))
else:
ans.ldpaths += ['-lrt']
if '-ldl' not in ans.ldpaths: