Explicitly link to X11 to not rely on indirect library linking
It is recommended by Debian and required for the gold linker.
This commit is contained in:
parent
5417a4f52b
commit
42174b473a
2 changed files with 4 additions and 1 deletions
|
@ -19,7 +19,7 @@ obj.name = 'panels'
|
|||
obj.target = 'panels'
|
||||
obj.includes = '. ..'
|
||||
obj.find_sources_in_dirs ('../panels')
|
||||
obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML'
|
||||
obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML X11'
|
||||
obj.uselib_local = 'midori-core'
|
||||
obj.install_path = None
|
||||
|
||||
|
|
3
wscript
3
wscript
|
@ -137,6 +137,9 @@ def configure (conf):
|
|||
|
||||
Utils.pprint ('BLUE', 'Mingw recognized, assuming cross compile.')
|
||||
|
||||
if Options.platform != 'win32':
|
||||
conf.check_cc (lib='X11', uselib='X11')
|
||||
|
||||
if conf.env['CONVERT'] and not conf.env['WINRC']:
|
||||
Utils.pprint ('YELLOW', 'midori.ico won\'t be created')
|
||||
|
||||
|
|
Loading…
Reference in a new issue