summaryrefslogtreecommitdiff
path: root/tools/compiler.c
diff options
context:
space:
mode:
authorGarrett Regier <garrett.regier@riftio.com>2015-02-14 11:30:30 -0800
committerColin Walters <walters@verbum.org>2015-09-29 23:44:06 -0400
commite0027719e2db40ee22745087c291e66088a4f30d (patch)
tree1252437b76f8323b80a239d12221bf9557b91e94 /tools/compiler.c
parentd4234f61d093ec32444e27931aac4cb453922b25 (diff)
downloadgobject-introspection-e0027719e2db40ee22745087c291e66088a4f30d.tar.gz
g-ir-compiler: Allow multiple --shared-library
https://bugzilla.gnome.org/show_bug.cgi?id=744535 Signed-off-by: Garrett Regier <garrett.regier@riftio.com>
Diffstat (limited to 'tools/compiler.c')
-rw-r--r--tools/compiler.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/compiler.c b/tools/compiler.c
index 88b59a04..9485761c 100644
--- a/tools/compiler.c
+++ b/tools/compiler.c
@@ -40,7 +40,7 @@ gchar **includedirs = NULL;
gchar **input = NULL;
gchar *output = NULL;
gchar *mname = NULL;
-gchar *shlib = NULL;
+gchar **shlibs = NULL;
gboolean include_cwd = FALSE;
gboolean debug = FALSE;
gboolean verbose = FALSE;
@@ -131,7 +131,7 @@ static GOptionEntry options[] =
{ "includedir", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &includedirs, "include directories in GIR search path", NULL },
{ "output", 'o', 0, G_OPTION_ARG_FILENAME, &output, "output file", "FILE" },
{ "module", 'm', 0, G_OPTION_ARG_STRING, &mname, "module to compile", "NAME" },
- { "shared-library", 'l', 0, G_OPTION_ARG_FILENAME, &shlib, "shared library", "FILE" },
+ { "shared-library", 'l', 0, G_OPTION_ARG_FILENAME_ARRAY, &shlibs, "shared library", "FILE" },
{ "debug", 0, 0, G_OPTION_ARG_NONE, &debug, "show debug messages", NULL },
{ "verbose", 0, 0, G_OPTION_ARG_NONE, &verbose, "show verbose messages", NULL },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &input, NULL, NULL },
@@ -205,11 +205,11 @@ main (int argc, char ** argv)
{
GITypelib *typelib;
- if (shlib)
+ if (shlibs)
{
if (module->shared_library)
g_free (module->shared_library);
- module->shared_library = g_strdup (shlib);
+ module->shared_library = g_strjoinv (",", shlibs);
}
g_debug ("[building] module %s", module->name);