[Xfce4-commits] <midori:master> Add win32 specific linker flags for Midori extensions

[Christian Dywan]

Updating branch refs/heads/master
         to b993cdc55379b5cd507af3bd527aeaaf6a97760a (commit)
       from f9a6a8e379232fbec672876ca37e556839e8bddc (commit)

commit b993cdc55379b5cd507af3bd527aeaaf6a97760a
Author: Peter de Ridder <peter at xfce.org>
Date:   Mon Feb 15 22:43:51 2010 +0100

    Add win32 specific linker flags for Midori extensions

 extensions/wscript_build |    2 ++
 wscript                  |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/extensions/wscript_build b/extensions/wscript_build
index 49c0247..c09986e 100644
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -29,3 +29,5 @@ for extension in extensions:
     obj.source = source
     obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON'
     obj.install_path = '${LIBDIR}/midori'
+    if bld.env['platform'] == 'win32':
+        obj.uselib_local = 'midori'
diff --git a/wscript b/wscript
index f0f6881..461baa0 100644
--- a/wscript
+++ b/wscript
@@ -118,6 +118,7 @@ def configure (conf):
         if not conf.find_program ('convert', var='CONVERT'):
             Utils.pprint ('YELLOW', 'midori.ico won\'t be created')
         conf.find_program ('windres', var='WINRC')
+        conf.env['platform'] = 'win32'
 
     # This is specific to cross compiling with mingw
     if is_mingw (conf.env) and Options.platform != 'win32':
@@ -261,6 +262,7 @@ def configure (conf):
     conf.define ('HAVE_OSX', int(sys.platform == 'darwin'))
     if Options.platform == 'win32':
         conf.env.append_value ('LINKFLAGS', '-mwindows')
+        conf.env.append_value ('program_LINKFLAGS', ['-Wl,--out-implib=default/midori/libmidori.a', '-Wl,--export-all-symbols'])
     else:
         conf.check (header_name='signal.h')