mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Another oops
This commit is contained in:
parent
8e9bf3ddc9
commit
d5896390c2
@ -124,6 +124,7 @@ def read_extensions():
|
|||||||
def init_env():
|
def init_env():
|
||||||
from setup.build_environment import msvc, is64bit, win_inc, win_lib, NMAKE
|
from setup.build_environment import msvc, is64bit, win_inc, win_lib, NMAKE
|
||||||
from distutils import sysconfig
|
from distutils import sysconfig
|
||||||
|
linker = None
|
||||||
if isunix:
|
if isunix:
|
||||||
cc = os.environ.get('CC', 'gcc')
|
cc = os.environ.get('CC', 'gcc')
|
||||||
cxx = os.environ.get('CXX', 'g++')
|
cxx = os.environ.get('CXX', 'g++')
|
||||||
@ -170,8 +171,9 @@ def init_env():
|
|||||||
ldflags.append('/LIBPATH:'+p)
|
ldflags.append('/LIBPATH:'+p)
|
||||||
cflags.append('-I%s'%sysconfig.get_python_inc())
|
cflags.append('-I%s'%sysconfig.get_python_inc())
|
||||||
ldflags.append('/LIBPATH:'+os.path.join(sysconfig.PREFIX, 'libs'))
|
ldflags.append('/LIBPATH:'+os.path.join(sysconfig.PREFIX, 'libs'))
|
||||||
return namedtuple('Environment', 'cc cxx cflags ldflags make')(
|
linker = msvc.linker
|
||||||
cc=cc, cxx=cxx, cflags=cflags, ldflags=ldflags, make=NMAKE if iswindows else 'make')
|
return namedtuple('Environment', 'cc cxx cflags ldflags linker make')(
|
||||||
|
cc=cc, cxx=cxx, cflags=cflags, ldflags=ldflags, linker=linker, make=NMAKE if iswindows else 'make')
|
||||||
|
|
||||||
|
|
||||||
class Build(Command):
|
class Build(Command):
|
||||||
@ -262,7 +264,7 @@ class Build(Command):
|
|||||||
if ext.sip_files:
|
if ext.sip_files:
|
||||||
return self.build_pyqt_extension(ext, dest)
|
return self.build_pyqt_extension(ext, dest)
|
||||||
compiler = self.env.cxx if ext.needs_cxx else self.env.cc
|
compiler = self.env.cxx if ext.needs_cxx else self.env.cc
|
||||||
linker = self.env.msvc.linker if iswindows else compiler
|
linker = self.env.linker if iswindows else compiler
|
||||||
objects = []
|
objects = []
|
||||||
obj_dir = self.j(self.obj_dir, ext.name)
|
obj_dir = self.j(self.obj_dir, ext.name)
|
||||||
einc = self.inc_dirs_to_cflags(ext.inc_dirs)
|
einc = self.inc_dirs_to_cflags(ext.inc_dirs)
|
||||||
|
@ -15,7 +15,8 @@
|
|||||||
{
|
{
|
||||||
"name": "speedup",
|
"name": "speedup",
|
||||||
"sources": "calibre/utils/speedup.c",
|
"sources": "calibre/utils/speedup.c",
|
||||||
"windows_libraries": "m"
|
"libraries": "m",
|
||||||
|
"windows_libraries": ""
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "zlib2",
|
"name": "zlib2",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user