luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 12:25:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

g-ir-compiler: Allow multiple --shared-library

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=744535
Signed-off-by: Garrett Regier <garrett.regier@riftio.com>
This commit is contained in:
Garrett Regier 2015-02-14 11:30:30 -08:00 committed by Evan Welsh
parent 276bbf8f94
commit 380ec88f48
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
girepository/tools/compiler.c
View File

@ -40,7 +40,7 @@ gchar **includedirs = NULL;
gchar **input = NULL; gchar **input = NULL;
gchar *output = NULL; gchar *output = NULL;
gchar *mname = NULL; gchar *mname = NULL;
gchar *shlib = NULL; gchar **shlibs = NULL;
gboolean include_cwd = FALSE; gboolean include_cwd = FALSE;
gboolean debug = FALSE; gboolean debug = FALSE;
gboolean verbose = 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 }, { "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" }, { "output", 'o', 0, G_OPTION_ARG_FILENAME, &output, "output file", "FILE" },
{ "module", 'm', 0, G_OPTION_ARG_STRING, &mname, "module to compile", "NAME" }, { "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 }, { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, "show debug messages", NULL },
{ "verbose", 0, 0, G_OPTION_ARG_NONE, &verbose, "show verbose 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 }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &input, NULL, NULL },
@ -205,11 +205,11 @@ main (int argc, char ** argv)
{ {
GITypelib *typelib; GITypelib *typelib;
if (shlib) if (shlibs)
{ {
if (module->shared_library) if (module->shared_library)
g_free (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); g_debug ("[building] module %s", module->name);