diff --git a/ChangeLog b/ChangeLog index 8b7bac2bb0..e9b7e26ec1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,57 @@ +1999-05-04 Tor Lillqvist + + Win32 portability changes: + + * config.h.win32, README.win32: Small changes. + + * tools/pdbgen/pdb/*.pdb: Include . + + * app/*_cmds.c: Autogenerated files reflect above changes. + + * libgimp/makefile.msc app/makefile.msc: Various updates, + including new object files. Gtk+ directory now should be called + gtk+ (not gtk-plus). Use win32-specific gdk subdir. Glib directory + now should be called just glib. + + * libgimp/gimp.def: Updates. + + * libgimp/gimpfeatures.h.win32: Made current with + gimpfeatures.h.in. + + * libgimp/gimpfileselection.c: Define S_ISDIR and S_ISREG if + necessary. + + * tools/pdbgen/pdb/fileops.pdb: Must have a + statement (even an empty one) after a label. + + * app/fileops_cmds.c: Autogenerated file reflects above changes. + + * app/crop.c: Include . + + * app/{app_procs,batch,fileops,datafiles,errorconsole,general, + plug_in,temp_buf,tile_swap}.c: Test NATIVE_WIN32, not + _MSC_VER. (NATIVE_WIN32 means we are using the Microsoft C + runtime, even if we might be compiling with gcc.) + + * app/fileops.c: Don't include here. + + * app/fileops.h: Do include here. + + * app/gimpparasite.c: Include config.h, guard inclusion of + . (Is the inclusion of unistd.h in source files all over + the place really necessary?) + + * app/ink.c: MSC doesn't handle conversion from unsigned __int64 + to double, so cast to signed. + + * app/lut_funcs.c: Include config.h, and define rint() if necessary. + + * app/pixel_processor.c: Include config.h without "..", like in + all the other places. Include + + * app/text_tool.c: Guard the "POINTS" identifier that clashes with + , sigh. + 1999-05-02 Michael Natterer * app/commands.c: call gdisplays_resize_cursor_label(gimage) diff --git a/README.win32 b/README.win32 index a4aedaa9bc..6ee13bd911 100644 --- a/README.win32 +++ b/README.win32 @@ -1,4 +1,5 @@ -This is an unstable release of the GIMP, intended for developers only. +This is an unstable version of the GIMP, intended for developers +only. Even more so the Win32 port. For more information about the port or GLib, GTk+ and the GIMP to native Windows, and pre-built binary packages, see @@ -6,12 +7,15 @@ http://www.iki.fi/tml/gimp/win32/ or http://www.gimp.org/~tml/gimp/win32/ To build the GIMP on Win32, you will need (for now) the Microsoft -compiler. Eventually gcc (egcs) from cygwin will also be supported. +compiler. Eventually gcc (egcs) on cygwin will also be supported, but +without the produced executables depending on the cygwin dll (gcc +-mno-cygwin). First, build in the libgimp directory, then in tools/gcg, then in app, plug-ins, and finally in modules. Check the makefile.msc files in said directories. -The current build setup for Windows is a mess, I know that. - +The current build setup for Windows is a mess, with complex +hand-maintained makefiles. I know. + --Tor Lillqvist diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c index 62e304d09f..a23402ae7f 100644 --- a/app/actions/plug-in-commands.c +++ b/app/actions/plug-in-commands.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/app_procs.c b/app/app_procs.c index 14add5fdbd..d08c9ffece 100644 --- a/app/app_procs.c +++ b/app/app_procs.c @@ -31,7 +31,7 @@ #include #endif -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include /* For _getpid() */ #endif diff --git a/app/base/lut-funcs.c b/app/base/lut-funcs.c index 8255314b51..a63469f09a 100644 --- a/app/base/lut-funcs.c +++ b/app/base/lut-funcs.c @@ -16,12 +16,18 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" + #include "gimplut.h" #include "gimphistogram.h" #include #include #include +#ifndef HAVE_RINT +#define rint(x) floor (x + 0.5) +#endif + /* ---------- Brightness/Contrast -----------*/ typedef struct B_C_struct diff --git a/app/base/pixel-processor.c b/app/base/pixel-processor.c index f3eeb2d90d..96df600a37 100644 --- a/app/base/pixel-processor.c +++ b/app/base/pixel-processor.c @@ -18,12 +18,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "../config.h" +#include "config.h" + #include "pixel_processor.h" #include "pixel_region.h" #include "gimprc.h" #include #include +#include #ifdef ENABLE_MP diff --git a/app/base/temp-buf.c b/app/base/temp-buf.c index 8f24d38af2..678ebda4b7 100644 --- a/app/base/temp-buf.c +++ b/app/base/temp-buf.c @@ -28,7 +28,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include /* For _getpid() */ #endif diff --git a/app/base/tile-swap.c b/app/base/tile-swap.c index 21b932297f..adeb5776af 100644 --- a/app/base/tile-swap.c +++ b/app/base/tile-swap.c @@ -13,7 +13,7 @@ #include #endif -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #endif diff --git a/app/batch.c b/app/batch.c index ffbf8f8145..66ac20f9a0 100644 --- a/app/batch.c +++ b/app/batch.c @@ -9,7 +9,7 @@ #include #endif -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #endif diff --git a/app/brush_select_cmds.c b/app/brush_select_cmds.c index 6cf75d6d87..048f855f0e 100644 --- a/app/brush_select_cmds.c +++ b/app/brush_select_cmds.c @@ -20,6 +20,8 @@ #include "procedural_db.h" +#include + #include "brush_select.h" #include "gimpbrushlist.h" #include "paint_funcs.h" diff --git a/app/convert_cmds.c b/app/convert_cmds.c index 8503b5f6f7..78bf2dbc72 100644 --- a/app/convert_cmds.c +++ b/app/convert_cmds.c @@ -20,6 +20,8 @@ #include "procedural_db.h" +#include + #include "convert.h" #include "gimage.h" #include "palette.h" diff --git a/app/core/gimp-parasites.c b/app/core/gimp-parasites.c index 7c25543700..5599a0cf1f 100644 --- a/app/core/gimp-parasites.c +++ b/app/core/gimp-parasites.c @@ -15,9 +15,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" + #include #include +#ifdef HAVE_UNISTD_H #include +#endif + #include "app_procs.h" #include "parasitelist.h" #include "gimpparasite.h" diff --git a/app/core/gimpdatafiles.c b/app/core/gimpdatafiles.c index 74aba57d30..b305aa3d3f 100644 --- a/app/core/gimpdatafiles.c +++ b/app/core/gimpdatafiles.c @@ -32,7 +32,7 @@ #include #endif -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #ifndef S_ISDIR #define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) #define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) diff --git a/app/core/gimpparasite.c b/app/core/gimpparasite.c index 7c25543700..5599a0cf1f 100644 --- a/app/core/gimpparasite.c +++ b/app/core/gimpparasite.c @@ -15,9 +15,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" + #include #include +#ifdef HAVE_UNISTD_H #include +#endif + #include "app_procs.h" #include "parasitelist.h" #include "gimpparasite.h" diff --git a/app/crop.c b/app/crop.c index 650bf4cf18..d28b51f632 100644 --- a/app/crop.c +++ b/app/crop.c @@ -15,6 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#include + #include "gdk/gdkkeysyms.h" #include "appenv.h" #include "actionarea.h" diff --git a/app/datafiles.c b/app/datafiles.c index 74aba57d30..b305aa3d3f 100644 --- a/app/datafiles.c +++ b/app/datafiles.c @@ -32,7 +32,7 @@ #include #endif -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #ifndef S_ISDIR #define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) #define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) diff --git a/app/errorconsole.c b/app/errorconsole.c index c5a342bf4f..c3f04780d1 100644 --- a/app/errorconsole.c +++ b/app/errorconsole.c @@ -35,7 +35,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #ifndef S_IRUSR #define S_IRUSR _S_IREAD diff --git a/app/fileops.c b/app/fileops.c index cab8ad8a53..bb174dd73e 100644 --- a/app/fileops.c +++ b/app/fileops.c @@ -33,8 +33,7 @@ #endif #include -#ifdef _MSC_VER -#include /* For _getpid() */ +#ifdef NATIVE_WIN32 #include /* For _mkdir() */ #define mkdir(path,mode) _mkdir(path) #endif diff --git a/app/fileops.h b/app/fileops.h index b6983ba612..5357fd955a 100644 --- a/app/fileops.h +++ b/app/fileops.h @@ -20,6 +20,11 @@ #include + +#ifdef NATIVE_WIN32 +#include /* For _getpid() */ +#endif + #include "plug_in.h" #include "gimpimageF.h" diff --git a/app/fileops_cmds.c b/app/fileops_cmds.c index 0f1d6dd0fc..30f6292442 100644 --- a/app/fileops_cmds.c +++ b/app/fileops_cmds.c @@ -297,7 +297,7 @@ register_magic_load_handler_invoker (Argument *args) success = TRUE; - done: + done: ; } return procedural_db_return_args (®ister_magic_load_handler_proc, success); @@ -442,7 +442,7 @@ register_save_handler_invoker (Argument *args) success = TRUE; - done: + done: ; } return procedural_db_return_args (®ister_save_handler_proc, success); diff --git a/app/general.c b/app/general.c index aafb0f9f5b..95544c38c3 100644 --- a/app/general.c +++ b/app/general.c @@ -24,7 +24,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #ifndef S_ISREG #define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) #endif diff --git a/app/gimage_cmds.c b/app/gimage_cmds.c index a2139cf6e7..c51e9499cf 100644 --- a/app/gimage_cmds.c +++ b/app/gimage_cmds.c @@ -20,6 +20,8 @@ #include "procedural_db.h" +#include + #include "channel.h" #include "cursorutil.h" #include "drawable.h" diff --git a/app/gimpparasite.c b/app/gimpparasite.c index 7c25543700..5599a0cf1f 100644 --- a/app/gimpparasite.c +++ b/app/gimpparasite.c @@ -15,9 +15,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" + #include #include +#ifdef HAVE_UNISTD_H #include +#endif + #include "app_procs.h" #include "parasitelist.h" #include "gimpparasite.h" diff --git a/app/gradient_select_cmds.c b/app/gradient_select_cmds.c index 573b71798c..825364bcae 100644 --- a/app/gradient_select_cmds.c +++ b/app/gradient_select_cmds.c @@ -20,6 +20,8 @@ #include "procedural_db.h" +#include + #include "gradient.h" #include "gradient_header.h" diff --git a/app/gui/plug-in-commands.c b/app/gui/plug-in-commands.c index 62e304d09f..a23402ae7f 100644 --- a/app/gui/plug-in-commands.c +++ b/app/gui/plug-in-commands.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/gui/plug-in-menus.c b/app/gui/plug-in-menus.c index 62e304d09f..a23402ae7f 100644 --- a/app/gui/plug-in-menus.c +++ b/app/gui/plug-in-menus.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/ink.c b/app/ink.c index 4d93529d5d..006a275dcc 100644 --- a/app/ink.c +++ b/app/ink.c @@ -945,7 +945,11 @@ time_smoother_result (InkTool* ink_tool) result += ink_tool->ts_buffer[i]; } +#ifdef _MSC_VER + return (gdouble) (gint64) (result / TIME_SMOOTHER_BUFFER); +#else return (result / TIME_SMOOTHER_BUFFER); +#endif } diff --git a/app/lut_funcs.c b/app/lut_funcs.c index 8255314b51..a63469f09a 100644 --- a/app/lut_funcs.c +++ b/app/lut_funcs.c @@ -16,12 +16,18 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" + #include "gimplut.h" #include "gimphistogram.h" #include #include #include +#ifndef HAVE_RINT +#define rint(x) floor (x + 0.5) +#endif + /* ---------- Brightness/Contrast -----------*/ typedef struct B_C_struct diff --git a/app/makefile.msc b/app/makefile.msc index 35cee26e0e..4b82a723e1 100644 --- a/app/makefile.msc +++ b/app/makefile.msc @@ -8,23 +8,24 @@ BIN = D:\gimp\bin # Nothing much configurable below -# cl -? described the options -CC = cl -GA -G5 -GF -Ox -W3 -MD -nologo +# cl -? describes the options +#CC = cl -GA -G5 -GF -Ox -W3 -MD -nologo +CC = cl -GA -G5 -GF -Zi -W3 -MD -nologo # Change to /subsystem:console when debugging -LDFLAGS = /link /subsystem:windows /machine:ix86 +LDFLAGS = /link /subsystem:windows /machine:ix86 /debug INSTALL = copy TOUCH = copy makefile.msc+nul GIMP_VER = 1.1 GTK_VER = 1.3 -GLIB_VER = 1.2 +GLIB_VER = 1.3 -GTK = ..\..\gtk-plus -GLIB = ..\..\glib-$(GLIB_VER) +GTK = ..\..\gtk+ +GLIB = ..\..\glib GMODULE = $(GLIB)\gmodule -CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK) +CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk\win32 -I$(GTK) GCG = ..\tools\gcg\gcg -I. -I ..\tools\gcg\gh @@ -43,163 +44,188 @@ install : gimp.exe copy ..\config.h.win32 ..\config.h gimpim_OBJECTS = \ - gimpobject.obj \ + gimpdrawable.obj\ gimpimage.obj \ + gimpobject.obj \ gimpset.obj \ - gimpsignal.obj \ - gimpdrawable.obj + gimpsignal.obj gimpim.lib : $(gimpim_OBJECTS) lib /out:gimpim.lib $(gimpim_OBJECTS) gimp_OBJECTS = \ - about_dialog.obj\ - actionarea.obj \ - airbrush.obj \ - app_procs.obj \ - asupsample.obj \ - batch.obj \ - bezier_select.obj\ - blend.obj \ - blob.obj \ - boundary.obj \ - brightness_contrast.obj\ - brush_edit.obj \ - brush_select.obj\ - bucket_fill.obj \ - buildmenu.obj \ - by_color_select.obj\ - channel.obj \ - channel_cmds.obj\ - channels_dialog.obj\ - channel_ops.obj \ - clone.obj \ - color_area.obj \ - color_balance.obj\ - color_notebook.obj\ - color_panel.obj \ - color_picker.obj\ - color_select.obj\ - color_transfer.obj\ - colormaps.obj \ - colormap_dialog.obj\ - commands.obj \ - convert.obj \ - convolve.obj \ - crop.obj \ - cursorutil.obj \ - curves.obj \ - datafiles.obj \ - desaturate.obj \ - devices.obj \ - dialog_handler.obj\ - disp_callbacks.obj\ - docindex.obj \ - docindexif.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 \ - flip_tool.obj \ - floating_sel.obj\ - floating_sel_cmds.obj\ - file_new_dialog.obj\ - frac.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\ - gimphistogram.obj\ - gimplist.obj \ - gimplut.obj \ - gimpparasite.obj\ - gimpprogress.obj\ - gimprc.obj \ - global_edit.obj \ - gradient.obj \ - gradient_select.obj\ - gximage.obj \ - histogramwidget.obj \ - histogram_tool.obj\ - hue_saturation.obj\ - image_map.obj \ - image_render.obj\ - info_dialog.obj \ - info_window.obj \ - ink.obj \ - install.obj \ - interface.obj \ - internal_procs.obj\ - invert.obj \ - iscissors.obj \ - layer.obj \ - layer_cmds.obj \ - layer_select.obj\ - layers_dialog.obj\ - levels.obj \ - magnify.obj \ - main.obj \ - menus.obj \ - module_db.obj \ - move.obj \ - ops_buttons.obj \ - palette.obj \ - palette_select.obj\ - paint_core.obj \ - paint_funcs.obj \ - paintbrush.obj \ - parasite_cmds.obj\ - parasitelist.obj\ - paths_dialog.obj\ - pattern_select.obj\ - patterns.obj \ - pencil.obj \ - perspective_tool.obj\ - pixel_region.obj\ - plug_in.obj \ - posterize.obj \ - preferences_dialog.obj\ - procedural_db.obj\ - rect_select.obj \ - regex.obj \ - resize.obj \ - rotate_tool.obj \ - scale.obj \ - scale_tool.obj \ - scroll.obj \ - selection.obj \ - session.obj \ - shear_tool.obj \ - temp_buf.obj \ - text_tool.obj \ - threshold.obj \ - tile.obj \ - tile_cache.obj \ - tile_manager.obj\ - tile_swap.obj \ - tips_dialog.obj \ - tools.obj \ - transform_core.obj\ - transform_tool.obj\ - undo.obj \ - undo_cmds.obj \ - vector2d.obj \ + about_dialog.obj \ + actionarea.obj \ + airbrush.obj \ + app_procs.obj \ + asupsample.obj \ + batch.obj \ + bezier_select.obj \ + blend.obj \ + blob.obj \ + boundary.obj \ + brightness_contrast.obj \ + brush_edit.obj \ + brush_select.obj \ + brush_select_cmds.obj \ + brushes_cmds.obj \ + bucket_fill.obj \ + buildmenu.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 \ + 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 \ + docindexif.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 \ + frac.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 \ + gimphistogram.obj \ + gimplist.obj \ + gimplut.obj \ + gimpparasite.obj \ + gimpprogress.obj \ + gimprc.obj \ + gimprc_cmds.obj \ + gimpunit.obj \ + global_edit.obj \ + gradient.obj \ + gradient_cmds.obj \ + gradient_select.obj \ + gradient_select_cmds.obj \ + guides_cmds.obj \ + gximage.obj \ + histogramwidget.obj \ + histogram_tool.obj \ + hue_saturation.obj \ + image_map.obj \ + image_render.obj \ + info_dialog.obj \ + info_window.obj \ + ink.obj \ + install.obj \ + interface.obj \ + interface_cmds.obj \ + internal_procs.obj \ + invert.obj \ + iscissors.obj \ + layer.obj \ + layer_cmds.obj \ + layer_select.obj \ + layers_dialog.obj \ + levels.obj \ + lut_funcs.obj \ + magnify.obj \ + main.obj \ + menus.obj \ + misc_cmds.obj \ + module_db.obj \ + move.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 \ + 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 \ + rect_select.obj \ + regex.obj \ + resize.obj \ + rotate_tool.obj \ + scale.obj \ + scale_tool.obj \ + scroll.obj \ + selection.obj \ + session.obj \ + shear_tool.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 \ + unit_cmds.obj \ + vector2d.obj \ xcf.obj .SUFFIXES: .gc @@ -210,8 +236,8 @@ gimp_OBJECTS = \ gimp.res : gimp.rc wilber.ico rc -r -fo gimp.res gimp.rc -gimp.exe : ../config.h $(gimp_OBJECTS) gimpim.lib gimp.res - $(CC) $(CFLAGS) -Fegimp.exe $(gimp_OBJECTS) gimpim.lib ..\libgimp\gimpi-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(LDFLAGS) gimp.res gdi32.lib user32.lib /def:gimp.def +gimp.exe : ../config.h $(gimp_OBJECTS) gimpim.lib gimp.def gimp.res + $(CC) $(CFLAGS) -Fegimp.exe $(gimp_OBJECTS) gimpim.lib ..\libgimp\gimpi.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(LDFLAGS) gimp.res gdi32.lib user32.lib /def:gimp.def # General rule for building $(gimp_OBJECTS) .c.obj: diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c index 62e304d09f..a23402ae7f 100644 --- a/app/menus/plug-in-menus.c +++ b/app/menus/plug-in-menus.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c index 4d93529d5d..006a275dcc 100644 --- a/app/paint/gimpink.c +++ b/app/paint/gimpink.c @@ -945,7 +945,11 @@ time_smoother_result (InkTool* ink_tool) result += ink_tool->ts_buffer[i]; } +#ifdef _MSC_VER + return (gdouble) (gint64) (result / TIME_SMOOTHER_BUFFER); +#else return (result / TIME_SMOOTHER_BUFFER); +#endif } diff --git a/app/paths_cmds.c b/app/paths_cmds.c index 767bc27b57..13ab2a004e 100644 --- a/app/paths_cmds.c +++ b/app/paths_cmds.c @@ -20,6 +20,8 @@ #include "procedural_db.h" +#include + #include "gimage.h" #include "pathsP.h" diff --git a/app/pattern_select_cmds.c b/app/pattern_select_cmds.c index 3088d8c668..5842ebf826 100644 --- a/app/pattern_select_cmds.c +++ b/app/pattern_select_cmds.c @@ -20,6 +20,8 @@ #include "procedural_db.h" +#include + #include "pattern_select.h" static ProcRecord patterns_popup_proc; diff --git a/app/pixel_processor.c b/app/pixel_processor.c index f3eeb2d90d..96df600a37 100644 --- a/app/pixel_processor.c +++ b/app/pixel_processor.c @@ -18,12 +18,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "../config.h" +#include "config.h" + #include "pixel_processor.h" #include "pixel_region.h" #include "gimprc.h" #include #include +#include #ifdef ENABLE_MP diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/gimpplugin-progress.c +++ b/app/plug-in/gimpplugin-progress.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/gimpplugin.c +++ b/app/plug-in/gimpplugin.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/gimppluginmanager-call.c +++ b/app/plug-in/gimppluginmanager-call.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/gimppluginmanager-run.c b/app/plug-in/gimppluginmanager-run.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/gimppluginmanager-run.c +++ b/app/plug-in/gimppluginmanager-run.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/gimppluginshm.c b/app/plug-in/gimppluginshm.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/gimppluginshm.c +++ b/app/plug-in/gimppluginshm.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/plug-in-def.c b/app/plug-in/plug-in-def.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/plug-in-def.c +++ b/app/plug-in/plug-in-def.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/plug-in-message.c +++ b/app/plug-in/plug-in-message.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/plug-in-params.c +++ b/app/plug-in/plug-in-params.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/plug-in-progress.c b/app/plug-in/plug-in-progress.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/plug-in-progress.c +++ b/app/plug-in/plug-in-progress.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/plug-in-run.c b/app/plug-in/plug-in-run.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/plug-in-run.c +++ b/app/plug-in/plug-in-run.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/plug-in-shm.c b/app/plug-in/plug-in-shm.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/plug-in-shm.c +++ b/app/plug-in/plug-in-shm.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/plug-in.c b/app/plug-in/plug-in.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/plug-in.c +++ b/app/plug-in/plug-in.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/plug_in.c b/app/plug_in.c index 62e304d09f..a23402ae7f 100644 --- a/app/plug_in.c +++ b/app/plug_in.c @@ -44,7 +44,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #include #endif diff --git a/app/procedural_db_cmds.c b/app/procedural_db_cmds.c index dbd9d545b2..8c28ddea45 100644 --- a/app/procedural_db_cmds.c +++ b/app/procedural_db_cmds.c @@ -24,6 +24,7 @@ #include #include +#include #include "regex.h" diff --git a/app/temp_buf.c b/app/temp_buf.c index 8f24d38af2..678ebda4b7 100644 --- a/app/temp_buf.c +++ b/app/temp_buf.c @@ -28,7 +28,7 @@ #include #include -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include /* For _getpid() */ #endif diff --git a/app/text_tool.c b/app/text_tool.c index 580dd600ec..b0bc7f1c06 100644 --- a/app/text_tool.c +++ b/app/text_tool.c @@ -18,7 +18,14 @@ #include #include #include -#include +#include +#if GDK_WINDOWING == GDK_WINDOWING_WIN32 +# define POINTS POINTS_win32 /* Guard against clash */ +#endif +#include +#if GDK_WINDOWING == GDK_WINDOWING_WIN32 +# undef POINTS +#endif #include "appenv.h" #include "actionarea.h" #include "buildmenu.h" diff --git a/app/text_tool_cmds.c b/app/text_tool_cmds.c index 4d4a2a8023..abf0f299c9 100644 --- a/app/text_tool_cmds.c +++ b/app/text_tool_cmds.c @@ -21,6 +21,7 @@ #include "procedural_db.h" #include +#include #include "drawable.h" #include "layer.h" diff --git a/app/tile_swap.c b/app/tile_swap.c index 21b932297f..adeb5776af 100644 --- a/app/tile_swap.c +++ b/app/tile_swap.c @@ -13,7 +13,7 @@ #include #endif -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #include #endif diff --git a/app/tools/crop.c b/app/tools/crop.c index 650bf4cf18..d28b51f632 100644 --- a/app/tools/crop.c +++ b/app/tools/crop.c @@ -15,6 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#include + #include "gdk/gdkkeysyms.h" #include "appenv.h" #include "actionarea.h" diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c index 650bf4cf18..d28b51f632 100644 --- a/app/tools/gimpcroptool.c +++ b/app/tools/gimpcroptool.c @@ -15,6 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#include + #include "gdk/gdkkeysyms.h" #include "appenv.h" #include "actionarea.h" diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c index 4d93529d5d..006a275dcc 100644 --- a/app/tools/gimpinktool.c +++ b/app/tools/gimpinktool.c @@ -945,7 +945,11 @@ time_smoother_result (InkTool* ink_tool) result += ink_tool->ts_buffer[i]; } +#ifdef _MSC_VER + return (gdouble) (gint64) (result / TIME_SMOOTHER_BUFFER); +#else return (result / TIME_SMOOTHER_BUFFER); +#endif } diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index 580dd600ec..b0bc7f1c06 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -18,7 +18,14 @@ #include #include #include -#include +#include +#if GDK_WINDOWING == GDK_WINDOWING_WIN32 +# define POINTS POINTS_win32 /* Guard against clash */ +#endif +#include +#if GDK_WINDOWING == GDK_WINDOWING_WIN32 +# undef POINTS +#endif #include "appenv.h" #include "actionarea.h" #include "buildmenu.h" diff --git a/app/tools/ink.c b/app/tools/ink.c index 4d93529d5d..006a275dcc 100644 --- a/app/tools/ink.c +++ b/app/tools/ink.c @@ -945,7 +945,11 @@ time_smoother_result (InkTool* ink_tool) result += ink_tool->ts_buffer[i]; } +#ifdef _MSC_VER + return (gdouble) (gint64) (result / TIME_SMOOTHER_BUFFER); +#else return (result / TIME_SMOOTHER_BUFFER); +#endif } diff --git a/app/tools/text_tool.c b/app/tools/text_tool.c index 580dd600ec..b0bc7f1c06 100644 --- a/app/tools/text_tool.c +++ b/app/tools/text_tool.c @@ -18,7 +18,14 @@ #include #include #include -#include +#include +#if GDK_WINDOWING == GDK_WINDOWING_WIN32 +# define POINTS POINTS_win32 /* Guard against clash */ +#endif +#include +#if GDK_WINDOWING == GDK_WINDOWING_WIN32 +# undef POINTS +#endif #include "appenv.h" #include "actionarea.h" #include "buildmenu.h" diff --git a/config.h.win32 b/config.h.win32 index 99b141d0e9..4dcb1862c8 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -189,8 +189,9 @@ /* #undef HAVE_LIBI */ /* There are three orthogonal switches regarding Unix, X11 and Windows: - X_DISPLAY_MISSING vs. WINDOWS_DISPLAY, WIN32 (vs __unix__), - NATIVE_WIN32 vs. __CYGWIN32__ */ + * GDK_WINDOWING (from GTk+), WIN32 (vs __unix__ or something else), + * NATIVE_WIN32 vs. __CYGWIN32__ +*/ /* Define if the X Window System is missing or not being used. */ #define X_DISPLAY_MISSING 1 @@ -201,5 +202,7 @@ /* Define if the Win32 GDI API is being used. */ #define WINDOWS_DISPLAY 1 -/* Define if compiling for Win32 but not with the Cygnus Unix emulation. */ +/* Define if compiling for Win32 but not with the Cygwin POSIX emulation, + * i.e. with Microsoft C runtime. This macro probably should be renamed. +*/ #define NATIVE_WIN32 1 diff --git a/libgimp/gimp.def b/libgimp/gimp.def index fa7e7a33fa..ef32687884 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -82,7 +82,7 @@ EXPORTS gimp_image_disable_undo gimp_image_enable_undo gimp_image_find_parasite - gimp_image_findnext_guide + gimp_image_find_next_guide gimp_image_flatten gimp_image_floating_selection gimp_image_get_active_channel @@ -209,6 +209,18 @@ EXPORTS gimp_tile_unref gimp_tile_width gimp_uninstall_temp_proc + gimp_unit_get_abbreviation + gimp_unit_get_deletion_flag + gimp_unit_get_digits + gimp_unit_get_factor + gimp_unit_get_identifier + gimp_unit_get_number_of_units + gimp_unit_get_number_of_built_in_units + gimp_unit_get_plural + gimp_unit_get_singular + gimp_unit_get_symbol + gimp_unit_new + gimp_unit_set_deletion_flag gimp_use_xshm gp_config_write gp_extension_ack_write diff --git a/libgimp/gimpfeatures.h.win32 b/libgimp/gimpfeatures.h.win32 index f994ef173d..50d9c9a6cf 100644 --- a/libgimp/gimpfeatures.h.win32 +++ b/libgimp/gimpfeatures.h.win32 @@ -27,14 +27,21 @@ extern "C" { #define GIMP_MAJOR_VERSION (1) #define GIMP_MINOR_VERSION (1) -#define GIMP_MICRO_VERSION (2) +#define GIMP_MICRO_VERSION (5) #define GIMP_VERSION "1.1.2" +#define GIMP_CHECK_VERSION(major, minor, micro) \ + (GIMP_MAJOR_VERSION > (major) || \ + (GIMP_MAJOR_VERSION == (major) && GIMP_MINOR_VERSION > (minor)) || \ + (GIMP_MAJOR_VERSION == (major) && GIMP_MINOR_VERSION == (minor) && \ + GIMP_MICRO_VERSION >= (micro))) #define GIMP_HAVE_PROCEDURAL_DB_GET_DATA_SIZE 1-1-0 #define GIMP_HAVE_PARASITES 1-1-0 #define GIMP_HAVE_RESOLUTION_INFO 1-1-0 #define GIMP_HAVE_DESTROY_PARAMDEFS 1-1-0 +#define GIMP_HAVE_FEATURES_1_1_5 1-1-5 + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libgimp/gimpfileselection.c b/libgimp/gimpfileselection.c index 4a2a2c4a7d..08c6fb3537 100644 --- a/libgimp/gimpfileselection.c +++ b/libgimp/gimpfileselection.c @@ -35,6 +35,15 @@ #include "pixmaps/yes.xpm" #include "pixmaps/no.xpm" +#ifdef NATIVE_WIN32 +# ifndef S_ISDIR +# define S_ISDIR(m) ((m) & _S_IFDIR) +# endif +# ifndef S_ISREG +# define S_ISREG(m) ((m) & _S_IFREG) +# endif +#endif + /* callbacks */ static void gimp_file_selection_realize (GtkWidget *widget, diff --git a/libgimp/makefile.msc b/libgimp/makefile.msc index 07fb5878c4..924a893798 100644 --- a/libgimp/makefile.msc +++ b/libgimp/makefile.msc @@ -16,25 +16,26 @@ GIMPDIR = _gimp$(GIMP_VER) # Nothing much configurable below -# cl -? described the options -CC = cl -GD -G5 -GF -Ox -W3 -MD -nologo +# cl -? describes the options +#CC = cl -G5 -GF -Ox -W3 -MD -nologo +CC = cl -G5 -GF -Zi -W3 -MD -nologo -LDFLAGS = /link +LDFLAGS = /link /debug INSTALL = copy TOUCH = copy makefile.msc+nul GTK_VER = 1.3 -GLIB_VER = 1.2 +GLIB_VER = 1.3 -GTK = ..\..\gtk-plus -GLIB = ..\..\glib-$(GLIB_VER) +GTK = ..\..\gtk+ +GLIB = ..\..\glib -CFLAGS = -I.. -I$(GLIB) -I$(GTK) -DGIMPDIR=\"$(GIMPDIR)\" +CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK) -DGIMPDIR=\"$(GIMPDIR)\" all : \ ..\config.h \ gimpfeatures.h \ - gimpi-$(GIMP_VER).dll \ + gimpi.lib \ gimp-$(GIMP_VER).dll \ gimpui-$(GIMP_VER).dll $(TOUCH) all @@ -54,17 +55,18 @@ install : all gimpi_OBJECTS = \ gimpenv.obj \ gimpchainbutton.obj\ + gimpfileselection.obj\ gimpmatrix.obj \ + gimppatheditor.obj\ gimpprotocol.obj\ gimpsizeentry.obj\ - gimpunit.obj \ gimpunitmenu.obj\ gimpwire.obj \ gserialize.obj \ parasite.obj -gimpi-$(GIMP_VER).dll : $(gimpi_OBJECTS) gimpi.def - $(CC) $(CFLAGS) -LD -Fegimpi-$(GIMP_VER).dll $(gimpi_OBJECTS) $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimpi.def +gimpi.lib : $(gimpi_OBJECTS) + lib /out:gimpi.lib $(gimpi_OBJECTS) gimp_OBJECTS = \ gimp.obj \ @@ -81,6 +83,7 @@ gimp_OBJECTS = \ gimppixelrgn.obj\ gimpprotocol.obj\ gimptile.obj \ + gimpunit.obj \ gimpwire.obj \ gserialize.obj \ parasite.obj @@ -89,39 +92,41 @@ gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def $(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def gimp.obj : gimp.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimp.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c gimpchannel.obj : gimpchannel.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpchannel.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpchannel.c gimpdisplay.obj : gimpdisplay.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpdisplay.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpdisplay.c gimpdrawable.obj : gimpdrawable.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpdrawable.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpdrawable.c gimpenv.obj : gimpenv.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpenv.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpenv.c gimpgradient.obj : gimpgradient.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpgradient.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpgradient.c gimpimage.obj : gimpimage.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpimage.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpimage.c gimplayer.obj : gimplayer.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimplayer.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimplayer.c gimpmatrix.obj : gimpmatrix.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpmatrix.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpmatrix.c gimppalette.obj : gimppalette.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimppalette.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimppalette.c gimpparasite.obj : gimpparasite.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpparasite.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpparasite.c gimppixelrgn.obj : gimppixelrgn.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimppixelrgn.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimppixelrgn.c gimpprotocol.obj : gimpprotocol.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpprotocol.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpprotocol.c gimptile.obj : gimptile.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimptile.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimptile.c +gimpunit.obj : gimpunit.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpunit.c gimpwire.obj : gimpwire.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpwire.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpwire.c gserialize.obj : gserialize.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gserialize.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gserialize.c parasite.obj : parasite.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION parasite.c + $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION parasite.c gimpui_OBJECTS = \ gimpmenu.obj \ @@ -130,19 +135,19 @@ gimpui_OBJECTS = \ gimppatternmenu.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 $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def + $(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) gimp-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def gimpmenu.obj : gimpmenu.c - $(CC) $(CFLAGS) -c gimpmenu.c + $(CC) $(CFLAGS) -GD -c gimpmenu.c gimpbrushmenu.obj : gimpbrushmenu.c - $(CC) $(CFLAGS) -c gimpbrushmenu.c + $(CC) $(CFLAGS) -GD -c gimpbrushmenu.c gimpgradientmenu.obj : gimpgradientmenu.c - $(CC) $(CFLAGS) -c gimpgradientmenu.c + $(CC) $(CFLAGS) -GD -c gimpgradientmenu.c gimppatternmenu.obj : gimppatternmenu.c - $(CC) $(CFLAGS) -c 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. diff --git a/libgimpbase/gimpdatafiles.c b/libgimpbase/gimpdatafiles.c index 74aba57d30..b305aa3d3f 100644 --- a/libgimpbase/gimpdatafiles.c +++ b/libgimpbase/gimpdatafiles.c @@ -32,7 +32,7 @@ #include #endif -#ifdef _MSC_VER +#ifdef NATIVE_WIN32 #ifndef S_ISDIR #define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) #define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) diff --git a/libgimpwidgets/gimpfileentry.c b/libgimpwidgets/gimpfileentry.c index 4a2a2c4a7d..08c6fb3537 100644 --- a/libgimpwidgets/gimpfileentry.c +++ b/libgimpwidgets/gimpfileentry.c @@ -35,6 +35,15 @@ #include "pixmaps/yes.xpm" #include "pixmaps/no.xpm" +#ifdef NATIVE_WIN32 +# ifndef S_ISDIR +# define S_ISDIR(m) ((m) & _S_IFDIR) +# endif +# ifndef S_ISREG +# define S_ISREG(m) ((m) & _S_IFREG) +# endif +#endif + /* callbacks */ static void gimp_file_selection_realize (GtkWidget *widget, diff --git a/libgimpwidgets/gimpfileselection.c b/libgimpwidgets/gimpfileselection.c index 4a2a2c4a7d..08c6fb3537 100644 --- a/libgimpwidgets/gimpfileselection.c +++ b/libgimpwidgets/gimpfileselection.c @@ -35,6 +35,15 @@ #include "pixmaps/yes.xpm" #include "pixmaps/no.xpm" +#ifdef NATIVE_WIN32 +# ifndef S_ISDIR +# define S_ISDIR(m) ((m) & _S_IFDIR) +# endif +# ifndef S_ISREG +# define S_ISREG(m) ((m) & _S_IFREG) +# endif +#endif + /* callbacks */ static void gimp_file_selection_realize (GtkWidget *widget,