nixpkgs/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

52 lines
1.2 KiB
Diff
Raw Normal View History

2022-07-03 07:55:38 +00:00
diff --git a/module/renpybidicore.c b/module/renpybidicore.c
index 849430d..d883a52 100644
--- a/module/renpybidicore.c
+++ b/module/renpybidicore.c
@@ -1,10 +1,6 @@
#include <Python.h>
-#ifdef RENPY_BUILD
#include <fribidi.h>
-#else
-#include <fribidi-src/lib/fribidi.h>
-#endif
#include <stdlib.h>
diff --git a/module/setup.py b/module/setup.py
index bd16816..f6b8794 100755
--- a/module/setup.py
+++ b/module/setup.py
@@ -118,29 +118,17 @@ cython(
sdl + [ png, 'z', 'm' ])
FRIBIDI_SOURCES = """
-fribidi-src/lib/fribidi.c
-fribidi-src/lib/fribidi-arabic.c
-fribidi-src/lib/fribidi-bidi.c
-fribidi-src/lib/fribidi-bidi-types.c
-fribidi-src/lib/fribidi-deprecated.c
-fribidi-src/lib/fribidi-joining.c
-fribidi-src/lib/fribidi-joining-types.c
-fribidi-src/lib/fribidi-mem.c
-fribidi-src/lib/fribidi-mirroring.c
-fribidi-src/lib/fribidi-run.c
-fribidi-src/lib/fribidi-shape.c
renpybidicore.c
""".split()
cython(
"_renpybidi",
FRIBIDI_SOURCES,
+ ["fribidi"],
includes=[
- BASE + "/fribidi-src/",
- BASE + "/fribidi-src/lib/",
+ "@fribidi@/include/fribidi/",
],
define_macros=[
("FRIBIDI_ENTRY", ""),
- ("HAVE_CONFIG_H", "1"),
])
if not (android or ios or emscripten):