]> spindle.queued.net Git - midori/commitdiff
Add win32 specific linker flags for Midori extensions
authorPeter de Ridder <peter@xfce.org>
Mon, 15 Feb 2010 21:43:51 +0000 (22:43 +0100)
committerChristian Dywan <christian@twotoasts.de>
Mon, 15 Feb 2010 23:59:42 +0000 (00:59 +0100)
extensions/wscript_build
wscript

index 49c0247a3399be92808af19ad26b76fb051833be..c09986ed9c81b51e514eed0526e258d8b01b0262 100644 (file)
@@ -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 f0f6881fa637637698d1c7bcb04c2562a915ba50..461baa0cd55082de364daf794ddef45d9ffe0c8d 100644 (file)
--- 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')