link mapnik first (needed static linking on linux)
This commit is contained in:
parent
26af45c40c
commit
39eee919e5
2 changed files with 4 additions and 4 deletions
|
@ -39,8 +39,8 @@ if env['HAS_CAIRO']:
|
|||
demo_env.PrependUnique(CPPPATH=env['CAIRO_CPPPATHS'])
|
||||
demo_env.Append(CPPDEFINES = '-DHAVE_CAIRO')
|
||||
|
||||
libraries = copy(env['LIBMAPNIK_LIBS'])
|
||||
libraries.append('mapnik')
|
||||
libraries = ['mapnik']
|
||||
libraries.extend(copy(env['LIBMAPNIK_LIBS']))
|
||||
|
||||
rundemo = demo_env.Program('rundemo', source, LIBS=libraries, LINKFLAGS=env["CUSTOM_LDFLAGS"])
|
||||
|
||||
|
|
|
@ -10,8 +10,8 @@ if not env['CPP_TESTS']:
|
|||
for cpp_test_bin in glob.glob('*-bin'):
|
||||
os.unlink(cpp_test_bin)
|
||||
else:
|
||||
test_env['LIBS'] = copy(env['LIBMAPNIK_LIBS'])
|
||||
test_env.AppendUnique(LIBS='mapnik')
|
||||
test_env['LIBS'] = ['mapnik']
|
||||
test_env.AppendUnique(LIBS=copy(env['LIBMAPNIK_LIBS']))
|
||||
test_env.AppendUnique(CXXFLAGS='-g')
|
||||
test_env['CXXFLAGS'] = copy(test_env['LIBMAPNIK_CXXFLAGS'])
|
||||
if test_env['HAS_CAIRO']:
|
||||
|
|
Loading…
Add table
Reference in a new issue