From e6928cba2d7b49ddb3f3cf958fbb784048f0822c Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Wed, 7 Feb 2001 01:16:18 +0000 Subject: [PATCH] changes to allow to build on win32 with msvc again --- ChangeLog | 43 ++++ app/app_procs.c | 6 +- app/base/tile-swap.c | 1 + app/core/gimpbrush-load.c | 8 +- app/core/gimpbrush.c | 8 +- app/core/gimpbrushpipe-load.c | 8 +- app/core/gimpbrushpipe.c | 8 +- app/core/gimpcontainer.c | 4 +- app/core/gimpdatafiles.h | 1 + app/core/gimpobject.h | 2 +- app/core/gimppattern-load.c | 7 +- app/core/gimppattern.c | 7 +- app/datafiles.h | 1 + app/dialog_handler.h | 4 +- app/gimpbrush.c | 8 +- app/gimpbrushpipe.c | 8 +- app/gimpcontainer.c | 4 +- app/gimpobject.h | 2 +- app/gimppattern.c | 7 +- app/makefile.msc | 371 +++++++++++++----------------- app/plug-in/gimpplugin-progress.h | 2 +- app/plug-in/gimpplugin.h | 2 +- app/plug-in/gimppluginmanager.h | 2 +- app/plug-in/plug-in-def.h | 2 +- app/plug-in/plug-in-params.h | 2 +- app/plug-in/plug-in-progress.h | 2 +- app/plug-in/plug-in.h | 2 +- app/plug-in/plug-ins.h | 2 +- app/plug_in.h | 2 +- app/tile_swap.c | 1 + libgimp/gimp.def | 2 + libgimp/gimpui.def | 71 ------ libgimp/makefile.msc | 75 +++--- libgimpbase/gimpdatafiles.h | 1 + libgimpcolor/gimpcolor.def | 49 +++- libgimpcolor/makefile.msc | 177 ++------------ libgimpmath/gimpmath.def | 21 +- libgimpmath/makefile.msc | 176 ++------------ libgimpwidgets/gimpwidgets.def | 97 +++++++- libgimpwidgets/libgimp-glue.c | 235 +++++++++++++++++++ libgimpwidgets/makefile.msc | 171 ++------------ plug-ins/makefile.msc | 82 +++---- 42 files changed, 772 insertions(+), 912 deletions(-) create mode 100644 libgimpwidgets/libgimp-glue.c diff --git a/ChangeLog b/ChangeLog index b66e9a60c0..e5523952c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,46 @@ +2001-02-07 Hans Breuer + + * */makefile.msc : Gimp 1.3 for win32 (msc) builds and runs at + this short moment, it's a fast moving target nowadays :-) + + * app/app_procs.c + * app/gimpbrush.c + * app/gimpbrushpipe.c + * app/gimppattern.c : make sure G_OS_WIN32 is defined (by glib.h + inclusion) before actually using it + + * app/plug_in.h + * app/datafiles.h : for time_t + + * app/tile_swap.c : include for SEEK_SET + + * app/gimpcontainer.c : use G_GNUC_FUNCTION instead of + __FUNCTION__ to allow compiling without gcc + + * app/dialog_handler.h : don't use conditional prototypes + for gmodule exported function but include and + use G_MODULE_EXPORT in prototype, too. + + * app/gimpobject.h : added typedef for GimpObject + + * libgimp/gimp.def : more exported symbols + + * libgimp/gimpcolorselector.h : #include for + G_MODULE_EXPORT, sane prototypes. + + * libgimp/gimpui.def : symbol export update, splitted to + gimpwidgets.def + + * libgimpcolor/gimpcolor.def + * libgimpmath/gimpmath.def + * libgimpwidgets/gimpwidgets.def : updated + + * libgimpwidgets/libgimp-glue.c : new file which supports + real dynamic linking on win32, against exported symbols from + the application or libgimp. This allows to resolve the + double dependency for currently 11 functions + + 2001-02-07 Michael Natterer * app/Makefile.am diff --git a/app/app_procs.c b/app/app_procs.c index b368ee6820..759501cd05 100644 --- a/app/app_procs.c +++ b/app/app_procs.c @@ -33,12 +33,13 @@ #include #endif +#include +#include + #ifdef G_OS_WIN32 #include /* For _getpid() */ #endif -#include - #include "libgimpwidgets/gimpwidgets.h" #include "apptypes.h" @@ -56,6 +57,7 @@ #include "fileops.h" #include "gdisplay.h" #include "gdisplay_ops.h" +#include "gimpbrushlist.h" #include "gimpcontext.h" #include "gimpimage.h" #include "gimprc.h" diff --git a/app/base/tile-swap.c b/app/base/tile-swap.c index 43a3b09c09..08f5ad02c2 100644 --- a/app/base/tile-swap.c +++ b/app/base/tile-swap.c @@ -20,6 +20,7 @@ #include +#include /* SEEK_SET */ #include #include #include diff --git a/app/core/gimpbrush-load.c b/app/core/gimpbrush-load.c index 66e7fe8122..fbd0e91573 100644 --- a/app/core/gimpbrush-load.c +++ b/app/core/gimpbrush-load.c @@ -29,7 +29,9 @@ #endif #include -#ifdef G_OS_WIN32 +#include + +#ifdef G_OS_WIN32 /* gets defined by glib.h */ #include #endif @@ -37,14 +39,12 @@ #define _O_BINARY 0 #endif -#include - - #include #include "apptypes.h" #include "brush_header.h" +#include "brush_scale.h" #include "gimpbrush.h" #include "gimprc.h" #include "temp_buf.h" diff --git a/app/core/gimpbrush.c b/app/core/gimpbrush.c index 66e7fe8122..fbd0e91573 100644 --- a/app/core/gimpbrush.c +++ b/app/core/gimpbrush.c @@ -29,7 +29,9 @@ #endif #include -#ifdef G_OS_WIN32 +#include + +#ifdef G_OS_WIN32 /* gets defined by glib.h */ #include #endif @@ -37,14 +39,12 @@ #define _O_BINARY 0 #endif -#include - - #include #include "apptypes.h" #include "brush_header.h" +#include "brush_scale.h" #include "gimpbrush.h" #include "gimprc.h" #include "temp_buf.h" diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c index b64c23a783..539c118334 100644 --- a/app/core/gimpbrushpipe-load.c +++ b/app/core/gimpbrushpipe-load.c @@ -31,16 +31,16 @@ #endif #include -#ifdef G_OS_WIN32 -#include -#endif - #ifndef _O_BINARY #define _O_BINARY 0 #endif #include +#ifdef G_OS_WIN32 +#include +#endif + #include "libgimpmath/gimpmath.h" #include "apptypes.h" diff --git a/app/core/gimpbrushpipe.c b/app/core/gimpbrushpipe.c index b64c23a783..539c118334 100644 --- a/app/core/gimpbrushpipe.c +++ b/app/core/gimpbrushpipe.c @@ -31,16 +31,16 @@ #endif #include -#ifdef G_OS_WIN32 -#include -#endif - #ifndef _O_BINARY #define _O_BINARY 0 #endif #include +#ifdef G_OS_WIN32 +#include +#endif + #include "libgimpmath/gimpmath.h" #include "apptypes.h" diff --git a/app/core/gimpcontainer.c b/app/core/gimpcontainer.c index 26aa063762..7a92fffa2e 100644 --- a/app/core/gimpcontainer.c +++ b/app/core/gimpcontainer.c @@ -255,7 +255,7 @@ gimp_container_add (GimpContainer *container, if (gimp_container_have (container, object)) { g_warning ("%s(): container already contains object %p", - __FUNCTION__, object); + G_GNUC_FUNCTION, object); return FALSE; } @@ -311,7 +311,7 @@ gimp_container_remove (GimpContainer *container, if (! gimp_container_have (container, object)) { g_warning ("%s(): container does not contains object %p", - __FUNCTION__, object); + G_GNUC_FUNCTION, object); return FALSE; } diff --git a/app/core/gimpdatafiles.h b/app/core/gimpdatafiles.h index 6667b3622e..d581d91c72 100644 --- a/app/core/gimpdatafiles.h +++ b/app/core/gimpdatafiles.h @@ -22,6 +22,7 @@ #ifndef __DATAFILES_H__ #define __DATAFILES_H__ +#include typedef enum { diff --git a/app/core/gimpobject.h b/app/core/gimpobject.h index 29165eb20c..df446bd2db 100644 --- a/app/core/gimpobject.h +++ b/app/core/gimpobject.h @@ -29,7 +29,7 @@ #define GIMP_IS_OBJECT(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_OBJECT)) #define GIMP_IS_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OBJECT)) - +typedef struct _GimpObject GimpObject; typedef struct _GimpObjectClass GimpObjectClass; struct _GimpObject diff --git a/app/core/gimppattern-load.c b/app/core/gimppattern-load.c index 4b5d6cc9ab..f43bbba857 100644 --- a/app/core/gimppattern-load.c +++ b/app/core/gimppattern-load.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -29,6 +30,8 @@ #endif #include +#include + #ifdef G_OS_WIN32 #include #endif @@ -37,10 +40,6 @@ #define _O_BINARY 0 #endif -#include - -#include - #include "apptypes.h" #include "gimpimage.h" diff --git a/app/core/gimppattern.c b/app/core/gimppattern.c index 4b5d6cc9ab..f43bbba857 100644 --- a/app/core/gimppattern.c +++ b/app/core/gimppattern.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -29,6 +30,8 @@ #endif #include +#include + #ifdef G_OS_WIN32 #include #endif @@ -37,10 +40,6 @@ #define _O_BINARY 0 #endif -#include - -#include - #include "apptypes.h" #include "gimpimage.h" diff --git a/app/datafiles.h b/app/datafiles.h index 6667b3622e..d581d91c72 100644 --- a/app/datafiles.h +++ b/app/datafiles.h @@ -22,6 +22,7 @@ #ifndef __DATAFILES_H__ #define __DATAFILES_H__ +#include typedef enum { diff --git a/app/dialog_handler.h b/app/dialog_handler.h index d4494e96e3..481404f641 100644 --- a/app/dialog_handler.h +++ b/app/dialog_handler.h @@ -20,8 +20,10 @@ #ifndef __DIALOG_HANDLER_H__ #define __DIALOG_HANDLER_H__ - +#include +G_MODULE_EXPORT void dialog_register (GtkWidget *dialog); +G_MODULE_EXPORT void dialog_unregister (GtkWidget *dialog); void dialog_register_toolbox (GtkWidget *dialog); diff --git a/app/gimpbrush.c b/app/gimpbrush.c index 66e7fe8122..fbd0e91573 100644 --- a/app/gimpbrush.c +++ b/app/gimpbrush.c @@ -29,7 +29,9 @@ #endif #include -#ifdef G_OS_WIN32 +#include + +#ifdef G_OS_WIN32 /* gets defined by glib.h */ #include #endif @@ -37,14 +39,12 @@ #define _O_BINARY 0 #endif -#include - - #include #include "apptypes.h" #include "brush_header.h" +#include "brush_scale.h" #include "gimpbrush.h" #include "gimprc.h" #include "temp_buf.h" diff --git a/app/gimpbrushpipe.c b/app/gimpbrushpipe.c index b64c23a783..539c118334 100644 --- a/app/gimpbrushpipe.c +++ b/app/gimpbrushpipe.c @@ -31,16 +31,16 @@ #endif #include -#ifdef G_OS_WIN32 -#include -#endif - #ifndef _O_BINARY #define _O_BINARY 0 #endif #include +#ifdef G_OS_WIN32 +#include +#endif + #include "libgimpmath/gimpmath.h" #include "apptypes.h" diff --git a/app/gimpcontainer.c b/app/gimpcontainer.c index 26aa063762..7a92fffa2e 100644 --- a/app/gimpcontainer.c +++ b/app/gimpcontainer.c @@ -255,7 +255,7 @@ gimp_container_add (GimpContainer *container, if (gimp_container_have (container, object)) { g_warning ("%s(): container already contains object %p", - __FUNCTION__, object); + G_GNUC_FUNCTION, object); return FALSE; } @@ -311,7 +311,7 @@ gimp_container_remove (GimpContainer *container, if (! gimp_container_have (container, object)) { g_warning ("%s(): container does not contains object %p", - __FUNCTION__, object); + G_GNUC_FUNCTION, object); return FALSE; } diff --git a/app/gimpobject.h b/app/gimpobject.h index 29165eb20c..df446bd2db 100644 --- a/app/gimpobject.h +++ b/app/gimpobject.h @@ -29,7 +29,7 @@ #define GIMP_IS_OBJECT(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_OBJECT)) #define GIMP_IS_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OBJECT)) - +typedef struct _GimpObject GimpObject; typedef struct _GimpObjectClass GimpObjectClass; struct _GimpObject diff --git a/app/gimppattern.c b/app/gimppattern.c index 4b5d6cc9ab..f43bbba857 100644 --- a/app/gimppattern.c +++ b/app/gimppattern.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -29,6 +30,8 @@ #endif #include +#include + #ifdef G_OS_WIN32 #include #endif @@ -37,10 +40,6 @@ #define _O_BINARY 0 #endif -#include - -#include - #include "apptypes.h" #include "gimpimage.h" diff --git a/app/makefile.msc b/app/makefile.msc index 18425c4ad2..55220e4e76 100644 --- a/app/makefile.msc +++ b/app/makefile.msc @@ -1,5 +1,3 @@ -## WARNING: Outdated. - ## Makefile for building gimp.exe with Microsoft C ## Use: nmake -f makefile.msc @@ -8,19 +6,12 @@ # will pick it up. BIN = C:\install\gimp\bin +TOP = ..\.. + ################################################################ # Nothing much configurable below - -!IFNDEF DEBUG -# Full optimization: -OPTIMIZE = -Ox -MD -LINKDEBUG = -!ELSE -# Debugging: -OPTIMIZE = -Zi -MDd -LINKDEBUG = /debug -!ENDIF +!INCLUDE $(TOP)\build\win32\make.msc # cl -? describes the options CC = cl -GA -G5 -GF $(OPTIMIZE) -W3 -nologo @@ -28,16 +19,9 @@ CC = cl -GA -G5 -GF $(OPTIMIZE) -W3 -nologo LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG) INSTALL = copy -GIMP_VER = 1.2 -GTK_VER = 1.3 -GLIB_VER = 1.3 +GIMP_VER = 1.3 -GTK = ..\..\gtk+ -GLIB = ..\..\glib -GMODULE = $(GLIB)\gmodule -INTL = ..\..\intl - -CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"Gimp\" -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL) +CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS) all : \ ..\config.h \ @@ -56,205 +40,153 @@ gimpim_OBJECTS = \ gimpimage.obj \ gimpobject.obj \ gimppreviewcache.obj\ - gimpset.obj \ - gimpsignal.obj +# gimpset.obj \ +# gimpsignal.obj gimpim.lib : $(gimpim_OBJECTS) lib /out:gimpim.lib $(gimpim_OBJECTS) gimp_OBJECTS = \ - about_dialog.obj \ - airbrush.obj \ - airbrush_blob.obj \ - app_procs.obj \ - asupsample.obj \ - batch.obj \ - bezier_select.obj \ - blend.obj \ - blob.obj \ - boundary.obj \ - brightness_contrast.obj \ - brush_edit.obj \ - brush_scale.obj \ - brush_select.obj \ - brush_select_cmds.obj \ - brushes_cmds.obj \ - bucket_fill.obj \ - by_color_select.obj \ - channel.obj \ - channel_cmds.obj \ - channels_dialog.obj \ - channel_ops.obj \ - channel_ops_cmds.obj \ - clone.obj \ - color_area.obj \ - color_balance.obj \ - color_cmds.obj \ - color_notebook.obj \ - color_panel.obj \ - color_picker.obj \ - color_select.obj \ - color_transfer.obj \ - colormaps.obj \ - colormap_dialog.obj \ - commands.obj \ - context_manager.obj \ - convert.obj \ - convert_cmds.obj \ - convolve.obj \ - crop.obj \ - cursorutil.obj \ - curves.obj \ - datafiles.obj \ - desaturate.obj \ - devices.obj \ - dialog_handler.obj \ - disp_callbacks.obj \ - docindex.obj \ - dodgeburn.obj \ - draw_core.obj \ - drawable.obj \ - drawable_cmds.obj \ - edit_cmds.obj \ - edit_selection.obj \ - ellipse_select.obj \ - eraser.obj \ - errorconsole.obj \ - errors.obj \ - equalize.obj \ - fileops.obj \ - fileops_cmds.obj \ - flip_tool.obj \ - floating_sel.obj \ - floating_sel_cmds.obj \ - file_new_dialog.obj \ - free_select.obj \ - fuzzy_select.obj \ - gdisplay.obj \ - gdisplay_cmds.obj \ - gdisplay_ops.obj \ - general.obj \ - gimage.obj \ - gimage_cmds.obj \ - gimage_mask.obj \ - gimage_mask_cmds.obj \ - gimpbrush.obj \ - gimpbrushgenerated.obj \ - gimpbrushlist.obj \ - gimpbrushpipe.obj \ - gimpcontext.obj \ - gimpcontextpreview.obj \ - gimpdnd.obj \ - gimphelp.obj \ - gimphelp_cmds.obj \ - gimphistogram.obj \ - gimplist.obj \ - gimplut.obj \ - gimpparasite.obj \ - gimpprogress.obj \ - gimprc.obj \ - gimprc_cmds.obj \ - gimpui.obj \ - gimpunit.obj \ - global_edit.obj \ - gradient.obj \ - gradient_cmds.obj \ - gradient_select.obj \ - gradient_select_cmds.obj\ - guides_cmds.obj \ - gtkwrapbox.obj \ - gtkhwrapbox.obj \ - gtkvwrapbox.obj \ - gximage.obj \ - histogramwidget.obj \ - histogram_tool.obj \ - hue_saturation.obj \ - image_map.obj \ - image_new.obj \ - image_render.obj \ - indicator_area.obj \ - info_dialog.obj \ - info_window.obj \ - ink.obj \ - interface.obj \ - interface_cmds.obj \ - internal_procs.obj \ - invert.obj \ - iscissors.obj \ - layer.obj \ - layer_cmds.obj \ - layer_select.obj \ - layers_dialog.obj \ - lc_dialog.obj \ - levels.obj \ - lut_funcs.obj \ - magnify.obj \ - main.obj \ - measure.obj \ - menus.obj \ - misc_cmds.obj \ - module_db.obj \ - move.obj \ - nav_window.obj \ - ops_buttons.obj \ - palette.obj \ - palette_cmds.obj \ - palette_select.obj \ - paint_core.obj \ - paint_funcs.obj \ - paintbrush.obj \ - parasite_cmds.obj \ - parasitelist.obj \ - path.obj \ - paths_cmds.obj \ - paths_dialog.obj \ - pattern_select.obj \ - pattern_select_cmds.obj \ - patterns.obj \ - patterns_cmds.obj \ - pencil.obj \ - perspective_tool.obj \ - pixel_processor.obj \ - pixel_region.obj \ - plug_in.obj \ - plug_in_cmds.obj \ - posterize.obj \ - preferences_dialog.obj \ - procedural_db.obj \ - procedural_db_cmds.obj \ - qmask.obj \ - rect_select.obj \ - regex.obj \ - resize.obj \ - rotate_tool.obj \ - scale.obj \ - scale_tool.obj \ - scan_convert.obj \ - scroll.obj \ - selection.obj \ - session.obj \ - shear_tool.obj \ - smudge.obj \ - temp_buf.obj \ - text_tool.obj \ - text_tool_cmds.obj \ - threshold.obj \ - tile.obj \ - tile_cache.obj \ - tile_manager.obj \ - tile_swap.obj \ - tips_dialog.obj \ - tool_options.obj \ - tools.obj \ - tools_cmds.obj \ - transform_core.obj \ - transform_tool.obj \ - undo.obj \ - undo_cmds.obj \ - undo_history.obj \ - unit_cmds.obj \ - user_install.obj \ - xcf.obj + about_dialog.obj \ + app_procs.obj \ + asupsample.obj \ + batch.obj \ + boundary.obj \ + brush_edit.obj \ + brush_scale.obj \ + brush_select.obj \ + brushes.obj \ + channel_ops.obj \ + channels_dialog.obj \ + color_area.obj \ + color_notebook.obj \ + color_panel.obj \ + color_select.obj \ + color_transfer.obj \ + colormap_dialog.obj \ + colormaps.obj \ + commands.obj \ + context_manager.obj \ + convert.obj \ + cursorutil.obj \ + datafiles.obj \ + desaturate.obj \ + devices.obj \ + dialog_handler.obj \ + disp_callbacks.obj \ + docindex.obj \ + draw_core.obj \ + drawable.obj \ + equalize.obj \ + errorconsole.obj \ + errors.obj \ + file_new_dialog.obj \ + fileops.obj \ + floating_sel.obj \ + gdisplay.obj \ + gdisplay_ops.obj \ + general.obj \ + gimage.obj \ + gimage_mask.obj \ + gimpbrush.obj \ + gimpbrushgenerated.obj \ + gimpbrushpipe.obj \ + gimpchannel.obj \ + gimpconstrainedhwrapbox.obj \ + gimpcontainer.obj \ + gimpcontainergridview.obj \ + gimpcontainerlistview.obj \ + gimpcontainerview.obj \ + gimpcontext.obj \ + gimpcontextpreview.obj \ + gimpdatalist.obj \ + gimpdnd.obj \ + gimpdrawable.obj \ + gimpdrawablepreview.obj \ + gimphelp.obj \ + gimphistogram.obj \ + gimpimage.obj \ + gimplayer.obj \ + gimplayermask.obj \ + gimplist.obj \ + gimplut.obj \ + gimpmarshal.obj \ + gimpobject.obj \ + gimppalette.obj \ + gimpparasite.obj \ + gimppattern.obj \ + gimppreview.obj \ + gimppreviewcache.obj \ + gimpprogress.obj \ + gimprc.obj \ + gimpui.obj \ + gimpunit.obj \ + gimpviewable.obj \ + global_edit.obj \ + gradient.obj \ + gradient_select.obj \ + gtkhwrapbox.obj \ + gtkvwrapbox.obj \ + gtkwrapbox.obj \ + gximage.obj \ + histogramwidget.obj \ + image_map.obj \ + image_new.obj \ + image_render.obj \ + indicator_area.obj \ + info_dialog.obj \ + info_window.obj \ + interface.obj \ + invert.obj \ + layer_select.obj \ + layers_dialog.obj \ + lc_dialog.obj \ + libgimp_glue.obj \ + lut_funcs.obj \ + main.obj \ + menus.obj \ + module_db.obj \ + nav_window.obj \ + ops_buttons.obj \ + paint_funcs.obj \ + palette.obj \ + palette_import.obj \ + palette_select.obj \ + parasitelist.obj \ + path.obj \ + paths_dialog.obj \ + pattern_select.obj \ + patterns.obj \ + pixel_processor.obj \ + pixel_region.obj \ + plug_in.obj \ + preferences_dialog.obj \ + qmask.obj \ + regexrepl.obj \ + resize.obj \ + resolution_calibrate.obj \ + scale.obj \ + scan_convert.obj \ + scroll.obj \ + selection.obj \ + session.obj \ + temp_buf.obj \ + tile.obj \ + tile_cache.obj \ + tile_manager.obj \ + tile_swap.obj \ + tips_dialog.obj \ + toolbox.obj \ + undo.obj \ + undo_history.obj \ + user_install.obj \ + xcf.obj \ +# gdisplay_color.obj \ +# gdisplay_color_ui.obj \ +# gimpbrushlist.obj \ +# path_bezier.obj \ +# path_curves.obj \ + gimp.res : gimp.rc wilber.ico rc -r -fo gimp.res gimp.rc @@ -264,7 +196,12 @@ gimp.def: gimp.sym copy /y $@+gimp.sym $@ gimp.exe : ..\config.h $(gimp_OBJECTS) gimpim.lib gimp.def gimp.res ..\libgimp\gimpi.lib - $(CC) $(CFLAGS) -Fegimp.exe $(gimp_OBJECTS) gimpim.lib ..\libgimp\gimpi.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(LDFLAGS) gimp.res gdi32.lib user32.lib shell32.lib /def:gimp.def + $(CC) $(CFLAGS) -Fegimp.exe $(gimp_OBJECTS) gimpim.lib ..\libgimp\gimpi.lib \ + .\pdb\gimppdb-$(GIMP_VER).lib .\tools\gimptools-$(GIMP_VER).lib \ + ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ + ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib ..\libgimpmath\gimpmath-$(GIMP_VER).lib \ + $(GTK_LIBS) $(GLIB_LIBS) $(INTL_LIBS) $(LDFLAGS) gimp.res gdi32.lib user32.lib shell32.lib /def:gimp.def + # General rule for building $(gimp_OBJECTS) .c.obj: @@ -273,7 +210,7 @@ gimp.exe : ..\config.h $(gimp_OBJECTS) gimpim.lib gimp.def gimp.res ..\libgimp\g .c.i : $(CC) $(CFLAGS) -E $< >$@ -clean: +clean:: del *.exe del *.lib del *.obj diff --git a/app/plug-in/gimpplugin-progress.h b/app/plug-in/gimpplugin-progress.h index 0e7f7fed40..7cb0506c81 100644 --- a/app/plug-in/gimpplugin-progress.h +++ b/app/plug-in/gimpplugin-progress.h @@ -21,7 +21,7 @@ #include "pdb/procedural_db.h" - +#include /* time_t */ #define WRITE_BUFFER_SIZE 512 diff --git a/app/plug-in/gimpplugin.h b/app/plug-in/gimpplugin.h index 0e7f7fed40..7cb0506c81 100644 --- a/app/plug-in/gimpplugin.h +++ b/app/plug-in/gimpplugin.h @@ -21,7 +21,7 @@ #include "pdb/procedural_db.h" - +#include /* time_t */ #define WRITE_BUFFER_SIZE 512 diff --git a/app/plug-in/gimppluginmanager.h b/app/plug-in/gimppluginmanager.h index 0e7f7fed40..7cb0506c81 100644 --- a/app/plug-in/gimppluginmanager.h +++ b/app/plug-in/gimppluginmanager.h @@ -21,7 +21,7 @@ #include "pdb/procedural_db.h" - +#include /* time_t */ #define WRITE_BUFFER_SIZE 512 diff --git a/app/plug-in/plug-in-def.h b/app/plug-in/plug-in-def.h index 0e7f7fed40..7cb0506c81 100644 --- a/app/plug-in/plug-in-def.h +++ b/app/plug-in/plug-in-def.h @@ -21,7 +21,7 @@ #include "pdb/procedural_db.h" - +#include /* time_t */ #define WRITE_BUFFER_SIZE 512 diff --git a/app/plug-in/plug-in-params.h b/app/plug-in/plug-in-params.h index 0e7f7fed40..7cb0506c81 100644 --- a/app/plug-in/plug-in-params.h +++ b/app/plug-in/plug-in-params.h @@ -21,7 +21,7 @@ #include "pdb/procedural_db.h" - +#include /* time_t */ #define WRITE_BUFFER_SIZE 512 diff --git a/app/plug-in/plug-in-progress.h b/app/plug-in/plug-in-progress.h index 0e7f7fed40..7cb0506c81 100644 --- a/app/plug-in/plug-in-progress.h +++ b/app/plug-in/plug-in-progress.h @@ -21,7 +21,7 @@ #include "pdb/procedural_db.h" - +#include /* time_t */ #define WRITE_BUFFER_SIZE 512 diff --git a/app/plug-in/plug-in.h b/app/plug-in/plug-in.h index 0e7f7fed40..7cb0506c81 100644 --- a/app/plug-in/plug-in.h +++ b/app/plug-in/plug-in.h @@ -21,7 +21,7 @@ #include "pdb/procedural_db.h" - +#include /* time_t */ #define WRITE_BUFFER_SIZE 512 diff --git a/app/plug-in/plug-ins.h b/app/plug-in/plug-ins.h index 0e7f7fed40..7cb0506c81 100644 --- a/app/plug-in/plug-ins.h +++ b/app/plug-in/plug-ins.h @@ -21,7 +21,7 @@ #include "pdb/procedural_db.h" - +#include /* time_t */ #define WRITE_BUFFER_SIZE 512 diff --git a/app/plug_in.h b/app/plug_in.h index 0e7f7fed40..7cb0506c81 100644 --- a/app/plug_in.h +++ b/app/plug_in.h @@ -21,7 +21,7 @@ #include "pdb/procedural_db.h" - +#include /* time_t */ #define WRITE_BUFFER_SIZE 512 diff --git a/app/tile_swap.c b/app/tile_swap.c index 43a3b09c09..08f5ad02c2 100644 --- a/app/tile_swap.c +++ b/app/tile_swap.c @@ -20,6 +20,7 @@ #include +#include /* SEEK_SET */ #include #include #include diff --git a/libgimp/gimp.def b/libgimp/gimp.def index cf055188ca..3c2da9ea81 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -389,3 +389,5 @@ EXPORTS wire_write_int8 wire_write_msg wire_write_string +gimp_bilinear +gimp_bilinear_rgba diff --git a/libgimp/gimpui.def b/libgimp/gimpui.def index 4e978deaf1..df3d88912f 100644 --- a/libgimp/gimpui.def +++ b/libgimp/gimpui.def @@ -2,88 +2,17 @@ EXPORTS gimp_brush_select_widget gimp_brush_select_widget_close_popup gimp_brush_select_widget_set_popup - gimp_chain_button_get_active - gimp_chain_button_get_type - gimp_chain_button_new - gimp_chain_button_set_active gimp_channel_menu_new - gimp_color_button_double_new - gimp_color_button_get_type - gimp_color_button_new - gimp_color_button_update - gimp_context_help - gimp_coordinates_new - gimp_dialog_create_action_area - gimp_dialog_create_action_areav - gimp_dialog_new - gimp_dialog_newv - gimp_dialog_set_icon - gimp_double_adjustment_update gimp_drawable_menu_new gimp_export_image - gimp_file_selection_get_filename - gimp_file_selection_get_type - gimp_file_selection_new - gimp_file_selection_set_filename - gimp_float_adjustment_update gimp_gradient_select_widget gimp_gradient_select_widget_close_popup gimp_gradient_select_widget_set_popup - gimp_help_connect_help_accel - gimp_help_disable_tooltips - gimp_help_enable_tooltips - gimp_help_free - gimp_help_init - gimp_help_set_help_data gimp_image_menu_new - gimp_int_adjustment_update gimp_interactive_selection_brush gimp_interactive_selection_pattern gimp_layer_menu_new - gimp_menu_item_update - gimp_option_menu_new - gimp_option_menu_new2 - gimp_option_menu_set_history - gimp_path_editor_get_path - gimp_path_editor_get_type - gimp_path_editor_new gimp_pattern_select_widget gimp_pattern_select_widget_close_popup gimp_pattern_select_widget_set_popup - gimp_pixmap_button_new - gimp_pixmap_get_type - gimp_pixmap_new - gimp_pixmap_set - gimp_query_boolean_box - gimp_query_double_box - gimp_query_int_box - gimp_query_size_box - gimp_query_string_box - 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 - gimp_size_entry_get_refval - gimp_size_entry_get_type - gimp_size_entry_get_unit - gimp_size_entry_get_value - gimp_size_entry_grab_focus - gimp_size_entry_new - gimp_size_entry_set_refval - gimp_size_entry_set_refval_boundaries - gimp_size_entry_set_refval_digits - gimp_size_entry_set_resolution - gimp_size_entry_set_size - gimp_size_entry_set_unit - gimp_size_entry_set_value - gimp_size_entry_set_value_boundaries - gimp_spin_button_new - gimp_table_attach_aligned - gimp_toggle_button_sensitive_update - gimp_toggle_button_update gimp_ui_init - gimp_uint_adjustment_update - gimp_unit_menu_update diff --git a/libgimp/makefile.msc b/libgimp/makefile.msc index 5dc4b973ca..9078dd2a62 100644 --- a/libgimp/makefile.msc +++ b/libgimp/makefile.msc @@ -1,5 +1,3 @@ -## WARNING: Outdated. - ## Makefile for building the GIMP DLLs and LIBs with Microsoft C. ## Use: nmake -f makefile.msc @@ -8,7 +6,10 @@ # only, it probably is best to keep them in the GIMP's bin directory. BIN = C:\install\gimp\bin -GIMP_VER = 1.2 +TOP = ..\.. +!INCLUDE $(TOP)\build\win32\make.msc + +GIMP_VER = 1.3 # The name of the directory in your %HOME% where the GIMP's personal settings # and stuff is saved. @@ -18,30 +19,12 @@ GIMPDIR = _gimp$(GIMP_VER) # Nothing much configurable below -!IFNDEF DEBUG -# Full optimization: -OPTIMIZE = -Ox -MD -LINKDEBUG = -!ELSE -# Debugging: -OPTIMIZE = -Zi -MDd -LINKDEBUG = /debug -!ENDIF +INCLUDES = -I.. +DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" +DEPCFLAGS = $(INTL_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) +DEPLIBS = $(GLIB_LIBS) $(INTL_LIBS) -# cl -? describes the options -CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo - -LDFLAGS = /link $(LINKDEBUG) -INSTALL = copy - -GTK_VER = 1.3 -GLIB_VER = 1.3 - -GTK = ..\..\gtk+ -GLIB = ..\..\glib -INTL = ..\..\intl - -CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\" -DG_LOG_DOMAIN=\"LibGimp\" +# CFLAGS = $(GLIB_CFLAGS) all : \ ..\config.h \ @@ -76,8 +59,10 @@ PDB_WRAPPERS_O = \ gimpimage_pdb.obj \ gimplayer_pdb.obj \ gimpmessage_pdb.obj \ + gimpmisc_pdb.obj \ gimppalette_pdb.obj \ gimpparasite_pdb.obj \ + gimppaths_pdb.obj \ gimppatterns_pdb.obj \ gimppatternselect_pdb.obj \ gimpplugin_pdb.obj \ @@ -86,14 +71,16 @@ PDB_WRAPPERS_O = \ gimptexttool_pdb.obj \ gimptools_pdb.obj \ gimpundo_pdb.obj \ - gimpunit_pdb.obj + gimpunit_pdb.obj \ +# used by libgimp and core (?) gimpi_OBJECTS = \ gimpenv.obj \ gimpparasite.obj \ gimpparasiteio.obj \ gimpprotocol.obj \ - gimputils.c \ + gimputils.obj \ +# gimpsignal.obj \ gimpwire.obj gimpi.lib : $(gimpi_OBJECTS) @@ -102,26 +89,25 @@ gimpi.lib : $(gimpi_OBJECTS) gimp_OBJECTS = \ gimp.obj \ $(PDB_WRAPPERS_O) \ + $(gimpi_OBJECTS) \ + gimpadaptivesupersample.obj \ + gimpbilinear.obj \ gimpchannel.obj \ - gimpcolorspace.obj \ gimpdrawable.obj \ - gimpenv.obj \ gimpgradientselect.obj \ gimphelp.obj \ gimpimage.obj \ gimplayer.obj \ - gimpparasite.obj \ - gimpparasiteio.obj \ gimppixelrgn.obj \ gimpproceduraldb.obj \ - gimpprotocol.obj \ gimpselection.obj \ gimptile.obj \ gimpunit.obj \ - gimpwire.obj + +#? gimpprotocol.obj \ gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def - $(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def + $(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(DEPLIBS) ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib $(LDFLAGS) user32.lib /def:gimp.def # Pass -DLIBGIMP_COMPILATION when compiling gimp.c @@ -129,16 +115,22 @@ gimp.obj : gimp.c $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c gimpui_OBJECTS = \ - gimpmenu.obj \ + gimpui.obj \ + gimpadaptivesupersample.obj \ gimpbrushmenu.obj \ - gimpexport.obj \ gimpgradientmenu.obj \ - gimppatheditor.obj \ + gimpmenu.obj \ gimppatternmenu.obj \ - gimpui.obj + gimpexport.obj \ +# gimppatheditor.obj \ gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def - $(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) gimp-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def + $(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) \ + gimp-$(GIMP_VER).lib ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ + ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ + $(GTK_LIBS) $(INTL_LIBS) $(DEPLIBS) $(LDFLAGS) /def:gimpui.def + +# gimpwidgets only for gimp_dialog_new gimpmenu.obj : gimpmenu.c $(CC) $(CFLAGS) -GD -c gimpmenu.c @@ -156,7 +148,8 @@ gimppatternmenu.obj : gimppatternmenu.c # gimp-$(GIMP_VER).dll. .c.obj: $(CC) $(CFLAGS) -c $< -clean: + +clean:: del *.exe del *.obj del *.exp diff --git a/libgimpbase/gimpdatafiles.h b/libgimpbase/gimpdatafiles.h index 6667b3622e..d581d91c72 100644 --- a/libgimpbase/gimpdatafiles.h +++ b/libgimpbase/gimpdatafiles.h @@ -22,6 +22,7 @@ #ifndef __DATAFILES_H__ #define __DATAFILES_H__ +#include typedef enum { diff --git a/libgimpcolor/gimpcolor.def b/libgimpcolor/gimpcolor.def index eda5b6634a..125e42d84d 100644 --- a/libgimpcolor/gimpcolor.def +++ b/libgimpcolor/gimpcolor.def @@ -1,10 +1,49 @@ EXPORTS - gimp_hls_to_rgb + gimp_hls_to_rgb_int + gimp_hsv_clamp + gimp_hsv_to_rgb gimp_hsv_to_rgb - gimp_hsv_to_rgb4 gimp_hsv_to_rgb_double - gimp_rgb_to_hls + gimp_hsv_to_rgb_double + gimp_hsv_to_rgb_int + gimp_hsv_to_rgb_int + gimp_hsv_to_rgb4 + gimp_hsv_to_rgb4 + gimp_hsva_set + gimp_rgb_add + gimp_rgb_clamp + gimp_rgb_clamp + gimp_rgb_composite + gimp_rgb_distance + gimp_rgb_get_uchar + gimp_rgb_get_uchar + gimp_rgb_intensity + gimp_rgb_intensity_uchar + gimp_rgb_multiply + gimp_rgb_set + gimp_rgb_set + gimp_rgb_set_alpha + gimp_rgb_set_alpha + gimp_rgb_set_uchar + gimp_rgb_set_uchar + gimp_rgb_subtract + gimp_rgb_to_hls_int + gimp_rgb_to_hsv gimp_rgb_to_hsv - gimp_rgb_to_hsv4 gimp_rgb_to_hsv_double - gimp_rgb_to_l + gimp_rgb_to_hsv_double + gimp_rgb_to_hsv_int + gimp_rgb_to_hsv_int + gimp_rgb_to_hsv4 + gimp_rgb_to_hsv4 + gimp_rgb_to_l_int + gimp_rgba_distance + gimp_rgba_distance + gimp_rgba_get_uchar + gimp_rgba_get_uchar + gimp_rgba_set + gimp_rgba_set + gimp_rgba_set_uchar + gimp_rgba_set_uchar + gimp_rgba_subtract + diff --git a/libgimpcolor/makefile.msc b/libgimpcolor/makefile.msc index e183de78dc..f51f37b852 100644 --- a/libgimpcolor/makefile.msc +++ b/libgimpcolor/makefile.msc @@ -1,5 +1,3 @@ -## WARNING: Outdated. - ## Makefile for building the GIMP DLLs and LIBs with Microsoft C. ## Use: nmake -f makefile.msc @@ -7,8 +5,10 @@ # should be in your PATH. As these DLLs are for the GIMP and its plug-ins # only, it probably is best to keep them in the GIMP's bin directory. BIN = C:\install\gimp\bin +TOP = ..\.. +!include ..\..\build\win32\make.msc -GIMP_VER = 1.2 +GIMP_VER = 1.3 # The name of the directory in your %HOME% where the GIMP's personal settings # and stuff is saved. @@ -18,173 +18,26 @@ GIMPDIR = _gimp$(GIMP_VER) # Nothing much configurable below -!IFNDEF DEBUG -# Full optimization: -OPTIMIZE = -Ox -MD -LINKDEBUG = -!ELSE -# Debugging: -OPTIMIZE = -Zi -MDd -LINKDEBUG = /debug -!ENDIF - -# cl -? describes the options -CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo - -LDFLAGS = /link $(LINKDEBUG) -INSTALL = copy - -GTK_VER = 1.3 -GLIB_VER = 1.3 - -GTK = ..\..\gtk+ -GLIB = ..\..\glib -INTL = ..\..\intl - -CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\" -DG_LOG_DOMAIN=\"LibGimp\" +INCLUDES = -I.. +# DEFINES = -DG_LOG_DOMAIN=\"LibGimpColor\" +DEPCFLAGS = $(GLIB_CFLAGS) +DEPLIBS = $(GLIB_LIBS) all : \ ..\config.h \ - gimpi.lib \ - gimp-$(GIMP_VER).dll \ - gimpui-$(GIMP_VER).dll + gimpcolor-$(GIMP_VER).dll ..\config.h : ..\config.h.win32 copy ..\config.h.win32 ..\config.h install : all - $(INSTALL) gimp-$(GIMP_VER).dll $(BIN) - $(INSTALL) gimpui-$(GIMP_VER).dll $(BIN) + $(INSTALL) gimpcolor-$(GIMP_VER).dll $(BIN) -PDB_WRAPPERS_O = \ - gimpbrushes_pdb.obj \ - gimpbrushselect_pdb.obj \ - gimpchannel_pdb.obj \ - gimpchannelops_pdb.obj \ - gimpcolor_pdb.obj \ - gimpconvert_pdb.obj \ - gimpdisplay_pdb.obj \ - gimpdrawable_pdb.obj \ - gimpedit_pdb.obj \ - gimpfileops_pdb.obj \ - gimpfloatingsel_pdb.obj \ - gimpgimprc_pdb.obj \ - gimpgradients_pdb.obj \ - gimpgradientselect_pdb.obj \ - gimpguides_pdb.obj \ - gimphelp_pdb.obj \ - gimpimage_pdb.obj \ - gimplayer_pdb.obj \ - gimpmessage_pdb.obj \ - gimppalette_pdb.obj \ - gimpparasite_pdb.obj \ - gimppatterns_pdb.obj \ - gimppatternselect_pdb.obj \ - gimpplugin_pdb.obj \ - gimpproceduraldb_pdb.obj \ - gimpselection_pdb.obj \ - gimptexttool_pdb.obj \ - gimptools_pdb.obj \ - gimpundo_pdb.obj \ - gimpunit_pdb.obj +OBJECTS = \ + gimpcolorspace.obj \ + gimphsv.obj \ + gimprgb.obj -gimpi_OBJECTS = \ - gimpenv.obj \ - gimpchainbutton.obj \ - gimpcolorbutton.obj \ - gimpcolorspace.obj \ - gimpdialog.obj \ - gimpfileselection.obj \ - gimphelpui.obj \ - gimpmatrix.obj \ - gimpparasite.obj \ - gimpparasiteio.obj \ - gimppatheditor.obj \ - gimppixmap.obj \ - gimpprotocol.obj \ - gimpquerybox.obj \ - gimpsizeentry.obj \ - gimpunitmenu.obj \ - gimputils.c \ - gimpvector.obj \ - gimpwidgets.obj \ - gimpwire.obj +gimpcolor-$(GIMP_VER).dll : $(OBJECTS) gimpcolor.def + $(CC) $(CFLAGS) -LD -Fegimpcolor-$(GIMP_VER).dll $(OBJECTS) $(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpcolor.def -gimpi.lib : $(gimpi_OBJECTS) - lib /out:gimpi.lib $(gimpi_OBJECTS) - -gimp_OBJECTS = \ - gimp.obj \ - $(PDB_WRAPPERS_O) \ - gimpchannel.obj \ - gimpcolorspace.obj \ - gimpdrawable.obj \ - gimpenv.obj \ - gimpgradientselect.obj \ - gimphelp.obj \ - gimpimage.obj \ - gimplayer.obj \ - gimpmatrix.obj \ - gimpparasite.obj \ - gimpparasiteio.obj \ - gimppixelrgn.obj \ - gimpproceduraldb.obj \ - gimpprotocol.obj \ - gimpselection.obj \ - gimptile.obj \ - gimpunit.obj \ - gimpvector.obj \ - gimpwire.obj - -gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def - $(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def - -# Pass -DLIBGIMP_COMPILATION when compiling gimp.c - -gimp.obj : gimp.c - $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c - -gimpui_OBJECTS = \ - gimpmenu.obj \ - gimpbrushmenu.obj \ - gimpchainbutton.obj \ - gimpcolorbutton.obj \ - gimpdialog.obj \ - gimpexport.obj \ - gimpfileselection.obj \ - gimphelpui.obj \ - gimpgradientmenu.obj \ - gimppatheditor.obj \ - gimppatternmenu.obj \ - gimppixmap.obj \ - gimpquerybox.obj \ - gimpsizeentry.obj \ - gimpui.obj \ - gimpunitmenu.obj \ - gimpwidgets.obj - -gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def - $(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) gimp-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def - -gimpmenu.obj : gimpmenu.c - $(CC) $(CFLAGS) -GD -c gimpmenu.c - -gimpbrushmenu.obj : gimpbrushmenu.c - $(CC) $(CFLAGS) -GD -c gimpbrushmenu.c - -gimpgradientmenu.obj : gimpgradientmenu.c - $(CC) $(CFLAGS) -GD -c gimpgradientmenu.c - -gimppatternmenu.obj : gimppatternmenu.c - $(CC) $(CFLAGS) -GD -c gimppatternmenu.c - -# General rule for compiling, used by the objects that don't go into -# gimp-$(GIMP_VER).dll. -.c.obj: - $(CC) $(CFLAGS) -c $< -clean: - del *.exe - del *.obj - del *.exp - del *.err - del *.map diff --git a/libgimpmath/gimpmath.def b/libgimpmath/gimpmath.def index 71f3986676..1ad57111a8 100644 --- a/libgimpmath/gimpmath.def +++ b/libgimpmath/gimpmath.def @@ -14,25 +14,42 @@ EXPORTS gimp_matrix3_xshear gimp_matrix3_yshear gimp_matrix4_to_deg + gimp_vector_2d_to_3d + gimp_vector_2d_to_3d + gimp_vector_3d_to_2d + gimp_vector_3d_to_2d + gimp_vector2_add gimp_vector2_add gimp_vector2_cross_product gimp_vector2_inner_product + gimp_vector2_inner_product + gimp_vector2_length gimp_vector2_length gimp_vector2_mul gimp_vector2_neg gimp_vector2_normalize gimp_vector2_rotate gimp_vector2_set + gimp_vector2_set + gimp_vector2_sub gimp_vector2_sub gimp_vector3_add + gimp_vector3_add + gimp_vector3_cross_product gimp_vector3_cross_product gimp_vector3_inner_product + gimp_vector3_inner_product gimp_vector3_length + gimp_vector3_length + gimp_vector3_mul gimp_vector3_mul gimp_vector3_neg gimp_vector3_normalize + gimp_vector3_normalize + gimp_vector3_rotate gimp_vector3_rotate gimp_vector3_set + gimp_vector3_set gimp_vector3_sub - gimp_vector_2d_to_3d - gimp_vector_3d_to_2d + gimp_vector3_sub + diff --git a/libgimpmath/makefile.msc b/libgimpmath/makefile.msc index e183de78dc..e8b1daef78 100644 --- a/libgimpmath/makefile.msc +++ b/libgimpmath/makefile.msc @@ -1,5 +1,3 @@ -## WARNING: Outdated. - ## Makefile for building the GIMP DLLs and LIBs with Microsoft C. ## Use: nmake -f makefile.msc @@ -7,8 +5,10 @@ # should be in your PATH. As these DLLs are for the GIMP and its plug-ins # only, it probably is best to keep them in the GIMP's bin directory. BIN = C:\install\gimp\bin +TOP = ..\.. +!include ..\..\build\win32\make.msc -GIMP_VER = 1.2 +GIMP_VER = 1.3 # The name of the directory in your %HOME% where the GIMP's personal settings # and stuff is saved. @@ -18,173 +18,25 @@ GIMPDIR = _gimp$(GIMP_VER) # Nothing much configurable below -!IFNDEF DEBUG -# Full optimization: -OPTIMIZE = -Ox -MD -LINKDEBUG = -!ELSE -# Debugging: -OPTIMIZE = -Zi -MDd -LINKDEBUG = /debug -!ENDIF - -# cl -? describes the options -CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo - -LDFLAGS = /link $(LINKDEBUG) -INSTALL = copy - -GTK_VER = 1.3 -GLIB_VER = 1.3 - -GTK = ..\..\gtk+ -GLIB = ..\..\glib -INTL = ..\..\intl - -CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\" -DG_LOG_DOMAIN=\"LibGimp\" +INCLUDES = -I.. +# DEFINES = -DG_LOG_DOMAIN=\"LibGimpMath\" +DEPCFLAGS = $(GLIB_CFLAGS) +DEPLIBS = $(GLIB_LIBS) all : \ ..\config.h \ - gimpi.lib \ - gimp-$(GIMP_VER).dll \ - gimpui-$(GIMP_VER).dll + gimpmath-$(GIMP_VER).dll ..\config.h : ..\config.h.win32 copy ..\config.h.win32 ..\config.h install : all - $(INSTALL) gimp-$(GIMP_VER).dll $(BIN) - $(INSTALL) gimpui-$(GIMP_VER).dll $(BIN) + $(INSTALL) gimpmath-$(GIMP_VER).dll $(BIN) -PDB_WRAPPERS_O = \ - gimpbrushes_pdb.obj \ - gimpbrushselect_pdb.obj \ - gimpchannel_pdb.obj \ - gimpchannelops_pdb.obj \ - gimpcolor_pdb.obj \ - gimpconvert_pdb.obj \ - gimpdisplay_pdb.obj \ - gimpdrawable_pdb.obj \ - gimpedit_pdb.obj \ - gimpfileops_pdb.obj \ - gimpfloatingsel_pdb.obj \ - gimpgimprc_pdb.obj \ - gimpgradients_pdb.obj \ - gimpgradientselect_pdb.obj \ - gimpguides_pdb.obj \ - gimphelp_pdb.obj \ - gimpimage_pdb.obj \ - gimplayer_pdb.obj \ - gimpmessage_pdb.obj \ - gimppalette_pdb.obj \ - gimpparasite_pdb.obj \ - gimppatterns_pdb.obj \ - gimppatternselect_pdb.obj \ - gimpplugin_pdb.obj \ - gimpproceduraldb_pdb.obj \ - gimpselection_pdb.obj \ - gimptexttool_pdb.obj \ - gimptools_pdb.obj \ - gimpundo_pdb.obj \ - gimpunit_pdb.obj +OBJECTS = \ + gimpmatrix.obj \ + gimpvector.obj \ -gimpi_OBJECTS = \ - gimpenv.obj \ - gimpchainbutton.obj \ - gimpcolorbutton.obj \ - gimpcolorspace.obj \ - gimpdialog.obj \ - gimpfileselection.obj \ - gimphelpui.obj \ - gimpmatrix.obj \ - gimpparasite.obj \ - gimpparasiteio.obj \ - gimppatheditor.obj \ - gimppixmap.obj \ - gimpprotocol.obj \ - gimpquerybox.obj \ - gimpsizeentry.obj \ - gimpunitmenu.obj \ - gimputils.c \ - gimpvector.obj \ - gimpwidgets.obj \ - gimpwire.obj +gimpmath-$(GIMP_VER).dll : $(OBJECTS) gimpmath.def + $(CC) $(CFLAGS) -LD -Fegimpmath-$(GIMP_VER).dll $(OBJECTS) $(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpmath.def -gimpi.lib : $(gimpi_OBJECTS) - lib /out:gimpi.lib $(gimpi_OBJECTS) - -gimp_OBJECTS = \ - gimp.obj \ - $(PDB_WRAPPERS_O) \ - gimpchannel.obj \ - gimpcolorspace.obj \ - gimpdrawable.obj \ - gimpenv.obj \ - gimpgradientselect.obj \ - gimphelp.obj \ - gimpimage.obj \ - gimplayer.obj \ - gimpmatrix.obj \ - gimpparasite.obj \ - gimpparasiteio.obj \ - gimppixelrgn.obj \ - gimpproceduraldb.obj \ - gimpprotocol.obj \ - gimpselection.obj \ - gimptile.obj \ - gimpunit.obj \ - gimpvector.obj \ - gimpwire.obj - -gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def - $(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def - -# Pass -DLIBGIMP_COMPILATION when compiling gimp.c - -gimp.obj : gimp.c - $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c - -gimpui_OBJECTS = \ - gimpmenu.obj \ - gimpbrushmenu.obj \ - gimpchainbutton.obj \ - gimpcolorbutton.obj \ - gimpdialog.obj \ - gimpexport.obj \ - gimpfileselection.obj \ - gimphelpui.obj \ - gimpgradientmenu.obj \ - gimppatheditor.obj \ - gimppatternmenu.obj \ - gimppixmap.obj \ - gimpquerybox.obj \ - gimpsizeentry.obj \ - gimpui.obj \ - gimpunitmenu.obj \ - gimpwidgets.obj - -gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def - $(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) gimp-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def - -gimpmenu.obj : gimpmenu.c - $(CC) $(CFLAGS) -GD -c gimpmenu.c - -gimpbrushmenu.obj : gimpbrushmenu.c - $(CC) $(CFLAGS) -GD -c gimpbrushmenu.c - -gimpgradientmenu.obj : gimpgradientmenu.c - $(CC) $(CFLAGS) -GD -c gimpgradientmenu.c - -gimppatternmenu.obj : gimppatternmenu.c - $(CC) $(CFLAGS) -GD -c gimppatternmenu.c - -# General rule for compiling, used by the objects that don't go into -# gimp-$(GIMP_VER).dll. -.c.obj: - $(CC) $(CFLAGS) -c $< -clean: - del *.exe - del *.obj - del *.exp - del *.err - del *.map diff --git a/libgimpwidgets/gimpwidgets.def b/libgimpwidgets/gimpwidgets.def index eda5b6634a..a785703682 100644 --- a/libgimpwidgets/gimpwidgets.def +++ b/libgimpwidgets/gimpwidgets.def @@ -1,10 +1,89 @@ EXPORTS - gimp_hls_to_rgb - gimp_hsv_to_rgb - gimp_hsv_to_rgb4 - gimp_hsv_to_rgb_double - gimp_rgb_to_hls - gimp_rgb_to_hsv - gimp_rgb_to_hsv4 - gimp_rgb_to_hsv_double - gimp_rgb_to_l + gimp_chain_button_get_active + gimp_chain_button_get_type + gimp_chain_button_new + gimp_chain_button_set_active + gimp_color_area_get_color + gimp_color_area_get_color + gimp_color_area_get_type + gimp_color_area_get_type + gimp_color_area_new + gimp_color_area_new + gimp_color_area_set_color + gimp_color_area_set_color + gimp_color_button_get_color + gimp_color_button_get_color + gimp_color_button_get_type + gimp_color_button_get_type + gimp_color_button_has_alpha + gimp_color_button_new + gimp_color_button_set_color + gimp_color_button_set_color + gimp_color_button_set_type + gimp_context_help + gimp_coordinates_new + gimp_dialog_create_action_area + gimp_dialog_create_action_areav + gimp_dialog_new + gimp_dialog_newv + gimp_dialog_set_icon + gimp_double_adjustment_update + gimp_file_selection_get_filename + gimp_file_selection_get_type + gimp_file_selection_new + gimp_file_selection_set_filename + gimp_float_adjustment_update + gimp_help_connect_help_accel + gimp_help_disable_tooltips + gimp_help_enable_tooltips + gimp_help_free + gimp_help_init + gimp_help_set_help_data + gimp_int_adjustment_update + gimp_mem_size_entry_new + gimp_menu_item_update + gimp_option_menu_new + gimp_option_menu_new2 + gimp_option_menu_set_history + gimp_path_editor_get_path + gimp_path_editor_get_type + gimp_path_editor_new + gimp_pixmap_button_new + gimp_pixmap_get_type + gimp_pixmap_new + gimp_pixmap_set + gimp_query_boolean_box + gimp_query_double_box + gimp_query_int_box + gimp_query_size_box + gimp_query_string_box + 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 + gimp_size_entry_get_refval + gimp_size_entry_get_type + gimp_size_entry_get_unit + gimp_size_entry_get_value + gimp_size_entry_grab_focus + gimp_size_entry_new + gimp_size_entry_set_refval + gimp_size_entry_set_refval_boundaries + gimp_size_entry_set_refval_digits + gimp_size_entry_set_resolution + gimp_size_entry_set_size + gimp_size_entry_set_unit + gimp_size_entry_set_value + gimp_size_entry_set_value_boundaries + gimp_spin_button_new + gimp_table_attach_aligned + gimp_toggle_button_sensitive_update + gimp_toggle_button_update + gimp_uint_adjustment_update + gimp_unit_menu_get_type + gimp_unit_menu_new + gimp_unit_menu_set_unit + gimp_unit_menu_update diff --git a/libgimpwidgets/libgimp-glue.c b/libgimpwidgets/libgimp-glue.c new file mode 100644 index 0000000000..5282ecd3d9 --- /dev/null +++ b/libgimpwidgets/libgimp-glue.c @@ -0,0 +1,235 @@ +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * libgimp-glue.c + * Copyright (C) 2001 Hans Breuer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Supports dynamic linking at run-time against + * libgimp (if used by a plug-in, or gimp.exe + * if used by itself) + * + +gimp_palette_get_background +gimp_palette_get_foreground +gimp_standard_help_func +gimp_unit_get_abbreviation +gimp_unit_get_digits +gimp_unit_get_factor +gimp_unit_get_number_of_built_in_units +gimp_unit_get_number_of_units +gimp_unit_get_plural +gimp_unit_get_singular +gimp_unit_get_symbol + + */ + +#include +#include + +#include "libgimp/gimppalette_pdb.h" +#include "libgimp/gimpunit.h" + +/* + too much depencencies +#include "gimphelpui.h" +*/ + +#include + +/* function pointer prototypes */ +typedef gboolean (* PFN_QueryColor) (GimpRGB *color); +typedef gchar* (* PFN_GetUnitStr) (GimpUnit); +typedef gdouble (* PFN_GetUnitInt) (GimpUnit); +typedef gdouble (* PFN_GetUnitDouble) (GimpUnit); +typedef gint (* PFN_GetNumber) (void); +typedef void (* PFN_Help) (const char*); + +static FARPROC +dynamic_resolve (const gchar* name, HMODULE* hMod) +{ + FARPROC fn = NULL; + *hMod = NULL; /* if != NULL, call FreeLibrary */ + + /* from application ? */ + fn = GetProcAddress(GetModuleHandle(NULL), name); + + if (!fn) + { + *hMod = LoadLibrary ("gimp-1.3.dll"); + fn = GetProcAddress (*hMod, name); + } + + if (!fn) + g_warning ("dynamic_resolve of %s failed!", name); + + return fn; +} + +gboolean +gimp_palette_get_foreground (GimpRGB *color) +{ + HMODULE h = NULL; + gboolean ret = FALSE; + PFN_QueryColor fn = (PFN_QueryColor) dynamic_resolve ("gimp_palette_get_foreground", &h); + if (fn) + ret = fn (color); + + if (h) + FreeLibrary (h); + return ret; +} + +gboolean +gimp_palette_get_background (GimpRGB *color) +{ + HMODULE h = NULL; + gboolean ret = FALSE; + PFN_QueryColor fn = (PFN_QueryColor) dynamic_resolve ("gimp_palette_get_background", &h); + if (fn) + ret = fn (color); + + if (h) + FreeLibrary (h); + return ret; +} + +void +gimp_standard_help_func (const gchar *help_data) +{ + HMODULE h = NULL; + PFN_Help fn = (PFN_Help) dynamic_resolve ("gimp_standard_help_func", &h); + if (fn) + fn (help_data); + + if (h) + FreeLibrary (h); +} + +gchar * +gimp_unit_get_abbreviation (GimpUnit unit) +{ + HMODULE h = NULL; + gchar* ret = NULL; + PFN_GetUnitStr fn = (PFN_GetUnitStr) dynamic_resolve ("gimp_unit_get_abbreviation", &h); + if (fn) + ret = fn (unit); + + if (h) + FreeLibrary (h); + return ret; +} + +gchar * +gimp_unit_get_singular (GimpUnit unit) +{ + HMODULE h = NULL; + gchar* ret = NULL; + PFN_GetUnitStr fn = (PFN_GetUnitStr) dynamic_resolve ("gimp_unit_get_singular", &h); + if (fn) + ret = fn (unit); + + if (h) + FreeLibrary (h); + return ret; +} + +gchar * +gimp_unit_get_plural (GimpUnit unit) +{ + HMODULE h = NULL; + gchar* ret = NULL; + PFN_GetUnitStr fn = (PFN_GetUnitStr) dynamic_resolve ("gimp_unit_get_plural", &h); + if (fn) + ret = fn (unit); + + if (h) + FreeLibrary (h); + return ret; +} + +gint +gimp_unit_get_digits (GimpUnit unit) +{ + HMODULE h = NULL; + gint ret = 0; + PFN_GetUnitInt fn = (PFN_GetUnitInt) dynamic_resolve ("gimp_unit_get_digits", &h); + if (fn) + ret = fn (unit); + + if (h) + FreeLibrary (h); + return ret; +} + +gdouble +gimp_unit_get_factor (GimpUnit unit) +{ + HMODULE h = NULL; + gdouble ret = 0.0; + PFN_GetUnitDouble fn = (PFN_GetUnitDouble) dynamic_resolve ("gimp_unit_get_factor", &h); + if (fn) + ret = fn (unit); + + if (h) + FreeLibrary (h); + return ret; +} + +gint +gimp_unit_get_number_of_built_in_units (void) +{ + HMODULE h = NULL; + gint ret = 0; + PFN_GetNumber fn = (PFN_GetNumber) dynamic_resolve ("gimp_unit_get_number_of_built_in_units", &h); + if (fn) + ret = fn (); + + if (h) + FreeLibrary (h); + return ret; +} + +gint +gimp_unit_get_number_of_units (void) +{ + HMODULE h = NULL; + gint ret = 0; + PFN_GetNumber fn = (PFN_GetNumber) dynamic_resolve ("gimp_unit_get_number_of_units", &h); + if (fn) + ret = fn (); + + if (h) + FreeLibrary (h); + return ret; +} + +gchar * +gimp_unit_get_symbol (GimpUnit unit) +{ + HMODULE h = NULL; + gchar* ret = NULL; + PFN_GetUnitStr fn = (PFN_GetUnitStr) dynamic_resolve ("gimp_unit_get_symbol", &h); + if (fn) + ret = fn (unit); + + if (h) + FreeLibrary (h); + return ret; +} diff --git a/libgimpwidgets/makefile.msc b/libgimpwidgets/makefile.msc index e183de78dc..d1d80a8bb0 100644 --- a/libgimpwidgets/makefile.msc +++ b/libgimpwidgets/makefile.msc @@ -1,5 +1,3 @@ -## WARNING: Outdated. - ## Makefile for building the GIMP DLLs and LIBs with Microsoft C. ## Use: nmake -f makefile.msc @@ -7,8 +5,10 @@ # should be in your PATH. As these DLLs are for the GIMP and its plug-ins # only, it probably is best to keep them in the GIMP's bin directory. BIN = C:\install\gimp\bin +TOP = ..\.. +!include ..\..\build\win32\make.msc -GIMP_VER = 1.2 +GIMP_VER = 1.3 # The name of the directory in your %HOME% where the GIMP's personal settings # and stuff is saved. @@ -18,173 +18,44 @@ GIMPDIR = _gimp$(GIMP_VER) # Nothing much configurable below -!IFNDEF DEBUG -# Full optimization: -OPTIMIZE = -Ox -MD -LINKDEBUG = -!ELSE -# Debugging: -OPTIMIZE = -Zi -MDd -LINKDEBUG = /debug -!ENDIF - -# cl -? describes the options -CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo - -LDFLAGS = /link $(LINKDEBUG) -INSTALL = copy - -GTK_VER = 1.3 -GLIB_VER = 1.3 - -GTK = ..\..\gtk+ -GLIB = ..\..\glib -INTL = ..\..\intl - -CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\" -DG_LOG_DOMAIN=\"LibGimp\" +INCLUDES = -I.. +# DEFINES = -DG_LOG_DOMAIN=\"LibGimpWidgets\" +DEPCFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS) +DEPLIBS = $(GLIB_LIBS) $(GTK_LIBS) $(INTL_LIBS) all : \ ..\config.h \ - gimpi.lib \ - gimp-$(GIMP_VER).dll \ - gimpui-$(GIMP_VER).dll + gimpwidgets-$(GIMP_VER).dll ..\config.h : ..\config.h.win32 copy ..\config.h.win32 ..\config.h install : all - $(INSTALL) gimp-$(GIMP_VER).dll $(BIN) - $(INSTALL) gimpui-$(GIMP_VER).dll $(BIN) + $(INSTALL) gimpmath-$(GIMP_VER).dll $(BIN) -PDB_WRAPPERS_O = \ - gimpbrushes_pdb.obj \ - gimpbrushselect_pdb.obj \ - gimpchannel_pdb.obj \ - gimpchannelops_pdb.obj \ - gimpcolor_pdb.obj \ - gimpconvert_pdb.obj \ - gimpdisplay_pdb.obj \ - gimpdrawable_pdb.obj \ - gimpedit_pdb.obj \ - gimpfileops_pdb.obj \ - gimpfloatingsel_pdb.obj \ - gimpgimprc_pdb.obj \ - gimpgradients_pdb.obj \ - gimpgradientselect_pdb.obj \ - gimpguides_pdb.obj \ - gimphelp_pdb.obj \ - gimpimage_pdb.obj \ - gimplayer_pdb.obj \ - gimpmessage_pdb.obj \ - gimppalette_pdb.obj \ - gimpparasite_pdb.obj \ - gimppatterns_pdb.obj \ - gimppatternselect_pdb.obj \ - gimpplugin_pdb.obj \ - gimpproceduraldb_pdb.obj \ - gimpselection_pdb.obj \ - gimptexttool_pdb.obj \ - gimptools_pdb.obj \ - gimpundo_pdb.obj \ - gimpunit_pdb.obj - -gimpi_OBJECTS = \ - gimpenv.obj \ +OBJECTS = \ gimpchainbutton.obj \ - gimpcolorbutton.obj \ - gimpcolorspace.obj \ + gimpcolorarea.obj \ gimpdialog.obj \ gimpfileselection.obj \ - gimphelpui.obj \ - gimpmatrix.obj \ - gimpparasite.obj \ - gimpparasiteio.obj \ gimppatheditor.obj \ gimppixmap.obj \ - gimpprotocol.obj \ gimpquerybox.obj \ - gimpsizeentry.obj \ - gimpunitmenu.obj \ - gimputils.c \ - gimpvector.obj \ gimpwidgets.obj \ - gimpwire.obj - -gimpi.lib : $(gimpi_OBJECTS) - lib /out:gimpi.lib $(gimpi_OBJECTS) - -gimp_OBJECTS = \ - gimp.obj \ - $(PDB_WRAPPERS_O) \ - gimpchannel.obj \ - gimpcolorspace.obj \ - gimpdrawable.obj \ - gimpenv.obj \ - gimpgradientselect.obj \ - gimphelp.obj \ - gimpimage.obj \ - gimplayer.obj \ - gimpmatrix.obj \ - gimpparasite.obj \ - gimpparasiteio.obj \ - gimppixelrgn.obj \ - gimpproceduraldb.obj \ - gimpprotocol.obj \ - gimpselection.obj \ - gimptile.obj \ - gimpunit.obj \ - gimpvector.obj \ - gimpwire.obj - -gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def - $(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def - -# Pass -DLIBGIMP_COMPILATION when compiling gimp.c - -gimp.obj : gimp.c - $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c - -gimpui_OBJECTS = \ - gimpmenu.obj \ - gimpbrushmenu.obj \ - gimpchainbutton.obj \ gimpcolorbutton.obj \ - gimpdialog.obj \ - gimpexport.obj \ - gimpfileselection.obj \ gimphelpui.obj \ - gimpgradientmenu.obj \ - gimppatheditor.obj \ - gimppatternmenu.obj \ - gimppixmap.obj \ - gimpquerybox.obj \ gimpsizeentry.obj \ - gimpui.obj \ gimpunitmenu.obj \ - gimpwidgets.obj + libgimp-glue.obj -gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def - $(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) gimp-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def +# questionable dependency between libgimpui/libgimpwidgets +gimpunit.obj : ..\app\gimpunit.c + $(CC) $(CFLAGS) -GD -c ..\app\gimpunit.c -gimpmenu.obj : gimpmenu.c - $(CC) $(CFLAGS) -GD -c gimpmenu.c +gimpwidgets-$(GIMP_VER).dll : $(OBJECTS) gimpwidgets.def + $(CC) $(CFLAGS) -LD -Fegimpwidgets-$(GIMP_VER).dll $(OBJECTS) \ + ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ + $(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpwidgets.def -gimpbrushmenu.obj : gimpbrushmenu.c - $(CC) $(CFLAGS) -GD -c gimpbrushmenu.c - -gimpgradientmenu.obj : gimpgradientmenu.c - $(CC) $(CFLAGS) -GD -c gimpgradientmenu.c - -gimppatternmenu.obj : gimppatternmenu.c - $(CC) $(CFLAGS) -GD -c gimppatternmenu.c - -# General rule for compiling, used by the objects that don't go into -# gimp-$(GIMP_VER).dll. -.c.obj: - $(CC) $(CFLAGS) -c $< -clean: - del *.exe - del *.obj - del *.exp - del *.err - del *.map +# ..\app\gimp.lib \ +# ..\libgimp\gimpui-$(GIMP_VER).lib ..\libgimp\gimp-$(GIMP_VER).lib \ diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc index d550639dc3..751c214688 100644 --- a/plug-ins/makefile.msc +++ b/plug-ins/makefile.msc @@ -1,5 +1,3 @@ -## WARNING: Outdated. - # Makefile to build the GIMP plug-ins with Microsoft nmake and compiler # I don't want to use many hand-written makefiles, so this is quite complex. @@ -15,6 +13,13 @@ GIMP = C:\install\gimp BIN = $(GIMP)\plug-ins +!IFNDEF GIMPTOP +GIMPTOP = .. +!ENDIF + +TOP = ..\$(GIMPTOP) +!INCLUDE $(TOP)\build\win32\make.msc + !IFNDEF LIBRARY !IFNDEF PLUGIN !IFNDEF MODULE @@ -26,14 +31,18 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below # List plug-ins. We must use several lists to work around nmake's limits # The COMMON* ones are in the common subdirectory -COMMON1 = CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard colorify compose convmatrix csource cubism curve_bend +COMMON1 = AlienMap AlienMap2 CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard colorify compose convmatrix csource cubism curve_bend COMMON2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace -COMMON3 = gauss_iir gauss_rle gbr gee gicon gif gifload glasstile gpb gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic +COMMON3 = gauss_iir gauss_rle gbr gee gicon gif gifload glasstile gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd randomize ripple rotate -COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift smooth_palette snoise sobel sparkle spheredesigner spread sunras tga threshold_alpha tiff tile tileit tiler unsharp video vinvert vpropagate waves whirlpinch winclipboard wind winprint wmf xbm xwd zealouscrop +COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spheredesigner spread struc sunras tga threshold_alpha tiff tile tileit tiler unsharp video vinvert vpropagate +COMMON6 = waves whirlpinch winclipboard wind winprint wmf xbm xwd zealouscrop + +# not any longer supported ? +DROPPED = gpb # These have own subdirectories each -SEPARATE = AlienMap AlienMap2 FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gdyntext gfig gflare gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi sinus struc twain webbrowser winsnap +SEPARATE = FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp gdyntext gfig gflare gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi twain webbrowser winsnap # These are unofficial, ie not in the CVS. To build these, you should # get tml's source snapshot and copy this makefile to the @@ -54,7 +63,7 @@ install : libs-install common-plugins-install separate-plugins-install data-inst unofficial: for %d in ($(UNOFFICIAL)) do nmake -nologo -f makefile.msc sub-one-separate DIR=%d TARGET=install -clean : libs-clean common-plugins-clean separate-plugins-clean +clean :: libs-clean common-plugins-clean separate-plugins-clean libs-all : @nmake -nologo -f makefile.msc sub-libs TARGET=all @@ -67,7 +76,7 @@ libs-clean : sub-libs: cd libgck\gck - nmake -nologo -f ..\..\makefile.msc TOP=..\..\.. LIBRARY=gck OBJECTS="gckcolor.obj" $(TARGET) + nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. LIBRARY=gck OBJECTS="gckcolor.obj" $(TARGET) cd ..\.. @@ -89,10 +98,11 @@ sub-common-plugins : for %d in ($(COMMON3)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET) for %d in ($(COMMON4)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET) for %d in ($(COMMON5)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET) + for %d in ($(COMMON6)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET) sub-one-common : @cd common - @nmake -nologo -f ..\makefile.msc TOP=..\.. PLUGIN=$(DIR) EXTRA_$(DIR)=1 $(TARGET) + @nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=$(DIR) EXTRA_$(DIR)=1 $(TARGET) @@ -111,20 +121,20 @@ sub-separate-plugins : for %d in ($(SEPARATE)) do nmake -nologo -f makefile.msc sub-one-separate DIR=%d TARGET=$(TARGET) # We must handle script-fu separately because of the dash, sigh @cd script-fu - @nmake -nologo -f ..\makefile.msc TOP=..\.. PLUGIN=script-fu EXTRA_script_fu=1 $(TARGET) + @nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=script-fu EXTRA_script_fu=1 $(TARGET) @cd .. # Also GAP is special @cd gap - @nmake -nologo -f ..\makefile.msc TOP=..\.. PLUGIN=gap_filter EXTRA_gap_filter=1 $(TARGET) + @nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=gap_filter EXTRA_gap_filter=1 $(TARGET) @cd .. @cd gap - @nmake -nologo -f ..\makefile.msc TOP=..\.. PLUGIN=gap_plugins EXTRA_gap_plugins=1 $(TARGET) + @nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=gap_plugins EXTRA_gap_plugins=1 $(TARGET) @cd .. sub-one-separate : cd $(DIR) - nmake -nologo -f ..\makefile.msc TOP=..\.. PLUGIN=$(DIR) EXTRA_$(DIR)=1 $(TARGET) + nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=$(DIR) EXTRA_$(DIR)=1 $(TARGET) data-install : gimpressionist-data-install guash-data-install @@ -176,6 +186,8 @@ OBJECTS = \ lighting_preview.obj \ lighting_shade.obj \ lighting_ui.obj +EXTRACFLAGS = -I$(PLUGINDIR)\libgck +EXTRALIBS = $(PLUGINDIR)\libgck\gck\gck.lib !ENDIF !IFDEF EXTRA_MapObject @@ -187,6 +199,8 @@ OBJECTS = \ mapobject_preview.obj \ mapobject_shade.obj \ mapobject_ui.obj +EXTRACFLAGS = -I$(PLUGINDIR)\libgck +EXTRALIBS = $(PLUGINDIR)\libgck\gck\gck.lib OPTIMIZE = !ENDIF @@ -273,7 +287,8 @@ OBJECTS = \ font_selection.obj \ gdyntext.obj \ gdyntext_ui.obj \ - message_window.obj + message_window.obj \ + gdyntextcompat.obj !ENDIF !IFDEF EXTRA_gflare @@ -425,7 +440,7 @@ OBJECTS = \ script-fu-console.obj \ script-fu-constants.obj \ script-fu-scripts.obj \ - regex.obj \ + regexrepl.obj \ ..\dbbrowser\dbbrowser_utils.obj EXTRACFLAGS = -DREGEX_MALLOC HAVE_RESOURCE = YES @@ -545,26 +560,9 @@ HAVE_RESOURCE = YES EXTRALIBS = user32.lib gdi32.lib !endif -GIMP_VER = 1.2 -GTK_VER = 1.3 -GLIB_VER = 1.3 +GIMP_VER = 1.3 -GTK = $(TOP)\..\gtk+ -GLIB = $(TOP)\..\glib -INTL = $(TOP)\..\intl - -# Location of libpng sources -PNG = $(TOP)\..\libpng-1.0.3 -# Location of tiff-3.4 sources -TIFF = $(TOP)\..\tiff-v3.4\libtiff -# Location of jpeg-6b sources -JPEG = $(TOP)\..\jpeg-6b -# and zlib -ZLIB = $(TOP)\..\zlib-1.1.3 -# and libmpeg -MPEG = $(TOP)\..\mpeg_lib-1.3.0 - -PLUGINDIR = $(TOP)\plug-ins +PLUGINDIR = $(GIMPTOP)\plug-ins !IFNDEF OPTIMIZE !IFNDEF DEBUG @@ -584,9 +582,9 @@ RTL = -MDd CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200 -CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(TOP) -I$(PLUGINDIR) -I$(PLUGINDIR)\libgck -I$(GLIB) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL) +CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(GIMPTOP) -I$(PLUGINDIR) $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(INTL) -LDFLAGS = /link /subsystem:windows /machine:ix86 $(LINKDEBUG) +LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG) !IFDEF PLUGIN @@ -611,7 +609,11 @@ RESOURCE = ..\..\app\gimp.res !ENDIF $(PLUGIN).exe : $(OBJECTS) $(RESOURCE) - $(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) + $(CC) $(CFLAGS) -Fe$(PLUGIN).exe $(OBJECTS) $(RESOURCE) \ + ..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib \ + ..\..\libgimpcolor\gimpcolor-$(GIMP_VER).lib ..\..\libgimpmath\gimpmath-$(GIMP_VER).lib \ + ..\..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ + $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) $(EXTRALIBS) $(LDFLAGS) $(PLUGIN).res : $(PLUGIN).rc rc -r -fo $(PLUGIN).res $(PLUGIN).rc @@ -653,13 +655,15 @@ OBJECTS = $(MODULE).obj !ENDIF $(MODULE).$(MODULE_EXT) : $(OBJECTS) $(MODULE).def - $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(LDFLAGS) $(EXTRALIBS) ..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:$(MODULE).def + $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(LDFLAGS) $(EXTRALIBS) \ + ..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib \ + $(GTK_LIBS) $(GLIB_LIBS) /def:$(MODULE).def !ENDIF .c.obj : $(CC) $(CFLAGS) -c $< -clean : +clean :: erase *.obj erase *.lib erase *.exp