Commit 788c17e4 authored by Juan Pablo Ugarte's avatar Juan Pablo Ugarte

Replaced use of -export-symbols with -export-symbols-regex

Removed old undefined symbols to fix build error on windows
	glade_app_get_plugins_dir()
	glade_catalog_supports_libglade()
	glade_catalog_supports_gtkbuilder()
	glade_signal_editor_construct_signals_list()
parent 4c4e8890
......@@ -159,32 +159,16 @@ libgladeui_2_la_LDFLAGS += -no-undefined
endif
if NATIVE_WIN32
libgladeui_2_la_LDFLAGS += -Wl,gladeui-win32-res.o -export-symbols gladeui.def
libgladeui_2_la_DEPENDENCIES = gladeui-win32-res.o gladeui.def
libgladeui_2_la_LDFLAGS += \
-Wl,gladeui-win32-res.o \
-export-dynamic \
-export-symbols-regex "^(glade).*"
libgladeui_2_la_DEPENDENCIES = gladeui-win32-res.o
endif
gladeui-win32-res.o: gladeui.rc
$(WINDRES) $< $@
# gladeui.def: auto-generated DEF file for linker input
# The routines below will scan the header files and extracts symbol declarations.
# The symbol 'custom_get_type' is added manually. It's naming deviates from
# the pattern set by all other public symbols in the glade namespace.
#
gladeui.def: $(libgladeuiinclude_HEADERS)
@echo Generating $@
@(echo EXPORTS; \
echo 'custom_get_type'; \
(cd $(srcdir); cat $(libgladeuiinclude_HEADERS) || echo 'glade_ERROR ()' ) | \
grep -v -E '^# *include' | \
grep -v -E '^# *define' | \
grep -E '[^\(]glade_.*[[:space:]]+\(.*' | \
sed -e 's/[ ]*(.*//' | \
sed -e 's/.*glade_/glade_/' | \
sort; \
) >$@
@ ! grep -q glade_ERROR $@ || ($(RM) $@; false)
#
# Marshaller generation
#
......@@ -197,7 +181,7 @@ glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL)
&& mv glade-marshallers-c.tmp glade-marshallers.c \
|| ( rm -f glade-marshallers-c.tmp && exit 1 )
CLEANFILES = $(BUILT_SOURCES) gladeui.def
CLEANFILES = $(BUILT_SOURCES)
#
# Introspection generation
......
......@@ -98,7 +98,6 @@ void glade_app_search_docs (const gchar *book,
/* package paths */
const gchar *glade_app_get_catalogs_dir (void) G_GNUC_CONST;
const gchar *glade_app_get_modules_dir (void) G_GNUC_CONST;
const gchar *glade_app_get_plugins_dir (void) G_GNUC_CONST;
const gchar *glade_app_get_pixmaps_dir (void) G_GNUC_CONST;
const gchar *glade_app_get_locale_dir (void) G_GNUC_CONST;
const gchar *glade_app_get_bin_dir (void) G_GNUC_CONST;
......
......@@ -84,9 +84,6 @@ gboolean glade_widget_group_get_expanded (GladeWidgetGroup *group);
const GList *glade_widget_group_get_adaptors (GladeWidgetGroup *group);
gboolean glade_catalog_supports_libglade (GladeCatalog *catalog);
gboolean glade_catalog_supports_gtkbuilder (GladeCatalog *catalog);
G_END_DECLS
#endif /* __GLADE_CATALOG_H__ */
......@@ -42,7 +42,6 @@ struct _GladeSignalEditorClass
GType glade_signal_editor_get_type (void) G_GNUC_CONST;
GladeSignalEditor *glade_signal_editor_new (void);
void glade_signal_editor_construct_signals_list (GladeSignalEditor *editor);
void glade_signal_editor_load_widget (GladeSignalEditor *editor,
GladeWidget *widget);
GladeWidget *glade_signal_editor_get_widget (GladeSignalEditor *editor);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment