diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-30 22:10:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 22:10:03 +0200 |
| commit | 65fc525ed8d5b801279b73bc864b4d6290f5da3e (patch) | |
| tree | a55f316a18a1f7b655116b26e8d553cd75669938 /modules/svg/SCsub | |
| parent | 33cb5f4492350802a0d081214e5059800b1842ef (diff) | |
| parent | 5eb611b297fbddef1c8b7e28effe3c00d171ba73 (diff) | |
Merge pull request #19272 from akien-mga/svg-buildsystem
SCons: Remove extraneous lib for SVG module
Diffstat (limited to 'modules/svg/SCsub')
| -rw-r--r-- | modules/svg/SCsub | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/modules/svg/SCsub b/modules/svg/SCsub index e12abac8c1..a41e0703bd 100644 --- a/modules/svg/SCsub +++ b/modules/svg/SCsub @@ -1,7 +1,6 @@ #!/usr/bin/env python Import('env') -from compat import isbasestring # Thirdparty source files thirdparty_dir = "#thirdparty/nanosvg/" @@ -10,23 +9,7 @@ thirdparty_sources = [ ] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] -# env.add_source_files(env.modules_sources, thirdparty_sources) - -lib = env.add_library("svg_builtin", thirdparty_sources) - -# Needs to be appended to arrive after libscene in the linker call, -# but we don't want it to arrive *after* system libs, so manual hack -# LIBS contains first SCons Library objects ("SCons.Node.FS.File object") -# and then plain strings for system library. We insert between the two. -inserted = False -for idx, linklib in enumerate(env["LIBS"]): - if isbasestring(linklib): # first system lib such as "X11", otherwise SCons lib object - env["LIBS"].insert(idx, lib) - inserted = True - break -if not inserted: - env.Append(LIBS=[lib]) - +env.add_source_files(env.modules_sources, thirdparty_sources) env.Append(CPPPATH=[thirdparty_dir]) env.Append(CCFLAGS=["-DSVG_ENABLED"]) |