On Win32, create export file gimp.exp. (LDFLAGS): Add -mwindows. (LDADD):

2002-12-26  Tor Lillqvist  <tml@iki.fi>

	* app/Makefile.am: On Win32, create export file gimp.exp.
	(LDFLAGS): Add -mwindows.
	(LDADD): Link with gimp.exp.

	* app/gimp.sym: Remove all old entries (seemed to be obsolete).
	Instead, add the ones linked to from libgimptool.
This commit is contained in:
Tor Lillqvist 2002-12-26 02:08:28 +00:00 committed by Tor Lillqvist
parent 3e8495ceec
commit 63f82075f0
3 changed files with 42 additions and 11 deletions

View File

@ -1,6 +1,12 @@
2002-12-26 Tor Lillqvist <tml@iki.fi> 2002-12-26 Tor Lillqvist <tml@iki.fi>
* app/Makefile.am (EXTRA_DIST): Drop makefile.mingw{,.in}. * app/Makefile.am: On Win32, create export file gimp.exp.
(EXTRA_DIST): Drop makefile.mingw{,.in}.
(LDFLAGS): Add -mwindows.
(LDADD): Link with gimp.exp.
* app/gimp.sym: Remove all old entries (seemed to be obsolete).
Instead, add the ones linked to from libgimptool.
* app/gui/user-install-dialog.c (user_install_run): On Win32, use * app/gui/user-install-dialog.c (user_install_run): On Win32, use
similar code as in GIMP 1.2, i.e. don't run a script to do the similar code as in GIMP 1.2, i.e. don't run a script to do the

View File

@ -1,5 +1,19 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
if OS_WIN32
gimp_exp = gimp.exp
gimp.exp : gimp.def
dlltool --output-exp $@ --input-def gimp.def
gimp.def: gimp.sym
echo EXPORTS >$@
cat $< >>$@
mwindows = -mwindows
endif
SUBDIRS = \ SUBDIRS = \
paint-funcs \ paint-funcs \
base \ base \
@ -79,7 +93,7 @@ else
REGEXREPL = $(top_builddir)/regexrepl/libregex.a REGEXREPL = $(top_builddir)/regexrepl/libregex.a
endif endif
gimp_1_3_LDFLAGS = -export-dynamic -export-symbols $(srcdir)/gimp.sym gimp_1_3_LDFLAGS = -export-dynamic -export-symbols $(srcdir)/gimp.sym $(mwindows)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp\" \ -DG_LOG_DOMAIN=\"Gimp\" \
@ -93,6 +107,7 @@ INCLUDES = \
-I$(includedir) -I$(includedir)
gimp_1_3_LDADD = \ gimp_1_3_LDADD = \
$(gimp_exp) \
gui/libappgui.a \ gui/libappgui.a \
display/libappdisplay.a \ display/libappdisplay.a \
tools/libapptools.a \ tools/libapptools.a \
@ -124,11 +139,11 @@ gimp_1_3_LDADD = \
install-exec-hook: install-exec-hook:
if DEFAULT_BINARY if DEFAULT_BINARY
cd $(DESTDIR)$(bindir) \ cd $(DESTDIR)$(bindir) \
&& rm -f gimp \ && rm -f gimp$(EXEEXT) \
&& $(LN_S) gimp-1.3 gimp && $(LN_S) gimp-1.3$(EXEEXT) gimp$(EXEEXT)
endif endif
uninstall-local: uninstall-local:
if DEFAULT_BINARY if DEFAULT_BINARY
rm -f $(DESTDIR)$(bindir)/gimp rm -f $(DESTDIR)$(bindir)/gimp$(EXEEXT)
endif endif

View File

@ -1,6 +1,16 @@
gimp_color_selector_register gimp_object_get_type
gimp_color_selector_unregister gimp_tool_control_get_cursor
gimp_color_display_register gimp_tool_control_get_cursor_modifier
gimp_color_display_unregister gimp_tool_control_get_toggle_cursor
dialog_register gimp_tool_control_get_toggle_cursor_modifier
dialog_unregister gimp_tool_control_get_toggle_tool_cursor
gimp_tool_control_get_tool_cursor
gimp_tool_control_get_type
gimp_tool_control_halt
gimp_tool_control_is_paused
gimp_tool_control_is_toggled
gimp_tool_control_pause
gimp_tool_control_resume
gimp_tool_real_button_press
gimp_tool_real_button_release
gimp_tool_set_cursor