Skip to content

Commit a7d0ca6

Browse files
authored
Merge pull request #80 from jd-boyd/jdb_tweak
Work on updating to pyproject.toml.
2 parents 1886f47 + b85c6e5 commit a7d0ca6

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ test = ["pytest"]
3232

3333
[project.urls]
3434
Homepage = "https://github.com/jd-boyd/python-lzo"
35+
"Bug Tracker" = "https://github.com/jd-boyd/python-lzo/issues"
3536

3637
[tool.cibuildwheel]
3738
archs = ["all"]
3839
build-verbosity = 3
3940
test-requires = "pytest"
4041
test-command = "pytest {package}/tests"
41-
test-skip = "*-win_arm64 *-macosx_arm64 *-macosx_universal2:arm64"
42+
test-skip = "*-win_arm64"

setup.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ def run(self):
2828

2929
lzo_dir = os.environ.get("LZO_DIR", "lzo-2.10") # Relative path.
3030

31+
src_list = ["lzomodule.c"]
32+
if sys.platform == "win32":
33+
src_list += glob(os.path.join(lzo_dir, "src/*.c"))
34+
3135
setup(
3236
name="python-lzo",
3337
version="1.16",
@@ -45,9 +49,11 @@ def run(self):
4549
ext_modules=[
4650
Extension(
4751
name="lzo",
48-
sources=["lzomodule.c"] + glob(os.path.join(lzo_dir, "src/*.c")),
52+
sources=src_list,
4953
include_dirs=[os.path.join(lzo_dir, "include")],
50-
extra_link_args=["-flat_namespace"] if sys.platform == "darwin" else [],
54+
libraries=['lzo2'] if not sys.platform == "win32" else [],
55+
library_dirs=[os.path.join(lzo_dir, "lib")],
56+
#extra_link_args=["-flat_namespace"] if sys.platform == "darwin" else [],
5157
)
5258
],
5359
long_description="""

0 commit comments

Comments
 (0)