luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-08 18:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-gresource-export-msvc' into 'master'

Browse Source 
glib-compile-resources: Fix exporting on Visual Studio

Closes #1215

See merge request GNOME/glib!1468
This commit is contained in:
Nirbheek Chauhan 2020-05-28 10:03:28 +00:00
commit 73d9b72fec
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gio/glib-compile-resources.c
View File

@ -1061,6 +1061,7 @@ main (int argc, char **argv)
guint8 *data; guint8 *data;
gsize data_size; gsize data_size;
gsize i; gsize i;
const char *export = "G_MODULE_EXPORT";
if (!g_file_get_contents (binary_target, (char **)&data, if (!g_file_get_contents (binary_target, (char **)&data,
&data_size, NULL)) &data_size, NULL))
@ -1081,6 +1082,9 @@ main (int argc, char **argv)
return 1; return 1;
} }
if (internal)
export = "G_GNUC_INTERNAL";
g_fprintf (file, g_fprintf (file,
"#include <gio/gio.h>\n" "#include <gio/gio.h>\n"
"\n" "\n"
@ -1140,30 +1144,36 @@ main (int argc, char **argv)
g_fprintf (file, g_fprintf (file,
"\n" "\n"
"static GStaticResource static_resource = { %s_resource_data.data, sizeof (%s_resource_data.data)%s, NULL, NULL, NULL };\n" "static GStaticResource static_resource = { %s_resource_data.data, sizeof (%s_resource_data.data)%s, NULL, NULL, NULL };\n"
"%s GResource *%s_get_resource (void);\n" "\n"
"%s\n"
"GResource *%s_get_resource (void);\n"
"GResource *%s_get_resource (void)\n" "GResource *%s_get_resource (void)\n"
"{\n" "{\n"
" return g_static_resource_get_resource (&static_resource);\n" " return g_static_resource_get_resource (&static_resource);\n"
"}\n", "}\n",
c_name, c_name, (external_data ? "" : " - 1 /* nul terminator */"), linkage, c_name, c_name); c_name, c_name, (external_data ? "" : " - 1 /* nul terminator */"),
export, c_name, c_name);
if (manual_register) if (manual_register)
{ {
g_fprintf (file, g_fprintf (file,
"\n" "\n"
"%s void %s_unregister_resource (void);\n" "%s\n"
"void %s_unregister_resource (void);\n"
"void %s_unregister_resource (void)\n" "void %s_unregister_resource (void)\n"
"{\n" "{\n"
" g_static_resource_fini (&static_resource);\n" " g_static_resource_fini (&static_resource);\n"
"}\n" "}\n"
"\n" "\n"
"%s void %s_register_resource (void);\n" "%s\n"
"void %s_register_resource (void);\n"
"void %s_register_resource (void)\n" "void %s_register_resource (void)\n"
"{\n" "{\n"
" g_static_resource_init (&static_resource);\n" " g_static_resource_init (&static_resource);\n"
"}\n", "}\n",
linkage, c_name, c_name, linkage, c_name, c_name); export, c_name, c_name,
export, c_name, c_name);
} }
else else
{ {