asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19272 from akien-mga/svg-buildsystem

Browse source 
SCons: Remove extraneous lib for SVG module
This commit is contained in:
Rémi Verschelde 2018-05-30 22:10:03 +02:00 committed by GitHub
commit 65fc525ed8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/svg/SCsub
View file

@ -1,7 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
Import('env') Import('env')
from compat import isbasestring
# Thirdparty source files # Thirdparty source files
thirdparty_dir = "#thirdparty/nanosvg/" thirdparty_dir = "#thirdparty/nanosvg/"
@ -10,23 +9,7 @@ thirdparty_sources = [
] ]
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
# env.add_source_files(env.modules_sources, 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.Append(CPPPATH=[thirdparty_dir]) env.Append(CPPPATH=[thirdparty_dir])
env.Append(CCFLAGS=["-DSVG_ENABLED"]) env.Append(CCFLAGS=["-DSVG_ENABLED"])