Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/libs/tk/ydk/wscript b/libs/tk/ydk/wscript
- index ecff3c21cf..d29429eed4 100644
- --- a/libs/tk/ydk/wscript
- +++ b/libs/tk/ydk/wscript
- @@ -188,13 +188,23 @@ def build(bld):
- obj.export_includes += ['quartz']
- elif bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
- obj.source = libydk_sources + libydk_win32_sources
- - obj.cflags += ['-mms-bitfields', '-Wl,--export-all-symbols']
- obj.uselib += ' GIO-WINDOWS'
- obj.defines += [ 'INSIDE_GDK_WIN32', 'DLL_EXPORT', 'PIC' ]
- obj.includes += ['win32', 'win32/ydk']
- obj.export_includes += ['win32']
- - obj.linkflags = ['-Wl,--export-all-symbols']
- - obj.ldflags = '-limm32 -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid'
- + if bld.env['build_target'] == 'mingw':
- + obj.cflags += ['-mms-bitfields']
- + obj.linkflags = ['-Wl,--export-all-symbols']
- + obj.ldflags = '-limm32 -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid'
- + else:
- + obj.lib = ['imm32', 'ole32', 'gdi32', 'comdlg32', 'winspool', 'comctl32', 'uuid']
- + obj.env['LIBPATH_GLIB'] = []
- + obj.env['LIBPATH_PANGO'] = []
- + obj.env['LIBPATH_CAIRO'] = []
- + obj.env['LIBPATH_PANGOCAIRO'] = []
- + obj.env['LIBPATH_GIO-WINDOWS'] = []
- +
- +
- else:
- obj.source = libydk_sources + libydk_x11_sources
- obj.uselib += ' GIO-UNIX X11 XEXT XINERAMA RANDR DL'
- diff --git a/libs/tk/ydk-pixbuf/wscript b/libs/tk/ydk-pixbuf/wscript
- index 5bac6e5a7d..7565a23b4d 100644
- --- a/libs/tk/ydk-pixbuf/wscript
- +++ b/libs/tk/ydk-pixbuf/wscript
- @@ -39,7 +39,7 @@ def configure(conf):
- autowaf.check_pkg(conf, 'libpng', uselib_store='LIBPNG', mandatory=True)
- def build(bld):
- - obj = bld.shlib(features = 'c cshlib', source=libydkpixbuf_sources)
- + obj = bld.shlib(features = 'c cshlib', source=libydkpixbuf_sources, implib=None )
- obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
- obj.export_includes = ['.']
- obj.includes = ['.', 'ydk-pixbuf']
Advertisement
Add Comment
Please, Sign In to add comment