From 55f6d107793146b3118cae1451d900e0c47343ff Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Sun, 19 Nov 2023 00:17:37 +0000 Subject: [PATCH] Solving circular dependencies by listing twice The circular dependencies are only in Windows and Linux, from the OT-SVG hook. --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 32a38666..750a7775 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,7 @@ ] EXTRA_OBJECTS = list( ) + [os.path.join(SKIA_OUT_PATH, 'svg.lib'), os.path.join(SKIA_OUT_PATH, 'skia.lib'), + os.path.join(SKIA_OUT_PATH, 'svg.lib'), os.path.join(SKIA_OUT_PATH, 'skresources.lib'), os.path.join(SKIA_OUT_PATH, 'skia.lib'), os.path.join(SKIA_OUT_PATH, 'skshaper.lib'), os.path.join(SKIA_OUT_PATH, 'skunicode.lib')] EXTRA_COMPILE_ARGS = [ '/std:c++17', # c++20 fails. @@ -95,6 +96,7 @@ ] EXTRA_OBJECTS = list( ) + [os.path.join(SKIA_OUT_PATH, 'libsvg.a'), os.path.join(SKIA_OUT_PATH, 'libskia.a'), + os.path.join(SKIA_OUT_PATH, 'libsvg.a'), os.path.join(SKIA_OUT_PATH, 'libskresources.a'), os.path.join(SKIA_OUT_PATH, 'libskia.a'), os.path.join(SKIA_OUT_PATH, 'libskshaper.a'), os.path.join(SKIA_OUT_PATH, 'libskunicode.a')] EXTRA_COMPILE_ARGS = [ '-std=c++17',