From cd31cdd7ebfd7ab45dfffa5713a8c85b290bf0a1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 1 Sep 2003 00:13:08 +0000 Subject: [PATCH] Update. 2003-09-01 Tor Lillqvist * README.win32: Update. * app/composite/gimp-composite-mmx.c: For some reason the gcc&gas combination used on Win32 wants identifiers prefixed with underscores in the asm sequences. * plug-ins/common/ps.c (ps_open): [Win32] Don't write the gs executable name into the indirect command line file. Do write the quoted form of the filename to it. (my_shell_quote): New funcion. Use instead of g_shell_quote() on Windows, as g_shell_quote() always uses single quotes, which don't mean anything to the Windows shell (or C runtime startup code). (This might be argued to be a bug in GLib, maybe g_shell_quote should behave differently accoring to platform.) * etc/gimprc.win32: Remove, generate with gimpconfig-dump. * */makefile.mingw.in: Remove, unmaintained. --- ChangeLog | 21 ++ README.win32 | 13 +- app/composite/gimp-composite-mmx.c | 21 +- app/makefile.mingw.in | 272 --------------------- etc/Makefile.am | 3 +- etc/gimprc.win32 | 363 ----------------------------- libgimp/makefile.mingw.in | 132 ----------- libgimpbase/makefile.mingw.in | 158 ------------- libgimpcolor/makefile.mingw.in | 158 ------------- libgimpmath/makefile.mingw.in | 158 ------------- libgimpwidgets/makefile.mingw.in | 158 ------------- modules/makefile.mingw.in | 68 ------ plug-ins/common/postscript.c | 40 +++- plug-ins/common/ps.c | 40 +++- 14 files changed, 120 insertions(+), 1485 deletions(-) delete mode 100644 app/makefile.mingw.in delete mode 100644 etc/gimprc.win32 delete mode 100644 libgimp/makefile.mingw.in delete mode 100644 libgimpbase/makefile.mingw.in delete mode 100644 libgimpcolor/makefile.mingw.in delete mode 100644 libgimpmath/makefile.mingw.in delete mode 100644 libgimpwidgets/makefile.mingw.in delete mode 100644 modules/makefile.mingw.in diff --git a/ChangeLog b/ChangeLog index 6e237609b3..38a36a1ea6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2003-09-01 Tor Lillqvist + + * README.win32: Update. + + * app/composite/gimp-composite-mmx.c: For some reason the gcc&gas + combination used on Win32 wants identifiers prefixed with + underscores in the asm sequences. + + * plug-ins/common/ps.c (ps_open): [Win32] Don't write the gs + executable name into the indirect command line file. Do write the + quoted form of the filename to it. + (my_shell_quote): New funcion. Use instead of g_shell_quote() on + Windows, as g_shell_quote() always uses single quotes, which don't + mean anything to the Windows shell (or C runtime startup + code). (This might be argued to be a bug in GLib, maybe + g_shell_quote should behave differently accoring to platform.) + + * etc/gimprc.win32: Remove, generate with gimpconfig-dump. + + * */makefile.mingw.in: Remove, unmaintained. + 2003-09-01 Sven Neumann * app/xcf/xcf-load.c: removed excessive path debugging output. diff --git a/README.win32 b/README.win32 index 26a06ab484..ae67861b0f 100644 --- a/README.win32 +++ b/README.win32 @@ -5,13 +5,18 @@ packages, though. Building GIMP on Win32 ====================== -There are two ways to build GIMP for Win32: +There are two ways to build GIMP on Win32: 1) Use the autoconf-generated configure script, and the resulting Makefiles (which use libtool and gcc to do the compilation). I use -this myself, but it might be hell to setup correctly. Doesn't work -correctly in all directories, for instance in the po* directories it -is much easier to use the makefile.mingw files. +this myself. + +Unfortunately, this doesn't work 100% correctly in all +directories. For instance in plug-ins/common there is some problems +with the optional plug-ins, for instance "png". The generated Makefile +wants to make just png (no .exe), and then tries to compile it without +any of the relevant -I and -D flags, which of course fails. You have +to explicitly make png.exe. 2) Use the Microsoft compiler, cl and Make, nmake. Say nmake -f makefile.msc in various directories. These makefiles are maintained by diff --git a/app/composite/gimp-composite-mmx.c b/app/composite/gimp-composite-mmx.c index 3082f08ce7..3299dd7f24 100644 --- a/app/composite/gimp-composite-mmx.c +++ b/app/composite/gimp-composite-mmx.c @@ -174,6 +174,15 @@ const static unsigned long va8_alpha_mask[2] = { 0xFF00FF00, 0xFF00FF00 }; const static unsigned long va8_b255[2] = { 0xFFFFFFFF, 0xFFFFFFFF }; const static unsigned long va8_w1[2] = { 0x00010001, 0x00010001 }; const static unsigned long va8_w255[2] = { 0x00FF00FF, 0x00FF00FF }; + +#ifdef __MINGW32__ +#define RGBA8_ALPHA_MASK "_rgba8_alpha_mask" +#define RGBA8_W256 "_rgba8_w256" +#else +#define RGBA8_ALPHA_MASK "rgba8_alpha_mask" +#define RGBA8_W256 "rgba8_w256" +#endif + /* * */ @@ -530,7 +539,7 @@ gimp_composite_dodge_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op) "\tpunpcklbw %%mm2, %%mm3\n" "\tpunpcklbw %%mm0, %%mm2\n" - "\tmovq rgba8_w256, %%mm4\n" + "\tmovq "RGBA8_W256", %%mm4\n" "\tpsubw %%mm3, %%mm4\n" "\t" pdivwuqX(mm2,mm4,mm5) "\n" @@ -540,14 +549,14 @@ gimp_composite_dodge_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op) "\tpunpckhbw %%mm2, %%mm3\n" "\tpunpckhbw %%mm0, %%mm2\n" - "\tmovq rgba8_w256, %%mm4\n" + "\tmovq "RGBA8_W256", %%mm4\n" "\tpsubw %%mm3, %%mm4\n" "\t" pdivwuqX(mm2,mm4,mm6) "\n" "\tpackuswb %%mm6, %%mm5\n" - "\tmovq rgba8_alpha_mask, %%mm6\n" + "\tmovq "RGBA8_ALPHA_MASK", %%mm6\n" "\tmovq %%mm1,%%mm7\n" "\t" pminub(mm0,mm7,mm2) "\n" "\tpand %%mm6, %%mm7\n" @@ -569,7 +578,7 @@ gimp_composite_dodge_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op) "\tpunpcklbw %%mm2, %%mm3\n" "\tpunpcklbw %%mm0, %%mm2\n" - "\tmovq rgba8_w256, %%mm4\n" + "\tmovq "RGBA8_W256", %%mm4\n" "\tpsubw %%mm3, %%mm4\n" "\t" pdivwuqX(mm2,mm4,mm5) "\n" @@ -579,14 +588,14 @@ gimp_composite_dodge_rgba8_rgba8_rgba8_mmx (GimpCompositeContext *_op) "\tpunpckhbw %%mm2, %%mm3\n" "\tpunpckhbw %%mm0, %%mm2\n" - "\tmovq rgba8_w256, %%mm4\n" + "\tmovq "RGBA8_W256", %%mm4\n" "\tpsubw %%mm3, %%mm4\n" "\t" pdivwuqX(mm2,mm4,mm6) "\n" "\tpackuswb %%mm6, %%mm5\n" - "\tmovq rgba8_alpha_mask, %%mm6\n" + "\tmovq "RGBA8_ALPHA_MASK", %%mm6\n" "\tmovq %%mm1,%%mm7\n" "\t" pminub(mm0,mm7,mm2) "\n" "\tpand %%mm6, %%mm7\n" diff --git a/app/makefile.mingw.in b/app/makefile.mingw.in deleted file mode 100644 index 7aa9bde3b6..0000000000 --- a/app/makefile.mingw.in +++ /dev/null @@ -1,272 +0,0 @@ -################################ -# -# Seriously out-of-date. Only Unix-style build supported now for gcc on Win32. -# -################################ - - - - - -## 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_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 \ - resolution_calibrate.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/etc/Makefile.am b/etc/Makefile.am index 62a9c8dc0c..3f57c42f2b 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -9,5 +9,4 @@ gimpsysconf_DATA = \ sessionrc EXTRA_DIST = \ - $(gimpsysconf_DATA) \ - gimprc.win32 + $(gimpsysconf_DATA) diff --git a/etc/gimprc.win32 b/etc/gimprc.win32 deleted file mode 100644 index 01177d3343..0000000000 --- a/etc/gimprc.win32 +++ /dev/null @@ -1,363 +0,0 @@ -# This is the system-wide gimprc file. Any change made in this file -# will affect all users of this system, provided that they are not -# overriding the default values in their personal gimprc file. -# -# Lines that start with a '#' are comments. -# Blank lines are ignored. - -# The variable gimp_dir refers to your personal gimp directory. It is -# set to either the value _gimp1.2 or the value of the environment -# variable GIMP_DIRECTORY. If the path in gimp_dir is relative, it is -# considered relative to your home directory (value of environment -# variable %HOME%, or %HOMEDRIVE%:%HOMEPATH%). If you don't have a -# home directory (typical on Windows systems), gimp_dir refers to -# directory in the GIMP installation directory. - -# The variable gimp_install_dir is set to the directory where the gimp -# was installed. - -(exec_prefix "${gimp_install_dir}\\bin") -(gimp_data_dir "${gimp_install_dir}") -(gimp_plugin_dir "${gimp_install_dir}") - -# Set the temporary storage directory...files will appear here -# during the course of running the gimp. Most files will disappear -# when the gimp exits, but some files are likely to remain, -# such as working palette files, so it is best if this directory -# not be one that is shared by other users or is cleared on machine -# reboot such as /tmp. -(temp-path "${TEMP}") - -# Set the swap file location. The gimp uses a tile based memory -# allocation scheme. The swap file is used to quickly and easily -# swap files out to disk and back in. Be aware that the swap file -# can easily get very large if the gimp is used with large images. -# Also, things can get horribly slow if the swap file is created on -# a directory that is mounted over NFS. For these reasons, it may -# be desirable to put your swap file in "/tmp". -(swap-path "${TEMP}") - -# Set the brush search path...this path will be searched for valid -# brushes at startup. -(brush-path "${gimp_dir}\\brushes;${gimp_data_dir}\\brushes") - -# Set the generated brush search path...this path will be searched for valid -# generated brushes at startup. -(brush-vbr-path "${gimp_dir}\\generated_brushes") - -# Specify a default brush. If none is specified it defaults to the -# "1circle.gbr" brush which is just a single pixel sized brush. -# The brush is searched for in the brush path. -(default-brush "Circle (19)") - -# Set the pattern search path...this path will be searched for valid -# patterns at startup. -(pattern-path "${gimp_dir}\\patterns;${gimp_data_dir}\\patterns") - -# Specify a default pattern. -# The pattern is searched for in the specified pattern paths. -(default-pattern "Pine?") - -# Set the palette search path...this path will be searched for valid -# palettes at startup. -(palette-path "${gimp_dir}\\palettes;${gimp_data_dir}\\palettes") - -# Specify a default palette. -# The pattern is searched for in the specified pattern paths. -(default-palette "Default") - -# Set the gradient search path...this path will be searched for valid -# gradients at startup. -(gradient-path "${gimp_dir}\\gradients;${gimp_data_dir}\\gradients") - -# Specify a default gradient. -# The gradient is searched for in the specified gradient paths. -(default-gradient "German_flag_smooth") - -# Set the plug-in search path...this path will be searched for -# plug-ins when the plug-in is run. -(plug-in-path "${gimp_dir}\\plug-ins;${gimp_plugin_dir}\\plug-ins") - -# Set the path for the script-fu plug-in. This value is ignored by -# the GIMP if the script-fu plug-in is never run. -(script-fu-path "${gimp_dir}\\scripts;${gimp_data_dir}\\scripts") - -# Set the path to modules that are to be initialized at startup -(module-path "${gimp_dir}\\modules;${gimp_plugin_dir}\\modules") - -# Specify a theme for the GUI. If none is specified it defaults to "Default" -(theme "Default") - -# Set the theme path. -(theme-path "${gimp_dir}\\themes;${gimp_data_dir}\\themes") - -# The tile cache is used to make sure the gimp doesn't thrash -# tiles between memory and disk. Setting this value higher will -# cause the gimp to use less swap space, but will also cause -# the gimp to use more memory. Conversely, a smaller cache size -# causes the gimp to use more swap space and less memory. -# Note: the gimp will still run even if `tile-cache-size' is -# set to 0. The actual size can contain a suffix of 'm', 'M', -# 'k', 'K', 'b' or 'B', which makes the gimp interpret the -# size as being specified in megabytes, kilobytes and bytes -# respectively. If no suffix is specified the size defaults to -# being specified in kilobytes. -(tile-cache-size 32m) - -# Speed of marching ants in the selection outline -# this value is in milliseconds -# (less time indicates faster marching) -(marching-ants-speed 300) - -# Set the number of operations kept on the undo stack -(undo-levels 5) - -# Set the minimal number of colors for dithering on 8-bit displays. -# If the GIMP cannot allocate at least this number of colors, a -# private colormap will be allocated, resulting in colormap "flashing". -# The default value of 144 corresponds to a "color cube" of 6*6*4 colors -# where the 3 values stand for shades of red, green and blue. -# Multiplying the # of shades of each primary color yields -# the total number of colors that will be allocated for the -# GIMP colormap. -# This number must not exceed 256. Most of the colors remaining after -# the allocation of the colorcube will be left to the system palette -# in an effort to reduce colormap "flashing". -# Note that setting this value to something higher than 216 (6*6*6) -# will not work with Gtk versions lower than 1.2.8. -(min-colors 144) - -# Install a private GIMP colormap by default -- only for 8-bit displays -# (install-colormap) - -# Specify that marching ants for selected regions will be drawn -# with colormap cycling as oposed to redrawing with different stipple masks -# this color cycling option works only with 8-bit displays -# (colormap-cycling) - -# Tools such as fuzzy-select and bucket fill find regions based on a -# seed-fill algorithm. The seed fill starts at the intially selected -# pixel and progresses in all directions until the difference of pixel -# intensity from the original is greater than a specified threshold -# ==> This value represents the default threshold -(default-threshold 15) - -# There is always a tradeoff between memory usage and speed. In most -# cases, the GIMP opts for speed over memory. However, if memory is -# a big issue, set stingy-memory-use -# (stingy-memory-use) - -# When zooming into and out of images, this option enables the -# automatic resizing of windows -# (resize-windows-on-zoom) - -# When the physical size of the image changes, this option enables the -# automatic resizing of windows -# (resize-windows-on-resize) - -# Context-dependent cursors are cool. They are enabled by default. -# However, they require overhead that you may want to do without. -# Uncomment this line to disable them. -# (no-cursor-updating) - -# Layer preview sizes (also used for the Undo History): -# none: no previews in layers dialog/layer selector -# tiny: 24x24 -# small: 32x32 -# medium: 48x48 -# large: 64x64 -# huge: 128x128 -# #: #x# -(preview-size small) - -# Navigation window preview sizes: -# small: 48x48 -# medium: 80x80 -# large: 112x112 -# #: #x# -(nav-preview-size large) - - -# Tooltips -# Comment this out to disable the tooltips in the toolbox -# (dont-show-tool-tips) - -# Help System -# Comment this out to disable context-sensitive help with F1 key -# (dont-use-help) - -# Controlling ruler visibility -# The default behavior is for rulers to be ON. -# This can also be toggled with the View->Toggle Rulers command -# or shift+control+r -# (dont-show-rulers) - -# Controlling statusbar visibility -# The default behavior is to show the statusbar. -# This can also be toggled with the View->Toggle Statusbar command -# or shift+control+s -# (dont-show-statusbar) - -# Default units -# This is the default unit of a new image. It will appear in the -# File/New dialog and will be the unit for coordinate display when -# dot-for-dot is off. -# The default units can be one of: -# (inches millimeters points picas) plus those in your user units database -# The default is inches -(default-units inches) - -# Default Resolution units -# This is used to specify the resolution of a new image -# The units for the resolution can be one of: -# (inches millimeters points picas) plus those in your user units database -# The default is inches -(default-resolution-units inches) - -# Default Resolution -# This is the default resolution of a new image in dpi -# The default is 72.0 dpi in both x and y direction -(default-xresolution 72.0) -(default-yresolution 72.0) - -# Disable auto saving -# Auto saving is not yet implemented! Nothing will be auto-saved, no matter -# how you set this here. -# Just uncomment the line below... -# (dont-auto-save) - -# Disable confirmation before closing an image without saving -# Just uncomment the next line -# (dont-confirm-on-close) - -# By default GIMP remembers the positions and sizes of the main dialogs and -# advices your window-manager to place them there again the next time you -# use the GIMP. To disable this behaviour, uncomment the line below... -# (dont-save-session-info) - -# Session managment -# To let GIMP try to restore your last saved session, -# just uncomment the line below... -(always-restore-session) - -# Setting the level of interpolation -# Uncommenting this line will enable cubic interpolation. -# By default, GIMP uses linear interpolation, which is faster, but -# has poorer quality -# (cubic-interpolation) - -# Set the gamma correction values for the display -# 1.0 corresponds to no gamma correction. For most displays, -# gamma correction should be set to between 2.0 and 2.6 -# Run the utility "gamma_correct" to determine appropriate values -# for your display. -# -# One important item to keep in mind: Many images that you might -# get from outside sources will in all likelihood already be -# gamma-corrected. In these cases, the image will look washed-out -# if the gimp has gamma-correction turned on. If you are going -# to work with images of this sort, turn gamma correction off -# by removing this line, or setting the values to 1.0. -# gamma-correction 1.0 -# gamma-correction 2.0 -# -(gamma-correction 1.0) - -# Set the manner in which transparency is displayed in images -# Transparency type can be one of: -# 0: Light Checks -# 1: Mid-Tone Checks -# 2: Dark Checks -# 3: White Only -# 4: Gray Only -# 5: Black Only -# Check size can be one of: -# 0: Small -# 1: Medium -# 2: Large -(transparency-type 1) -(transparency-size 2) - -# This string sets how image window titles are formatted. -# The following percent expansions are performed: -# %% literal percent sign -# %f bare filename, or "Untitled" -# %F full path to file -# %p PDB image id -# %i view instance number -# %t image type (RGB, indexed, greyscale) -# %z zoom factor as a percentage -# %s source scale factor -# %d destination scale factor -# %Dx expands to x if the image is dirty -# %Cx expands to x if the image is clean -# %m memory used by the image -# %l the number of layers -# %L the name of the active layer/channel -# %w image width in pixels -# %W image width in real-world units -# %h image height in pixels -# %H image height in real-world units -# %u unit symbol -# %U unit abbreviation -# See gimprc(5) for further details. -(image-title-format "%D*%f-%p.%i (%t) %z%%") - -# This string sets how image window status bars are formatted. -# See image-title-format for the list of performed percent expansions. -(image-status-format "%D*%f-%p.%i (%t) %z%%") - -# Global paint options -# By default options for the paint tools are local, e.g. all paint tools -# use the options you specify in their tool options dialog. If you wish -# to have global settings in the brushes dialog that affect all paint tools, -# you can change this by uncommenting the next line. -# (global-paint-options) - -# Maximal new image size -# To prevent mistakes Gimp will warn you if you try to create a very large -# image. The default maximum memory consumption of the new image that -# triggers the warning is 32MB. -(max-new-image-size 32M) - -# Trust dirty flag -# Gimp tries to keep track of changes to an image. If you trust this -# behaviour, nothing will happen if you save an unchanged image. By default -# this is turned off. -# Just uncomment the following line if you trust the dirty flag. -# (trust-dirty-flag) - -# Perfect mouse tracking -# GIMP attempts to keep up with the motion of the pointer when -# painting, but when a painting operation is particularly CPU -# intensive the GIMP will miss the subtlety of your painting -# motion and render overly-angular strokes. Enabling 'perfect -# mouse tracking' allows GIMP to track your painting motion -# more evenly, at the expense of lagging behind your brush at -# times of CPU stress. -(perfect-mouse yes) - -# Help browser -# Determines which program to use as browser for the GIMP help pages. -# The only possible value on Win32 is "netscape" which will show -# the help pages using your default web browser. -(help-browser netscape) - -# Fractalexplorer path -# This path will be searched for fractals when you use the Fractalexplorer -# plug-in. -(fractalexplorer-path "${gimp_dir}\\fractalexplorer;${gimp_data_dir}\\fractalexplorer") - -# Gfig search path -# This path will be searched for Gfig figures when you use the Gfig plug-in. -(gfig-path "${gimp_dir}\\gfig;${gimp_data_dir}\\gfig") - -# GFlare path -# This path will be searched for gflares when you use the GFlare plug-in. -(gflare-path "${gimp_dir}\\gflare;${gimp_data_dir}\\gflare") - -# Gimpressionist path -# This path will be searched for data when you use the Gimpressionist plug-in. -(gimpressionist-path "${gimp_dir}\\gimpressionist;${gimp_data_dir}\\gimpressionist") - -# [end of file] diff --git a/libgimp/makefile.mingw.in b/libgimp/makefile.mingw.in deleted file mode 100644 index eca993f3a2..0000000000 --- a/libgimp/makefile.mingw.in +++ /dev/null @@ -1,132 +0,0 @@ -################################ -# -# Seriously out-of-date. Only Unix-style build supported now for gcc on Win32. -# -################################ - - - - - -## 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 \ - gimpparasite.o \ - gimpparasiteio.o \ - gimpprotocol.o \ - gimputils.o \ - gimpwire.o - -libgimpi.a : $(gimpi_OBJECTS) - ar cr libgimpi.a $(gimpi_OBJECTS) - -gimp_OBJECTS = \ - gimp.o \ - $(PDB_WRAPPERS_O) \ - gimpchannel.o \ - gimpdrawable.o \ - gimpenv.o \ - gimpgradientselect.o \ - gimphelp.o \ - gimpimage.o \ - gimplayer.o \ - gimpparasite.o \ - gimpparasiteio.o \ - gimppixelrgn.o \ - gimpproceduraldb.o \ - gimpprotocol.o \ - gimpselection.o \ - gimptile.o \ - gimpunit.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 \ - gimpexport.o \ - gimpgradientmenu.o \ - gimppatternmenu.o \ - gimpui.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/libgimpbase/makefile.mingw.in b/libgimpbase/makefile.mingw.in deleted file mode 100644 index 1695bb7f5f..0000000000 --- a/libgimpbase/makefile.mingw.in +++ /dev/null @@ -1,158 +0,0 @@ -################################ -# -# Seriously out-of-date. Only Unix-style build supported now for gcc on Win32. -# -################################ - - - - - -## 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=\"LibGimpBase\" - -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/libgimpcolor/makefile.mingw.in b/libgimpcolor/makefile.mingw.in deleted file mode 100644 index 88cdf9fb32..0000000000 --- a/libgimpcolor/makefile.mingw.in +++ /dev/null @@ -1,158 +0,0 @@ -################################ -# -# Seriously out-of-date. Only Unix-style build supported now for gcc on Win32. -# -################################ - - - - - -## 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/libgimpmath/makefile.mingw.in b/libgimpmath/makefile.mingw.in deleted file mode 100644 index 88cdf9fb32..0000000000 --- a/libgimpmath/makefile.mingw.in +++ /dev/null @@ -1,158 +0,0 @@ -################################ -# -# Seriously out-of-date. Only Unix-style build supported now for gcc on Win32. -# -################################ - - - - - -## 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/libgimpwidgets/makefile.mingw.in b/libgimpwidgets/makefile.mingw.in deleted file mode 100644 index 88cdf9fb32..0000000000 --- a/libgimpwidgets/makefile.mingw.in +++ /dev/null @@ -1,158 +0,0 @@ -################################ -# -# Seriously out-of-date. Only Unix-style build supported now for gcc on Win32. -# -################################ - - - - - -## 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/modules/makefile.mingw.in b/modules/makefile.mingw.in deleted file mode 100644 index e8f1b43fb8..0000000000 --- a/modules/makefile.mingw.in +++ /dev/null @@ -1,68 +0,0 @@ -################################ -# -# Seriously out-of-date. Only Unix-style build supported now for gcc on Win32. -# -################################ - - - - - -## 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. -BIN = /install/gimp/modules - -TOP = ../.. - -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 - -MODULES = \ - colorsel_gtk-$(GIMP_VER).dll \ - colorsel_triangle-$(GIMP_VER).dll \ - colorsel_water-$(GIMP_VER).dll - -all : \ - $(MODULES) - -install : all - for m in $(MODULES); do $(INSTALL) $$m $(BIN); done - -../config.h : ../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) - -colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.o module.def - $(GLIB)/build-dll colorsel_triangle $(GIMP_VER) module.def colorsel_triangle.o $(LDFLAGS) -L ../app -lgimp $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) - -colorsel_water-$(GIMP_VER).dll : colorsel_water.o module.def - $(GLIB)/build-dll colorsel_water $(GIMP_VER) module.def colorsel_water.o $(LDFLAGS) -L ../app -lgimp $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) - -## cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.o module.def -## $(GLIB)/build-dll cdisplay_gamma $(GIMP_VER) module.def cdisplay_gamma.o $(LDFLAGS) -L ../app -lgimp -L ../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) - -## 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/plug-ins/common/postscript.c b/plug-ins/common/postscript.c index 695f74e8c7..94afdfc1e9 100644 --- a/plug-ins/common/postscript.c +++ b/plug-ins/common/postscript.c @@ -255,6 +255,10 @@ static void dither_grey (guchar *grey, gint linecount); +#ifdef G_OS_WIN32 +static gchar *my_shell_quote (const gchar *unquoted_string); +#endif + /* Dialog-handling */ static gint load_dialog (void); @@ -1365,7 +1369,14 @@ ps_open (const gchar *filename, if (gs == NULL) gs = DEFAULT_GS_PROG; +#ifndef G_OS_WIN32 + /* g_shell_quote is specified to use single quotes, which don't mean + * anything on Windows + */ quoted_fn = g_shell_quote (filename); +#else + quoted_fn = my_shell_quote (filename); +#endif gs_opts = getenv ("GS_OPTIONS"); if (gs_opts == NULL) @@ -1423,11 +1434,11 @@ ps_open (const gchar *filename, indirfile = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "i%lx", g_get_tmp_dir (), getpid ()); indf = fopen (indirfile, "w"); - fprintf (indf, "%s -sDEVICE=%s -r%d %s%s%s-q -dNOPAUSE %s " + fprintf (indf, "-sDEVICE=%s -r%d %s%s%s-q -dNOPAUSE %s " "-sOutputFile=%s %s-f %s %s-c quit\n", - gs, driver, resolution, geometry, + driver, resolution, geometry, TextAlphaBits, GraphicsAlphaBits, - gs_opts, pnmfile, offset, filename, + gs_opts, pnmfile, offset, quoted_fn, *is_epsf ? "-c showpage " : ""); sprintf (cmd, "%s @%s", gs, indirfile); fclose (indf); @@ -3052,3 +3063,26 @@ save_unit_toggle_update (GtkWidget *widget, } } } + +#ifdef G_OS_WIN32 + +static gchar * +my_shell_quote (const gchar *unquoted_string) +{ + /* On Windows, we always enclose the file name with double + * quotes. No more is needed, as file names can't contain double + * quotes. + */ + GString *dest; + gchar *ret; + + dest = g_string_new ("\""); + g_string_append (dest, unquoted_string); + g_string_append_c (dest, '"'); + + ret = dest->str; + g_string_free (dest, FALSE); + return ret; +} + +#endif /* G_OS_WIN32 */ diff --git a/plug-ins/common/ps.c b/plug-ins/common/ps.c index 695f74e8c7..94afdfc1e9 100644 --- a/plug-ins/common/ps.c +++ b/plug-ins/common/ps.c @@ -255,6 +255,10 @@ static void dither_grey (guchar *grey, gint linecount); +#ifdef G_OS_WIN32 +static gchar *my_shell_quote (const gchar *unquoted_string); +#endif + /* Dialog-handling */ static gint load_dialog (void); @@ -1365,7 +1369,14 @@ ps_open (const gchar *filename, if (gs == NULL) gs = DEFAULT_GS_PROG; +#ifndef G_OS_WIN32 + /* g_shell_quote is specified to use single quotes, which don't mean + * anything on Windows + */ quoted_fn = g_shell_quote (filename); +#else + quoted_fn = my_shell_quote (filename); +#endif gs_opts = getenv ("GS_OPTIONS"); if (gs_opts == NULL) @@ -1423,11 +1434,11 @@ ps_open (const gchar *filename, indirfile = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "i%lx", g_get_tmp_dir (), getpid ()); indf = fopen (indirfile, "w"); - fprintf (indf, "%s -sDEVICE=%s -r%d %s%s%s-q -dNOPAUSE %s " + fprintf (indf, "-sDEVICE=%s -r%d %s%s%s-q -dNOPAUSE %s " "-sOutputFile=%s %s-f %s %s-c quit\n", - gs, driver, resolution, geometry, + driver, resolution, geometry, TextAlphaBits, GraphicsAlphaBits, - gs_opts, pnmfile, offset, filename, + gs_opts, pnmfile, offset, quoted_fn, *is_epsf ? "-c showpage " : ""); sprintf (cmd, "%s @%s", gs, indirfile); fclose (indf); @@ -3052,3 +3063,26 @@ save_unit_toggle_update (GtkWidget *widget, } } } + +#ifdef G_OS_WIN32 + +static gchar * +my_shell_quote (const gchar *unquoted_string) +{ + /* On Windows, we always enclose the file name with double + * quotes. No more is needed, as file names can't contain double + * quotes. + */ + GString *dest; + gchar *ret; + + dest = g_string_new ("\""); + g_string_append (dest, unquoted_string); + g_string_append_c (dest, '"'); + + ret = dest->str; + g_string_free (dest, FALSE); + return ret; +} + +#endif /* G_OS_WIN32 */