Commit 1af6e311 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist
Browse files

No need to use an #ifdef for G_OS_WIN32 as the whole function is already

2000-01-27  Tor Lillqvist  <tml@iki.fi>

* app/main.c (on_signal): No need to use an #ifdef for G_OS_WIN32
as the whole function is already bypassed on Win32.

* libgimp/gimp.def
* libgimp/gimpui.def: Updates.

* plug-ins/makefile.cygwin
* plug-ins/makefile.msc: Goodbye to the megawidget library.

* plug-ins/common/papertile.c: MAIN() must be after PLUG_IN_INFO
definition.
parent 834e31a7
2000-01-27 Tor Lillqvist <tml@iki.fi>
* app/main.c (on_signal): No need to use an #ifdef for G_OS_WIN32
as the whole function is already bypassed on Win32.
* libgimp/gimp.def
* libgimp/gimpui.def: Updates.
* plug-ins/makefile.cygwin
* plug-ins/makefile.msc: Goodbye to the megawidget library.
* plug-ins/common/papertile.c: MAIN() must be after PLUG_IN_INFO
definition.
2000-01-27 Michael Natterer <mitch@gimp.org>
 
* plug-ins/pagecurl/pagecurl.c: a little ui eye candy...
......
......@@ -450,11 +450,7 @@ static RETSIGTYPE
on_signal (int sig_num)
{
if (caught_fatal_sig)
#ifdef G_OS_WIN32
raise (sig_num);
#else
kill (getpid (), sig_num);
#endif
caught_fatal_sig = 1;
switch (sig_num)
......@@ -524,9 +520,9 @@ on_sig_child (int sig_num)
break;
}
}
#endif
#endif /* SIGCHLD */
#endif
#endif /* !G_OS_WIN32 */
typedef struct
{
......
......@@ -237,8 +237,10 @@ EXPORTS
gimp_run_procedure
gimp_run_procedure2
gimp_run_temp
gimp_selection_bounds
gimp_selection_float
gimp_selection_is_empty
gimp_selection_none
gimp_set_data
gimp_standard_help_func
gimp_tile_cache_ntiles
......
......@@ -49,6 +49,7 @@ EXPORTS
gimp_radio_button_update
gimp_radio_group_new
gimp_radio_group_new2
gimp_random_seed_new
gimp_scale_entry_new
gimp_size_entry_add_field
gimp_size_entry_attach_label
......
......@@ -838,8 +838,6 @@ filter (void)
/* PLUGIN INTERFACES */
/*============================================================================*/
MAIN()
static void
plugin_query (void)
{
......@@ -977,3 +975,5 @@ GPlugInInfo PLUG_IN_INFO =
plugin_query,
plugin_run
};
MAIN()
......@@ -63,7 +63,6 @@ libs-clean :
$(MAKE) -f makefile.cygwin sub-libs TARGET=clean
sub-libs:
cd megawidget; $(MAKE) -f ../makefile.cygwin TOP=../.. LIBRARY=megawidget $(TARGET)
cd libgck/gck; $(MAKE) -f ../../makefile.cygwin TOP=../../.. LIBRARY=gck OBJECTS="gckcolor.o gcklistbox.o gckmath.o gckui.o gckvector.o" $(TARGET)
......@@ -204,6 +203,7 @@ OBJECTS = \
cmap.o \
flame.o \
libifs.o \
megawidget.o \
rect.o
endif
......@@ -565,7 +565,7 @@ RESOURCE = ../../app/gimpres.o
endif
$(PLUGIN).exe : $(OBJECTS) $(RESOURCE)
$(CC) $(CFLAGS) -mwindows -s -o $(PLUGIN).exe $(OBJECTS) $(RESOURCE) -L $(PLUGINDIR)/megawidget -lmegawidget -L $(PLUGINDIR)/libgck/gck -lgck -L ../../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) $(EXTRALIBS) $(LDFLAGS)
$(CC) $(CFLAGS) -mwindows -s -o $(PLUGIN).exe $(OBJECTS) $(RESOURCE) -L $(PLUGINDIR)/libgck/gck -lgck -L ../../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) $(EXTRALIBS) $(LDFLAGS)
# Kludge to get the path to the win32 headers
WIN32APIHEADERS = $(shell echo "\#include <winver.h>" | $(CC) -M -E - | tail -1 | sed -e 's!/winver.h!!')
......
......@@ -62,9 +62,6 @@ libs-clean :
@nmake -nologo -f makefile.msc sub-libs TARGET=clean
sub-libs:
cd megawidget
nmake -nologo -f ..\makefile.msc TOP=..\.. LIBRARY=megawidget $(TARGET)
cd ..
cd libgck\gck
nmake -nologo -f ..\..\makefile.msc TOP=..\..\.. LIBRARY=gck OBJECTS="gckcolor.obj gcklistbox.obj gckmath.obj gckui.obj gckvector.obj" $(TARGET)
cd ..\..
......@@ -219,6 +216,7 @@ OBJECTS = \
cmap.obj \
flame.obj \
libifs.obj \
megawidget.obj \
rect.obj
!ENDIF
......@@ -600,7 +598,7 @@ RESOURCE = ..\..\app\gimp.res
!ENDIF
$(PLUGIN).exe : $(OBJECTS) $(RESOURCE)
$(CC) $(CFLAGS) -MD -Fe$(PLUGIN).exe $(OBJECTS) $(RESOURCE) $(PLUGINDIR)\megawidget\megawidget.lib $(PLUGINDIR)\libgck\gck\gck.lib ..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(EXTRALIBS) $(LDFLAGS)
$(CC) $(CFLAGS) -MD -Fe$(PLUGIN).exe $(OBJECTS) $(RESOURCE) $(PLUGINDIR)\libgck\gck\gck.lib ..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(EXTRALIBS) $(LDFLAGS)
$(PLUGIN).res : $(PLUGIN).rc
rc -r -fo $(PLUGIN).res $(PLUGIN).rc
......
Supports Markdown
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