From 565ca6b1180a1e0e7ecd412dfa27261ea5e6a08a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 24 Aug 2000 17:53:43 +0000 Subject: [PATCH] Update, tell people the MSVC makefiles are not up-to-date. 2000-08-24 Tor Lillqvist * README.win32: Update, tell people the MSVC makefiles are not up-to-date. * */makefile.msc: Add warning about being outdated. * */makefile.cygwin: Remove. * */makefile.mingw.in: New files replacing the makefile.cygwin files. * */Makefile.am: Change correspondingly. * configure.in: Generate corresponding makefile.mingw files. * app/about_dialog.c: Include for GDK_USE_UTF8_MBS. Add UTF-8 version of a string. * libgimp/gimp.c: Remove horrible Win32 hack, not needed any longer. * plug-ins/common/jpeg.c: Use g_message, not g_warning. * plug-ins/common/winclipboard.c * plug-ins/common/winprint.c: Remove COMPAT_CRUFT. * plug-ins/Lighting/lighing_apply.c: Fix for non-interactive mode bug, supplied by Piet van Oostrum. * tips/makefile.mingw: New file. * tips/Makefile.am: Add it. --- ChangeLog | 32 +++ README.win32 | 27 +- app/Makefile.am | 6 +- app/about_dialog.c | 5 + app/dialogs/about-dialog.c | 5 + app/gui/about-dialog.c | 5 + app/makefile.cygwin | 257 ----------------- app/makefile.mingw.in | 263 ++++++++++++++++++ app/makefile.msc | 2 + configure.in | 4 + libgimp/Makefile.am | 6 +- libgimp/gimp.c | 9 - libgimp/makefile.cygwin | 147 ---------- libgimp/makefile.mingw.in | 148 ++++++++++ libgimp/makefile.msc | 2 + .../{makefile.cygwin => makefile.mingw.in} | 38 +-- modules/makefile.msc | 2 + plug-ins/Lighting/lighting_apply.c | 4 +- plug-ins/Makefile.am | 6 +- plug-ins/common/jpeg.c | 2 +- plug-ins/common/winclipboard.c | 2 +- plug-ins/common/winprint.c | 2 +- plug-ins/jpeg/jpeg-load.c | 2 +- plug-ins/jpeg/jpeg-load.h | 2 +- plug-ins/jpeg/jpeg-save.c | 2 +- plug-ins/jpeg/jpeg-save.h | 2 +- plug-ins/jpeg/jpeg.c | 2 +- plug-ins/jpeg/jpeg.h | 2 +- plug-ins/makefile.msc | 2 + tips/Makefile.am | 4 +- tips/makefile.mingw | 43 +++ 31 files changed, 579 insertions(+), 456 deletions(-) delete mode 100644 app/makefile.cygwin create mode 100644 app/makefile.mingw.in delete mode 100644 libgimp/makefile.cygwin create mode 100644 libgimp/makefile.mingw.in rename modules/{makefile.cygwin => makefile.mingw.in} (70%) create mode 100644 tips/makefile.mingw diff --git a/ChangeLog b/ChangeLog index 027a68b95e..164fef34d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2000-08-24 Tor Lillqvist + + * README.win32: Update, tell people the MSVC makefiles are not + up-to-date. + + * */makefile.msc: Add warning about being outdated. + + * */makefile.cygwin: Remove. + + * */makefile.mingw.in: New files replacing the makefile.cygwin files. + + * */Makefile.am: Change correspondingly. + + * configure.in: Generate corresponding makefile.mingw files. + + * app/about_dialog.c: Include for + GDK_USE_UTF8_MBS. Add UTF-8 version of a string. + + * libgimp/gimp.c: Remove horrible Win32 hack, not needed any longer. + + * plug-ins/common/jpeg.c: Use g_message, not g_warning. + + * plug-ins/common/winclipboard.c + * plug-ins/common/winprint.c: Remove COMPAT_CRUFT. + + * plug-ins/Lighting/lighing_apply.c: Fix for non-interactive mode + bug, supplied by Piet van Oostrum. + + * tips/makefile.mingw: New file. + + * tips/Makefile.am: Add it. + 2000-08-24 Sven Neumann * libgimp/gimpcompat.h diff --git a/README.win32 b/README.win32 index c72f0764f8..f8f8160900 100644 --- a/README.win32 +++ b/README.win32 @@ -3,8 +3,8 @@ native Windows, and pre-built binary packages, see http://www.iki.fi/tml/gimp/win32/ or http://www.gimp.org/~tml/gimp/win32/ -To build the GIMP on Win32, you can use either Microsoft Visual C++ or -gcc. The gcc to use should be for a mingw configuration (producing +To build the GIMP on Win32, you can use either gcc or Microsoft Visual +C++. The gcc to use should be for a mingw configuration (producing executables that don't depend on the cygwin dll). For more information about the preparation necessary for building with gcc, what version you want and where to get it, etc, read README.win32 in GLib 1.3 (or @@ -12,6 +12,11 @@ later). (GLib 1.3 is the developer version and thus isn't distributed per se, but available from CVS, and especially for Windows in zipfiles from the web pages mentioned above.) +Unfortunately the makefiles for MSVC aren't quite up-to-date. You will +have to modify them a bit if you want to use MSVC. But quite possibly +by the time you read this somebody might have contributes new +makefiles, or even project files. + The GIMP wants to be built with the GNU "intl" library for internationalisation (i18n). Get the version ported to Win32 from the web site mentioned above. We build the "intl" library to a DLL called @@ -23,18 +28,18 @@ Note that while the GNU gettext package is under the GPL (GNU General Public License), the "intl" library part as distributed with GNU libc is under the LGPL (GNU Lesser General Public License, a.k.a. GNU Library General Public License). We want the LGPL-licensed version of -the intl library, even if they are the same, more or less. It doesn't -matter for the GIMP which itself is licensed under the GPL, but it -does matter for GTk+, which is licensed under the LGPL. +the intl library, even if they are the same source code, more or +less. It doesn't matter for the GIMP which itself is licensed under +the GPL, but it does matter for GTk+, which is licensed under the +LGPL. First, build in the libgimp directory, then in app, plug-ins, and -finally in modules. Check the makefile.msc or makefile.cygwin files in -said directories. +finally in modules. Check the makefile.mingw files in said +directories. The current build setup for Windows is a mess, with complex -hand-maintained makefiles. I know. Adding parallel makefiles for gcc -didn't make it any cleaner. On the other hand, I don't think using the -Unix style configuration mechanism to generate mingw EXEs and DLLs is -quite feasible, either. I would love to be proved wrong. +hand-maintained makefiles. I know. On the other hand, I don't think +using the Unix style configuration mechanism to generate mingw EXEs +and DLLs is quite feasible, either. I would love to be proved wrong. --Tor Lillqvist diff --git a/app/Makefile.am b/app/Makefile.am index 80bea73126..b1dd3d9e71 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -435,7 +435,8 @@ EXTRA_DIST = \ colormap_dialog.i.h \ colormap_dialog.p.h \ colormap_dialog.t.h \ - makefile.cygwin \ + makefile.mingw \ + makefile.mingw.in \ makefile.msc \ gimp.rc \ gimp.sym \ @@ -473,6 +474,9 @@ files: echo $$p; \ done +makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/app/makefile.mingw.in + cd $(top_builddir) && CONFIG_FILES=app/$@ CONFIG_HEADERS= $(SHELL) ./config.status + # GCG stuff # # SUFFIXES = .gc .gh diff --git a/app/about_dialog.c b/app/about_dialog.c index a6238020a1..3914c9740a 100644 --- a/app/about_dialog.c +++ b/app/about_dialog.c @@ -24,6 +24,7 @@ #include #include +#include /* For GDK_USE_UTF8_MBS */ #include #include "about_dialog.h" @@ -108,7 +109,11 @@ static gchar *hadja_text[] = { "Hadjaha!", "Nej!", +#ifndef GDK_USE_UTF8_MBS "Tvärtom!" +#else + "Tvärtom!" +#endif }; void diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c index a6238020a1..3914c9740a 100644 --- a/app/dialogs/about-dialog.c +++ b/app/dialogs/about-dialog.c @@ -24,6 +24,7 @@ #include #include +#include /* For GDK_USE_UTF8_MBS */ #include #include "about_dialog.h" @@ -108,7 +109,11 @@ static gchar *hadja_text[] = { "Hadjaha!", "Nej!", +#ifndef GDK_USE_UTF8_MBS "Tvärtom!" +#else + "Tvärtom!" +#endif }; void diff --git a/app/gui/about-dialog.c b/app/gui/about-dialog.c index a6238020a1..3914c9740a 100644 --- a/app/gui/about-dialog.c +++ b/app/gui/about-dialog.c @@ -24,6 +24,7 @@ #include #include +#include /* For GDK_USE_UTF8_MBS */ #include #include "about_dialog.h" @@ -108,7 +109,11 @@ static gchar *hadja_text[] = { "Hadjaha!", "Nej!", +#ifndef GDK_USE_UTF8_MBS "Tvärtom!" +#else + "Tvärtom!" +#endif }; void diff --git a/app/makefile.cygwin b/app/makefile.cygwin deleted file mode 100644 index 8b803dfa63..0000000000 --- a/app/makefile.cygwin +++ /dev/null @@ -1,257 +0,0 @@ -## Makefile for building gimp.exe with gcc -## Use: make -f makefile.cygwin - -# Change this to wherever you want to install gimp.exe. -# This is what I use as installation target, from where the installer-builder -# will pick it up. -BIN = /install/gimp/bin - -################################################################ - -# Nothing much configurable below - -TOP = ../.. - -GIMP_VER = 1.1 - -include ../build/win32/make.mingw - -DEFINES = -DREGEX_MALLOC -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"Gimp\" -INCLUDES = -I . -I .. -DEPCFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS) - -all : \ - ../config.h \ - libgimpim.a \ - colormap_dialog.c \ - gimp.exe - -install : gimp.exe - $(INSTALL) gimp.exe $(BIN) - -../config.h : ../config.h.win32 - cp ../config.h.win32 ../config.h - -gimpim_OBJECTS = \ - gimpdrawable.o \ - gimpimage.o \ - gimpobject.o \ - gimppreviewcache.o\ - gimpset.o \ - gimpsignal.o - -libgimpim.a : $(gimpim_OBJECTS) - ar cr libgimpim.a $(gimpim_OBJECTS) - -gimp_OBJECTS = \ - about_dialog.o \ - airbrush.o \ - airbrush_blob.o \ - app_procs.o \ - asupsample.o \ - batch.o \ - bezier_select.o \ - blend.o \ - blob.o \ - boundary.o \ - brightness_contrast.o \ - brush_edit.o \ - brush_scale.o \ - brush_select.o \ - brush_select_cmds.o \ - brushes_cmds.o \ - bucket_fill.o \ - by_color_select.o \ - channel.o \ - channel_cmds.o \ - channels_dialog.o \ - channel_ops.o \ - channel_ops_cmds.o \ - clone.o \ - color_area.o \ - color_balance.o \ - color_cmds.o \ - color_notebook.o \ - color_panel.o \ - color_picker.o \ - color_select.o \ - color_transfer.o \ - colormaps.o \ - colormap_dialog.o \ - commands.o \ - context_manager.o \ - convert.o \ - convert_cmds.o \ - convolve.o \ - crop.o \ - cursorutil.o \ - curves.o \ - datafiles.o \ - desaturate.o \ - devices.o \ - dialog_handler.o \ - disp_callbacks.o \ - display_cmds.o \ - docindex.o \ - dodgeburn.o \ - draw_core.o \ - drawable.o \ - drawable_cmds.o \ - edit_cmds.o \ - edit_selection.o \ - ellipse_select.o \ - eraser.o \ - errorconsole.o \ - errors.o \ - equalize.o \ - fileops.o \ - fileops_cmds.o \ - flip_tool.o \ - floating_sel.o \ - floating_sel_cmds.o \ - file_new_dialog.o \ - free_select.o \ - fuzzy_select.o \ - gdisplay.o \ - gdisplay_color.o \ - gdisplay_color_ui.o \ - gdisplay_ops.o \ - general.o \ - gimage.o \ - gimage_mask.o \ - gimpbrush.o \ - gimpbrushgenerated.o \ - gimpbrushlist.o \ - gimpbrushpipe.o \ - gimpcontext.o \ - gimpcontextpreview.o \ - gimpdnd.o \ - gimphelp.o \ - gimphistogram.o \ - gimplist.o \ - gimplut.o \ - gimpparasite.o \ - gimpprogress.o \ - gimprc.o \ - gimprc_cmds.o \ - gimpui.o \ - gimpunit.o \ - global_edit.o \ - gradient.o \ - gradient_cmds.o \ - gradient_select.o \ - gradient_select_cmds.o \ - gradients_cmds.o \ - guides_cmds.o \ - gtkwrapbox.o \ - gtkhwrapbox.o \ - gtkvwrapbox.o \ - gximage.o \ - help_cmds.o \ - histogramwidget.o \ - histogram_tool.o \ - hue_saturation.o \ - image_cmds.o \ - image_map.o \ - image_new.o \ - image_render.o \ - indicator_area.o \ - info_dialog.o \ - info_window.o \ - ink.o \ - interface.o \ - internal_procs.o \ - invert.o \ - iscissors.o \ - layer.o \ - layer_cmds.o \ - layer_select.o \ - layers_dialog.o \ - lc_dialog.o \ - levels.o \ - lut_funcs.o \ - magnify.o \ - main.o \ - measure.o \ - menus.o \ - message_cmds.o \ - misc_cmds.o \ - module_db.o \ - move.o \ - nav_window.o \ - ops_buttons.o \ - palette.o \ - palette_cmds.o \ - palette_select.o \ - paint_core.o \ - paint_funcs.o \ - paintbrush.o \ - parasite_cmds.o \ - parasitelist.o \ - path.o \ - paths_cmds.o \ - paths_dialog.o \ - pattern_select.o \ - pattern_select_cmds.o \ - patterns.o \ - patterns_cmds.o \ - pencil.o \ - perspective_tool.o \ - pixel_processor.o \ - pixel_region.o \ - plug_in.o \ - plug_in_cmds.o \ - posterize.o \ - preferences_dialog.o \ - procedural_db.o \ - procedural_db_cmds.o \ - qmask.o \ - rect_select.o \ - regex.o \ - resize.o \ - rotate_tool.o \ - scale.o \ - scale_tool.o \ - scan_convert.o \ - scroll.o \ - selection.o \ - selection_cmds.o \ - session.o \ - shear_tool.o \ - smudge.o \ - temp_buf.o \ - text_tool.o \ - text_tool_cmds.o \ - threshold.o \ - tile.o \ - tile_cache.o \ - tile_manager.o \ - tile_swap.o \ - tips_dialog.o \ - tool_options.o \ - tools.o \ - tools_cmds.o \ - transform_core.o \ - transform_tool.o \ - undo.o \ - undo_cmds.o \ - undo_history.o \ - unit_cmds.o \ - user_install.o \ - xcf.o - -gimpres.o : gimp.rc wilber.ico - windres gimp.rc gimpres.o - -gimp.def: gimp.sym - echo EXPORTS >$@ - cat $< >>$@ - -gimp.exe : ../config.h $(gimp_OBJECTS) libgimpim.a gimp.def gimpres.o -# This is sickening. - $(CC) $(CFLAGS) -Wl,--base-file,gimp.base -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gimpres.o -lgdi32 -luser32 -lshell32 - $(DLLTOOL) --base-file gimp.base --input-def gimp.def --output-exp gimp.exp - $(CC) $(CFLAGS) -Wl,--base-file,gimp.base,gimp.exp -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gimpres.o -lgdi32 -luser32 -lshell32 - $(DLLTOOL) --base-file gimp.base --input-def gimp.def --output-exp gimp.exp - $(CC) $(CFLAGS) -Wl,gimp.exp -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gimpres.o -lgdi32 -luser32 -lshell32 - $(DLLTOOL) --dllname gimp.exe gimp.def --output-lib libgimp.a $(gimp_OBJECTS) diff --git a/app/makefile.mingw.in b/app/makefile.mingw.in new file mode 100644 index 0000000000..2cc5e403a2 --- /dev/null +++ b/app/makefile.mingw.in @@ -0,0 +1,263 @@ +## Makefile for building gimp.exe with gcc on Win32. +## You should use GNU make running on cygwin. +## Use: make -f makefile.mingw + +# Change this to wherever you want to install gimp.exe. +# This is what I use as installation target, from where the installer-builder +# will pick it up. +BIN = /install/gimp/bin + +TOP = ../.. + +include ../build/win32/make.mingw + +# Possibly override GIMP version from build/win32/module.defs +GIMP_VER = @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@ + +################################################################ + +DEFINES = -DREGEX_MALLOC -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"Gimp\" +INCLUDES = -I . -I .. +DEPCFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS) + +all : \ + ../config.h \ + libgimpim.a \ + colormap_dialog.c \ + gimp.exe + +install : gimp.exe + $(INSTALL) gimp.exe $(BIN) + +../config.h : ../config.h.win32 + cp $@ $< + +gimpim_OBJECTS = \ + gimpdrawable.o \ + gimpimage.o \ + gimpobject.o \ + gimppreviewcache.o \ + gimpset.o \ + gimpsignal.o + +libgimpim.a : $(gimpim_OBJECTS) + ar cr libgimpim.a $(gimpim_OBJECTS) + +gimp_OBJECTS = \ + about_dialog.o \ + airbrush.o \ + airbrush_blob.o \ + app_procs.o \ + asupsample.o \ + batch.o \ + bezier_select.o \ + blend.o \ + blob.o \ + boundary.o \ + brightness_contrast.o \ + brush_edit.o \ + brush_scale.o \ + brush_select.o \ + brush_select_cmds.o \ + brushes_cmds.o \ + bucket_fill.o \ + by_color_select.o \ + channel.o \ + channel_cmds.o \ + channels_dialog.o \ + channel_ops.o \ + channel_ops_cmds.o \ + clone.o \ + color_area.o \ + color_balance.o \ + color_cmds.o \ + color_notebook.o \ + color_panel.o \ + color_picker.o \ + color_select.o \ + color_transfer.o \ + colormaps.o \ + colormap_dialog.o \ + commands.o \ + context_manager.o \ + convert.o \ + convert_cmds.o \ + convolve.o \ + crop.o \ + cursorutil.o \ + curves.o \ + datafiles.o \ + desaturate.o \ + devices.o \ + dialog_handler.o \ + disp_callbacks.o \ + display_cmds.o \ + docindex.o \ + dodgeburn.o \ + draw_core.o \ + drawable.o \ + drawable_cmds.o \ + edit_cmds.o \ + edit_selection.o \ + ellipse_select.o \ + eraser.o \ + errorconsole.o \ + errors.o \ + equalize.o \ + fileops.o \ + fileops_cmds.o \ + flip_tool.o \ + floating_sel.o \ + floating_sel_cmds.o \ + file_new_dialog.o \ + free_select.o \ + fuzzy_select.o \ + gdisplay.o \ + gdisplay_color.o \ + gdisplay_color_ui.o \ + gdisplay_ops.o \ + general.o \ + gimage.o \ + gimage_mask.o \ + gimpbrush.o \ + gimpbrushgenerated.o \ + gimpbrushlist.o \ + gimpbrushpipe.o \ + gimpcontext.o \ + gimpcontextpreview.o \ + gimpdnd.o \ + gimphelp.o \ + gimphistogram.o \ + gimplist.o \ + gimplut.o \ + gimpparasite.o \ + gimpprogress.o \ + gimprc.o \ + gimprc_cmds.o \ + gimpui.o \ + gimpunit.o \ + global_edit.o \ + gradient.o \ + gradient_cmds.o \ + gradient_select.o \ + gradient_select_cmds.o \ + gradients_cmds.o \ + guides_cmds.o \ + gtkwrapbox.o \ + gtkhwrapbox.o \ + gtkvwrapbox.o \ + gximage.o \ + help_cmds.o \ + histogramwidget.o \ + histogram_tool.o \ + hue_saturation.o \ + image_cmds.o \ + image_map.o \ + image_new.o \ + image_render.o \ + indicator_area.o \ + info_dialog.o \ + info_window.o \ + ink.o \ + interface.o \ + internal_procs.o \ + invert.o \ + iscissors.o \ + layer.o \ + layer_cmds.o \ + layer_select.o \ + layers_dialog.o \ + lc_dialog.o \ + levels.o \ + lut_funcs.o \ + magnify.o \ + main.o \ + measure.o \ + menus.o \ + message_cmds.o \ + misc_cmds.o \ + module_db.o \ + move.o \ + nav_window.o \ + ops_buttons.o \ + palette.o \ + palette_cmds.o \ + palette_select.o \ + paint_core.o \ + paint_funcs.o \ + paintbrush.o \ + parasite_cmds.o \ + parasitelist.o \ + path.o \ + paths_cmds.o \ + paths_dialog.o \ + pattern_select.o \ + pattern_select_cmds.o \ + patterns.o \ + patterns_cmds.o \ + pencil.o \ + perspective_tool.o \ + pixel_processor.o \ + pixel_region.o \ + plug_in.o \ + plug_in_cmds.o \ + posterize.o \ + preferences_dialog.o \ + procedural_db.o \ + procedural_db_cmds.o \ + qmask.o \ + rect_select.o \ + regex.o \ + resize.o \ + rotate_tool.o \ + scale.o \ + scale_tool.o \ + scan_convert.o \ + scroll.o \ + selection.o \ + selection_cmds.o \ + session.o \ + shear_tool.o \ + smudge.o \ + temp_buf.o \ + text_tool.o \ + text_tool_cmds.o \ + threshold.o \ + tile.o \ + tile_cache.o \ + tile_manager.o \ + tile_swap.o \ + tips_dialog.o \ + tool_options.o \ + tools.o \ + tools_cmds.o \ + transform_core.o \ + transform_tool.o \ + undo.o \ + undo_cmds.o \ + undo_history.o \ + unit_cmds.o \ + user_install.o \ + xcf.o + +gimpres.o : gimp.rc wilber.ico + windres gimp.rc gimpres.o + +gimp.def: gimp.sym + echo EXPORTS >$@ + cat $< >>$@ + +gimp.exe : ../config.h $(gimp_OBJECTS) libgimpim.a gimp.def gimpres.o +# This is sickening. + $(CC) $(CFLAGS) -Wl,--base-file,gimp.base -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gimpres.o -lgdi32 -luser32 -lshell32 + $(DLLTOOL) --base-file gimp.base --input-def gimp.def --output-exp gimp.exp + $(CC) $(CFLAGS) -Wl,--base-file,gimp.base,gimp.exp -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gimpres.o -lgdi32 -luser32 -lshell32 + $(DLLTOOL) --base-file gimp.base --input-def gimp.def --output-exp gimp.exp + $(CC) $(CFLAGS) -Wl,gimp.exp -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gimpres.o -lgdi32 -luser32 -lshell32 + $(DLLTOOL) --dllname gimp.exe gimp.def --output-lib libgimp.a $(gimp_OBJECTS) + +# Hack to get an updated makefile.mingw automatically after updating +# makefile.mingw.in. Only for developer use. +makefile.mingw: makefile.mingw.in + sed -e 's,@GIMP[_]MAJOR_VERSION@,@GIMP_MAJOR_VERSION@,' \ + -e 's,@GIMP[_]MINOR_VERSION@,@GIMP_MINOR_VERSION@,' <$< >$@ diff --git a/app/makefile.msc b/app/makefile.msc index 17b2eba71f..e9e24d81c1 100644 --- a/app/makefile.msc +++ b/app/makefile.msc @@ -1,3 +1,5 @@ +## WARNING: Outdated. + ## Makefile for building gimp.exe with Microsoft C ## Use: nmake -f makefile.msc diff --git a/configure.in b/configure.in index 739d12b903..0db2a3c86a 100644 --- a/configure.in +++ b/configure.in @@ -768,8 +768,11 @@ gimp-remote.1 gimp.spec libgimp/gimpfeatures.h libgimp/Makefile +libgimp/makefile.mingw app/Makefile +app/makefile.mingw plug-ins/Makefile +plug-ins/makefile.mingw plug-ins/perl/config.pl plug-ins/libgck/Makefile plug-ins/libgck/gck/Makefile @@ -810,6 +813,7 @@ plug-ins/rcm/Makefile plug-ins/sel2path/Makefile plug-ins/sgi/Makefile modules/Makefile +modules/makefile.mingw devel-docs/Makefile devel-docs/libgimp/Makefile devel-docs/pdb/Makefile diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 778d90a0e3..fdd7f818d7 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -17,8 +17,9 @@ INCLUDES = \ EXTRA_DIST = \ gimpfeatures.h.in \ + makefile.mingw \ + makefile.mingw.in \ makefile.msc \ - makefile.cygwin \ gimp.def \ gimpui.def @@ -280,3 +281,6 @@ files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done + +makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/libgimp/makefile.mingw.in + cd $(top_builddir) && CONFIG_FILES=libgimp/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/libgimp/gimp.c b/libgimp/gimp.c index c739bf9ca5..3cb13e1e0e 100644 --- a/libgimp/gimp.c +++ b/libgimp/gimp.c @@ -975,15 +975,6 @@ gimp_flush (GIOChannel *channel) do { bytes = 0; -#ifdef G_OS_WIN32 - /* Horrible hack that seems to prevent script-fu from - * hanging upon startup on NT4. The real solution would - * be to fix (rewrite) the GLib main loop and IO channel code - * for Win32. - */ - if ((write_buffer_index - count) > 100) - Sleep (0); -#endif error = g_io_channel_write (channel, &write_buffer[count], (write_buffer_index - count), &bytes); diff --git a/libgimp/makefile.cygwin b/libgimp/makefile.cygwin deleted file mode 100644 index e4f0d111d5..0000000000 --- a/libgimp/makefile.cygwin +++ /dev/null @@ -1,147 +0,0 @@ -## Makefile for building the GIMP DLLs and LIBs with gcc -mno-cygwin. -## Use: make -f makefile.cygwin - -# The name of the directory in your %HOME% where the GIMP's personal settings -# and stuff is saved. -GIMPDIR = _gimp$(GIMP_VER) - -################################################################ - -# Nothing much configurable below - -TOP = ../.. - -GIMP_VER = 1.1 - -include ../build/win32/make.mingw - -INCLUDES = -I .. -DEPCFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS) -DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DG_LOG_DOMAIN=\"LibGimp\" - -all : \ - ../config.h \ - libgimpi.a \ - gimp-$(GIMP_VER).dll \ - gimpui-$(GIMP_VER).dll - -../config.h : ../config.h.win32 - cp $@ $< - -PDB_WRAPPERS_O = \ - gimpbrushes_pdb.o \ - gimpbrushselect_pdb.o \ - gimpchannel_pdb.o \ - gimpchannelops_pdb.o \ - gimpcolor_pdb.o \ - gimpconvert_pdb.o \ - gimpdisplay_pdb.o \ - gimpdrawable_pdb.o \ - gimpedit_pdb.o \ - gimpfileops_pdb.o \ - gimpfloatingsel_pdb.o \ - gimpgimprc_pdb.o \ - gimpgradients_pdb.o \ - gimpgradientselect_pdb.o \ - gimpguides_pdb.o \ - gimphelp_pdb.o \ - gimpimage_pdb.o \ - gimplayer_pdb.o \ - gimpmessage_pdb.o \ - gimpmisc_pdb.o \ - gimppalette_pdb.o \ - gimpparasite_pdb.o \ - gimppaths_pdb.o \ - gimppatterns_pdb.o \ - gimppatternselect_pdb.o \ - gimpplugin_pdb.o \ - gimpproceduraldb_pdb.o \ - gimpselection_pdb.o \ - gimptexttool_pdb.o \ - gimptools_pdb.o \ - gimpundo_pdb.o \ - gimpunit_pdb.o - -gimpi_OBJECTS = \ - gimpenv.o \ - gimpchainbutton.o \ - gimpcolorbutton.o \ - gimpcolorspace.o \ - gimpdialog.o \ - gimpfileselection.o \ - gimphelpui.o \ - gimpmatrix.o \ - gimpparasite.o \ - gimpparasiteio.o \ - gimppatheditor.o \ - gimppixmap.o \ - gimpprotocol.o \ - gimpquerybox.o \ - gimpsizeentry.o \ - gimpunitmenu.o \ - gimputils.o \ - gimpvector.o \ - gimpwidgets.o \ - gimpwire.o - -libgimpi.a : $(gimpi_OBJECTS) - ar cr libgimpi.a $(gimpi_OBJECTS) - -gimp_OBJECTS = \ - gimp.o \ - $(PDB_WRAPPERS_O) \ - gimpchannel.o \ - gimpcolorspace.o \ - gimpdrawable.o \ - gimpenv.o \ - gimpgradientselect.o \ - gimphelp.o \ - gimpimage.o \ - gimplayer.o \ - gimpmatrix.o \ - gimpparasite.o \ - gimpparasiteio.o \ - gimppixelrgn.o \ - gimpproceduraldb.o \ - gimpprotocol.o \ - gimpselection.o \ - gimptile.o \ - gimpunit.o \ - gimpvector.o \ - gimpwire.o - -gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def - $(GLIB)/build-dll gimp $(GIMP_VER) gimp.def -s $(gimp_OBJECTS) $(INTL_LIBS) $(GLIB_LIBS) -luser32 - -# Pass -DLIBGIMP_COMPILATION when compiling gimp.c which -# defines the exported variables. - -gimp.o : gimp.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimp.c - -gimpui_OBJECTS = \ - gimpmenu.o \ - gimpbrushmenu.o \ - gimpchainbutton.o \ - gimpcolorbutton.o \ - gimpdialog.o \ - gimpexport.o \ - gimpfileselection.o \ - gimphelpui.o \ - gimpgradientmenu.o \ - gimppatheditor.o \ - gimppatternmenu.o \ - gimppixmap.o \ - gimpquerybox.o \ - gimpsizeentry.o \ - gimpui.o \ - gimpunitmenu.o \ - gimpwidgets.o - -gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def - $(GLIB)/build-dll gimpui $(GIMP_VER) gimpui.def -s $(gimpui_OBJECTS) -L . -lgimp-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) - -# General rule for compiling, used by the objects that don't go into -# gimp-$(GIMP_VER).dll. -.c.o: - $(CC) $(CFLAGS) -c $< diff --git a/libgimp/makefile.mingw.in b/libgimp/makefile.mingw.in new file mode 100644 index 0000000000..114fdf5b14 --- /dev/null +++ b/libgimp/makefile.mingw.in @@ -0,0 +1,148 @@ +## Makefile for building the GIMP DLLs and LIBs with gcc on Win32. +## You should use GNU make running on cygwin. +## Use: make -f makefile.mingw + +TOP = ../.. + +include ../build/win32/make.mingw + +# Possibly override GIMP version from build/win32/module.defs +GIMP_VER = @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@ + +################################################################ + +# The name of the directory in your %HOME% where the GIMP's personal settings +# and stuff is saved. +GIMPDIR = _gimp$(GIMP_VER) + +INCLUDES = -I .. +DEPCFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS) +DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DG_LOG_DOMAIN=\"LibGimp\" + +all : \ + ../config.h \ + libgimpi.a \ + gimp-$(GIMP_VER).dll \ + gimpui-$(GIMP_VER).dll + +../config.h : ../config.h.win32 + cp $@ $< + +PDB_WRAPPERS_O = \ + gimpbrushes_pdb.o \ + gimpbrushselect_pdb.o \ + gimpchannel_pdb.o \ + gimpchannelops_pdb.o \ + gimpcolor_pdb.o \ + gimpconvert_pdb.o \ + gimpdisplay_pdb.o \ + gimpdrawable_pdb.o \ + gimpedit_pdb.o \ + gimpfileops_pdb.o \ + gimpfloatingsel_pdb.o \ + gimpgimprc_pdb.o \ + gimpgradients_pdb.o \ + gimpgradientselect_pdb.o \ + gimpguides_pdb.o \ + gimphelp_pdb.o \ + gimpimage_pdb.o \ + gimplayer_pdb.o \ + gimpmessage_pdb.o \ + gimpmisc_pdb.o \ + gimppalette_pdb.o \ + gimpparasite_pdb.o \ + gimppaths_pdb.o \ + gimppatterns_pdb.o \ + gimppatternselect_pdb.o \ + gimpplugin_pdb.o \ + gimpproceduraldb_pdb.o \ + gimpselection_pdb.o \ + gimptexttool_pdb.o \ + gimptools_pdb.o \ + gimpundo_pdb.o \ + gimpunit_pdb.o + +gimpi_OBJECTS = \ + gimpenv.o \ + gimpchainbutton.o \ + gimpcolorbutton.o \ + gimpcolorspace.o \ + gimpdialog.o \ + gimpfileselection.o \ + gimphelpui.o \ + gimpmatrix.o \ + gimpparasite.o \ + gimpparasiteio.o \ + gimppatheditor.o \ + gimppixmap.o \ + gimpprotocol.o \ + gimpquerybox.o \ + gimpsizeentry.o \ + gimpunitmenu.o \ + gimputils.o \ + gimpvector.o \ + gimpwidgets.o \ + gimpwire.o + +libgimpi.a : $(gimpi_OBJECTS) + ar cr libgimpi.a $(gimpi_OBJECTS) + +gimp_OBJECTS = \ + gimp.o \ + $(PDB_WRAPPERS_O) \ + gimpchannel.o \ + gimpcolorspace.o \ + gimpdrawable.o \ + gimpenv.o \ + gimpgradientselect.o \ + gimphelp.o \ + gimpimage.o \ + gimplayer.o \ + gimpmatrix.o \ + gimpparasite.o \ + gimpparasiteio.o \ + gimppixelrgn.o \ + gimpproceduraldb.o \ + gimpprotocol.o \ + gimpselection.o \ + gimptile.o \ + gimpunit.o \ + gimpvector.o \ + gimpwire.o + +gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def + $(GLIB)/build-dll gimp $(GIMP_VER) gimp.def -s $(gimp_OBJECTS) $(INTL_LIBS) $(GLIB_LIBS) -luser32 + +# Pass -DLIBGIMP_COMPILATION when compiling gimp.c which +# defines the exported variables. + +gimp.o : gimp.c + $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimp.c + +gimpui_OBJECTS = \ + gimpmenu.o \ + gimpbrushmenu.o \ + gimpchainbutton.o \ + gimpcolorbutton.o \ + gimpdialog.o \ + gimpexport.o \ + gimpfileselection.o \ + gimphelpui.o \ + gimpgradientmenu.o \ + gimppatheditor.o \ + gimppatternmenu.o \ + gimppixmap.o \ + gimpquerybox.o \ + gimpsizeentry.o \ + gimpui.o \ + gimpunitmenu.o \ + gimpwidgets.o + +gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def + $(GLIB)/build-dll gimpui $(GIMP_VER) gimpui.def -s $(gimpui_OBJECTS) -L . -lgimp-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) + +# Hack to get an updated makefile.mingw automatically after updating +# makefile.mingw.in. Only for developer use. +makefile.mingw: makefile.mingw.in + sed -e 's,@GIMP[_]MAJOR_VERSION@,@GIMP_MAJOR_VERSION@,' \ + -e 's,@GIMP[_]MINOR_VERSION@,@GIMP_MINOR_VERSION@,' <$< >$@ diff --git a/libgimp/makefile.msc b/libgimp/makefile.msc index ba7a8d417b..f4cbf2d437 100644 --- a/libgimp/makefile.msc +++ b/libgimp/makefile.msc @@ -1,3 +1,5 @@ +## WARNING: Outdated. + ## Makefile for building the GIMP DLLs and LIBs with Microsoft C. ## Use: nmake -f makefile.msc diff --git a/modules/makefile.cygwin b/modules/makefile.mingw.in similarity index 70% rename from modules/makefile.cygwin rename to modules/makefile.mingw.in index af7b198824..a14243fa52 100644 --- a/modules/makefile.cygwin +++ b/modules/makefile.mingw.in @@ -1,34 +1,32 @@ -## Makefile for building gimp modules with gcc -## Use: make -f makefile.cygwin +## Makefile for building GIMP modules with gcc on Win32. +## You should use GNU make running on cygwin. +## Use: make -f makefile.mingw # Change this to wherever you install gimp. # This is what I use as installation target, from where the installer-builder # will pick it up. -GIMP = /install/gimp - -################################################################ - -# Nothing much configurable below +BIN = /install/gimp/modules TOP = ../.. -GIMP_VER = 1.1 - include ../build/win32/make.mingw +# Possibly override GIMP version from build/win32/module.defs +GIMP_VER = @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@ + +################################################################ + DEFINES = -DMODULE_COMPILATION INCLUDES = -I . -I .. DEPCFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS) LDFLAGS = -s -BIN = $(GIMP)/modules - -MODULES = \ - colorsel_gtk-$(GIMP_VER).dll \ - colorsel_triangle-$(GIMP_VER).dll \ - colorsel_water-$(GIMP_VER).dll \ - cdisplay_gamma-$(GIMP_VER).dll \ +MODULES = \ + colorsel_gtk-$(GIMP_VER).dll \ + colorsel_triangle-$(GIMP_VER).dll \ + colorsel_water-$(GIMP_VER).dll \ + cdisplay_gamma-$(GIMP_VER).dll \ cdisplay_highcontrast-$(GIMP_VER).dll all : \ @@ -38,7 +36,7 @@ install : all for m in $(MODULES); do $(INSTALL) $$m $(BIN); done ../config.h : ../config.h.win32 - cp ../config.h.win32 $@ + cp $@ $< colorsel_gtk-$(GIMP_VER).dll : colorsel_gtk.o module.def $(GLIB)/build-dll colorsel_gtk $(GIMP_VER) module.def colorsel_gtk.o $(LDFLAGS) -L ../app -lgimp $(GTK_LIBS) $(GLIB_LIBS) @@ -54,3 +52,9 @@ cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.o module.def cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.o module.def $(GLIB)/build-dll cdisplay_highcontrast $(GIMP_VER) module.def cdisplay_highcontrast.o $(LDFLAGS) -L ../app -lgimp -L ../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) + +# Hack to get an updated makefile.mingw automatically after updating +# makefile.mingw.in. Only for developer use. +makefile.mingw: makefile.mingw.in + sed -e 's,@GIMP[_]MAJOR_VERSION@,@GIMP_MAJOR_VERSION@,' \ + -e 's,@GIMP[_]MINOR_VERSION@,@GIMP_MINOR_VERSION@,' <$< >$@ diff --git a/modules/makefile.msc b/modules/makefile.msc index be83b72eb6..afaf799a10 100644 --- a/modules/makefile.msc +++ b/modules/makefile.msc @@ -1,3 +1,5 @@ +## WARNING: Outdated. + ## Makefile for building gimp modules with Microsoft C ## Use: nmake -f makefile.msc diff --git a/plug-ins/Lighting/lighting_apply.c b/plug-ins/Lighting/lighting_apply.c index 0cd193e00e..8a6bbd6127 100644 --- a/plug-ins/Lighting/lighting_apply.c +++ b/plug-ins/Lighting/lighting_apply.c @@ -94,13 +94,15 @@ compute_image (void) { gimp_pixel_rgn_init (&bump_region, gimp_drawable_get(mapvals.bumpmap_id), 0, 0, width, height, FALSE, FALSE); - precompute_init(width,height); } + precompute_init(width,height); if (!mapvals.env_mapped || mapvals.envmap_id==-1) ray_func = get_ray_color; else { + env_width = gimp_drawable_width (mapvals.envmap_id); + env_height = gimp_drawable_height (mapvals.envmap_id); gimp_pixel_rgn_init (&env_region, gimp_drawable_get(mapvals.envmap_id), 0, 0, env_width, env_height, FALSE, FALSE); ray_func = get_ray_color_ref; diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am index a2265e632b..5cfb17fd03 100644 --- a/plug-ins/Makefile.am +++ b/plug-ins/Makefile.am @@ -1,7 +1,8 @@ ## Process this file with automake to produce Makefile.in EXTRA_DIST = \ - makefile.cygwin \ + makefile.mingw \ + makefile.mingw.in \ makefile.msc \ twain/README \ twain/tw_dump.c \ @@ -72,3 +73,6 @@ files: echo $$subdir/$$file; \ done; \ done + +makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/plug-ins/makefile.mingw.in + cd $(top_builddir) && CONFIG_FILES=plug-ins/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/plug-ins/common/jpeg.c b/plug-ins/common/jpeg.c index 44aa128808..1416a7b479 100644 --- a/plug-ins/common/jpeg.c +++ b/plug-ins/common/jpeg.c @@ -737,7 +737,7 @@ load_image (gchar *filename, if ((infile = fopen (filename, "rb")) == NULL) { - g_warning (_("can't open \"%s\"\n"), filename); + g_message (_("can't open \"%s\"\n"), filename); gimp_quit (); } diff --git a/plug-ins/common/winclipboard.c b/plug-ins/common/winclipboard.c index 44c276b857..c3d9a78a0e 100644 --- a/plug-ins/common/winclipboard.c +++ b/plug-ins/common/winclipboard.c @@ -510,7 +510,7 @@ CB_PasteImage (gboolean interactive, || (3 != oldBPP) || (24 != nBitsPS)) { /* create new image */ - image_ID = gimp_image_new (nWidth, nHeight, nBitsPS <= 8 ? INDEXED : RGB); + image_ID = gimp_image_new (nWidth, nHeight, nBitsPS <= 8 ? GIMP_INDEXED : GIMP_RGB); gimp_image_undo_disable(image_ID); drawable_ID = gimp_layer_new (image_ID, _("Background"), nWidth, nHeight, nBitsPS <= 8 ? GIMP_INDEXED_IMAGE : GIMP_RGB_IMAGE, diff --git a/plug-ins/common/winprint.c b/plug-ins/common/winprint.c index cc1a85172a..7b32fea077 100644 --- a/plug-ins/common/winprint.c +++ b/plug-ins/common/winprint.c @@ -353,7 +353,7 @@ run (gchar *name, /* Is the image indexed? If so we need the colourmap. */ - if (gimp_image_base_type(param[1].data.d_image) == INDEXED) + if (gimp_image_base_type(param[1].data.d_image) == GIMP_INDEXED) cmap = gimp_image_get_cmap(param[1].data.d_image, &ncolours); else { diff --git a/plug-ins/jpeg/jpeg-load.c b/plug-ins/jpeg/jpeg-load.c index 44aa128808..1416a7b479 100644 --- a/plug-ins/jpeg/jpeg-load.c +++ b/plug-ins/jpeg/jpeg-load.c @@ -737,7 +737,7 @@ load_image (gchar *filename, if ((infile = fopen (filename, "rb")) == NULL) { - g_warning (_("can't open \"%s\"\n"), filename); + g_message (_("can't open \"%s\"\n"), filename); gimp_quit (); } diff --git a/plug-ins/jpeg/jpeg-load.h b/plug-ins/jpeg/jpeg-load.h index 44aa128808..1416a7b479 100644 --- a/plug-ins/jpeg/jpeg-load.h +++ b/plug-ins/jpeg/jpeg-load.h @@ -737,7 +737,7 @@ load_image (gchar *filename, if ((infile = fopen (filename, "rb")) == NULL) { - g_warning (_("can't open \"%s\"\n"), filename); + g_message (_("can't open \"%s\"\n"), filename); gimp_quit (); } diff --git a/plug-ins/jpeg/jpeg-save.c b/plug-ins/jpeg/jpeg-save.c index 44aa128808..1416a7b479 100644 --- a/plug-ins/jpeg/jpeg-save.c +++ b/plug-ins/jpeg/jpeg-save.c @@ -737,7 +737,7 @@ load_image (gchar *filename, if ((infile = fopen (filename, "rb")) == NULL) { - g_warning (_("can't open \"%s\"\n"), filename); + g_message (_("can't open \"%s\"\n"), filename); gimp_quit (); } diff --git a/plug-ins/jpeg/jpeg-save.h b/plug-ins/jpeg/jpeg-save.h index 44aa128808..1416a7b479 100644 --- a/plug-ins/jpeg/jpeg-save.h +++ b/plug-ins/jpeg/jpeg-save.h @@ -737,7 +737,7 @@ load_image (gchar *filename, if ((infile = fopen (filename, "rb")) == NULL) { - g_warning (_("can't open \"%s\"\n"), filename); + g_message (_("can't open \"%s\"\n"), filename); gimp_quit (); } diff --git a/plug-ins/jpeg/jpeg.c b/plug-ins/jpeg/jpeg.c index 44aa128808..1416a7b479 100644 --- a/plug-ins/jpeg/jpeg.c +++ b/plug-ins/jpeg/jpeg.c @@ -737,7 +737,7 @@ load_image (gchar *filename, if ((infile = fopen (filename, "rb")) == NULL) { - g_warning (_("can't open \"%s\"\n"), filename); + g_message (_("can't open \"%s\"\n"), filename); gimp_quit (); } diff --git a/plug-ins/jpeg/jpeg.h b/plug-ins/jpeg/jpeg.h index 44aa128808..1416a7b479 100644 --- a/plug-ins/jpeg/jpeg.h +++ b/plug-ins/jpeg/jpeg.h @@ -737,7 +737,7 @@ load_image (gchar *filename, if ((infile = fopen (filename, "rb")) == NULL) { - g_warning (_("can't open \"%s\"\n"), filename); + g_message (_("can't open \"%s\"\n"), filename); gimp_quit (); } diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc index 30cf57ce65..431278791b 100644 --- a/plug-ins/makefile.msc +++ b/plug-ins/makefile.msc @@ -1,3 +1,5 @@ +## 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. diff --git a/tips/Makefile.am b/tips/Makefile.am index ecef3253ef..43d1ea7205 100644 --- a/tips/Makefile.am +++ b/tips/Makefile.am @@ -15,5 +15,5 @@ tipsdata_DATA = \ gimp_tips.uk.txt \ gimp_tips.es.txt -EXTRA_DIST = $(tipsdata_DATA) - +EXTRA_DIST = $(tipsdata_DATA) \ + makefile.mingw diff --git a/tips/makefile.mingw b/tips/makefile.mingw new file mode 100644 index 0000000000..b07f0eac65 --- /dev/null +++ b/tips/makefile.mingw @@ -0,0 +1,43 @@ +DEST = /install/gimp + +UTF8TXT = $(addsuffix .utf8,$(basename $(wildcard *.*.txt))) + +all : $(UTF8TXT) + +install : all + for f in gimp_tips.txt $(UTF8TXT); do cp $$f $(DEST)/tips/`basename $$f .utf8`.txt; done + +.SUFFIXES: .utf8 + +%.cs.utf8: %.cs.txt + iconv -f ISO-8859-2 -t UTF-8 $< >$@ + +%.de.utf8: %.de.txt + iconv -f ISO-8859-1 -t UTF-8 $< >$@ + +%.es.utf8: %.es.txt + iconv -f ISO-8859-1 -t UTF-8 $< >$@ + +%.fr.utf8: %.fr.txt + iconv -f ISO-8859-1 -t UTF-8 $< >$@ + +%.it.utf8: %.it.txt + iconv -f ISO-8859-1 -t UTF-8 $< >$@ + +%.ja.utf8: %.ja.txt + iconv -f EUC-JP -t UTF-8 $< >$@ + +%.ko.utf8: %.ko.txt + iconv -f EUC-KR -t UTF-8 $< >$@ + +%.pl.utf8: %.pl.txt + iconv -f ISO-8859-2 -t UTF-8 $< >$@ + +%.ru.utf8: %.ru.txt + iconv -f KOI8-R -t UTF-8 $< >$@ + +%.uk.utf8: %.uk.txt + iconv -f KOI8-U -t UTF-8 $< >$@ + +clean: + -rm *.utf8