dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to match Unix version. 

2000-05-29  Tor Lillqvist  <tml@iki.fi>

* gimprc.win32: Update to match Unix version.

* app/gimp.sym: Add dialog_{,un}register.

* app/dialog_handler.c: Include <gmodule.h>, mark above functions
with G_MODULE_EXPORT.

* app/makefile.{msc,cygwin}: Update to match current GLib 1.3.

* libgimp/gimp.def
* libgimp/gimpui.def: Update according to function name changes etc.

* libgimp/makefile.{msc,cygwin}: Update for changed file
names.

* libgimp/makefile.cygwin
* modules/makefile.cygwin: Simplify, use the
../build/win32/make.mingw file.

* plug-ins/common/gz.c (save_image): Somewhat more informative
error message on Win32 when gzip.exe isn't found (most probable
cause of error).

* tips/gimp_tips.txt: Clarify location of personal GIMP directory
on Unix and Windows.
This commit is contained in:
Tor Lillqvist 2000-05-28 23:46:16 +00:00 committed by Tor Lillqvist
parent 30fb21f753
commit 2090f17620
15 changed files with 305 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ChangeLog
View File

@ -1,3 +1,31 @@
2000-05-29 Tor Lillqvist <tml@iki.fi>
* gimprc.win32: Update to match Unix version.
* app/gimp.sym: Add dialog_{,un}register.
* app/dialog_handler.c: Include <gmodule.h>, mark above functions
with G_MODULE_EXPORT.
* app/makefile.{msc,cygwin}: Update to match current GLib 1.3.
* libgimp/gimp.def
* libgimp/gimpui.def: Update according to function name changes etc.
* libgimp/makefile.{msc,cygwin}: Update for changed file
names.
* libgimp/makefile.cygwin
* modules/makefile.cygwin: Simplify, use the
../build/win32/make.mingw file.
* plug-ins/common/gz.c (save_image): Somewhat more informative
error message on Win32 when gzip.exe isn't found (most probable
cause of error).
* tips/gimp_tips.txt: Clarify location of personal GIMP directory
on Unix and Windows.
2000-05-29 Tuomas Kuosmanen <tigert@gimp.org> 2000-05-29 Tuomas Kuosmanen <tigert@gimp.org>
* plug-ins/gdyntext/gdyntext.c (gdt_get_values): We dont need to say * plug-ins/gdyntext/gdyntext.c (gdt_get_values): We dont need to say

4
app/dialog_handler.c
View File

@ -18,6 +18,8 @@
*/ */
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gmodule.h>
#include "cursorutil.h" #include "cursorutil.h"
#include "dialog_handler.h" #include "dialog_handler.h"
@ -192,6 +194,7 @@ dialog_unidle_all (void)
/* Register a dialog that we can handle */ /* Register a dialog that we can handle */
G_MODULE_EXPORT
void void
dialog_register (GtkWidget *dialog) dialog_register (GtkWidget *dialog)
{ {
@ -225,6 +228,7 @@ dialog_register_fileload (GtkWidget *dialog)
/* unregister dialog */ /* unregister dialog */
G_MODULE_EXPORT
void void
dialog_unregister (GtkWidget *dialog) dialog_unregister (GtkWidget *dialog)
{ {

2
app/gimp.sym
View File

@ -2,3 +2,5 @@ gimp_color_selector_register
gimp_color_selector_unregister gimp_color_selector_unregister
gimp_color_display_register gimp_color_display_register
gimp_color_display_unregister gimp_color_display_unregister
dialog_register
dialog_unregister

13
app/makefile.cygwin
View File

@ -30,8 +30,6 @@ INTL = ../../intl
CFLAGS = $(OPTIMIZE) -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)/gdk -I$(GTK) -I$(INTL) CFLAGS = $(OPTIMIZE) -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)/gdk -I$(GTK) -I$(INTL)
# GCG = ../tools/gcg/gcg -I. -I../tools/gcg/gh
all : \ all : \
../config.h \ ../config.h \
libgimpim.a \ libgimpim.a \
@ -251,11 +249,6 @@ gimp_OBJECTS = \
user_install.o \ user_install.o \
xcf.o xcf.o
# .SUFFIXES: .gc
# .gc.c:
# $(GCG) -o $@ $<
gimpres.o : gimp.rc wilber.ico gimpres.o : gimp.rc wilber.ico
windres gimp.rc gimpres.o windres gimp.rc gimpres.o
@ -265,11 +258,11 @@ gimp.def: gimp.sym
gimp.exe : ../config.h $(gimp_OBJECTS) libgimpim.a gimp.def gimpres.o gimp.exe : ../config.h $(gimp_OBJECTS) libgimpim.a gimp.def gimpres.o
# This is sickening. # This is sickening.
$(CC) $(CFLAGS) -Wl,--base-file,gimp.base -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -lgmodule-$(GLIB_VER) gimpres.o -lgdi32 -luser32 -lshell32 $(CC) $(CFLAGS) -Wl,--base-file,gimp.base -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -L $(GMODULE) -lgmodule-$(GLIB_VER) gimpres.o -lgdi32 -luser32 -lshell32
$(DLLTOOL) --base-file gimp.base --input-def gimp.def --output-exp gimp.exp $(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 -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -lgmodule-$(GLIB_VER) gimpres.o -lgdi32 -luser32 -lshell32 $(CC) $(CFLAGS) -Wl,--base-file,gimp.base,gimp.exp -o gimp.exe $(gimp_OBJECTS) -L . -lgimpim -L ../libgimp -lgimpi -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -L $(GMODULE) -lgmodule-$(GLIB_VER) gimpres.o -lgdi32 -luser32 -lshell32
$(DLLTOOL) --base-file gimp.base --input-def gimp.def --output-exp gimp.exp $(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 -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -lgmodule-$(GLIB_VER) gimpres.o -lgdi32 -luser32 -lshell32 $(CC) $(CFLAGS) -Wl,gimp.exp -o gimp.exe $(gimp_OBJECTS) -L. -lgimpim -L ../libgimp -lgimpi -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -L $(GMODULE) -lgmodule-$(GLIB_VER) gimpres.o -lgdi32 -luser32 -lshell32
$(DLLTOOL) --dllname gimp.exe gimp.def --output-lib libgimp.a $(gimp_OBJECTS) $(DLLTOOL) --dllname gimp.exe gimp.def --output-lib libgimp.a $(gimp_OBJECTS)
.SUFFIXES: .c .o .i .SUFFIXES: .c .o .i

7
app/makefile.msc
View File

@ -37,8 +37,6 @@ INTL = ..\..\intl
CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL) CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL)
# GCG = ..\tools\gcg\gcg -I. -I ..\tools\gcg\gh
all : \ all : \
..\config.h \ ..\config.h \
gimpim.lib \ gimpim.lib \
@ -258,11 +256,6 @@ gimp_OBJECTS = \
user_install.obj \ user_install.obj \
xcf.obj xcf.obj
# .SUFFIXES: .gc
# .gc.c:
# $(GCG) -o $@ $<
gimp.res : gimp.rc wilber.ico gimp.res : gimp.rc wilber.ico
rc -r -fo gimp.res gimp.rc rc -r -fo gimp.res gimp.rc

139
etc/gimprc.win32
View File

@ -21,25 +21,30 @@
(gimp_plugin_dir "${gimp_install_dir}") (gimp_plugin_dir "${gimp_install_dir}")
# Set the temporary storage directory...files will appear here # Set the temporary storage directory...files will appear here
# during the course of running the gimp. Most files will disappear # during the course of running the gimp. Most files will disappear
# when the gimp exits, but some files are likely to remain, # when the gimp exits, but some files are likely to remain,
# such as working palette files, so it is best if this directory # such as working palette files, so it is best if this directory
# not be one that is shared by other users. # not be one that is shared by other users or is cleared on machine
# reboot such as /tmp.
(temp-path "${TEMP}") (temp-path "${TEMP}")
# Set the swap file location. The gimp uses a tile based memory # Set the swap file location. The gimp uses a tile based memory
# allocation scheme. The swap file is used to quickly and easily # 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 # 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. # 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 # Also, things can get horribly slow if the swap file is created on
# a directory that is shared over a network. For these reasons, it may # a directory that is mounted over NFS. For these reasons, it may
# be desirable to put your swap file in your %TEMP% directory. # be desirable to put your swap file in "/tmp".
(swap-path "${TEMP}") (swap-path "${TEMP}")
# Set the brush search path...this path will be searched for valid # Set the brush search path...this path will be searched for valid
# brushes at startup. # brushes at startup.
(brush-path "${gimp_dir}\\brushes;${gimp_data_dir}\\brushes") (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 # Specify a default brush. If none is specified it defaults to the
# "1circle.gbr" brush which is just a single pixel sized brush. # "1circle.gbr" brush which is just a single pixel sized brush.
# The brush is searched for in the brush path. # The brush is searched for in the brush path.
@ -55,7 +60,7 @@
# Set the palette search path...this path will be searched for valid # Set the palette search path...this path will be searched for valid
# palettes at startup. # palettes at startup.
(palette-path "${gimp_dir}\\palettes;${gimp_data_dir}\\palettes") (palette-path "${gimp_dir}\\palettes")
# Specify a default palette. # Specify a default palette.
# The pattern is searched for in the specified pattern paths. # The pattern is searched for in the specified pattern paths.
@ -71,7 +76,7 @@
# Set the plug-in search path...this path will be searched for # Set the plug-in search path...this path will be searched for
# plug-ins when the plug-in is run. # plug-ins when the plug-in is run.
(plug-in-path "${gimp_dir}\\plug-ins;${gimp_dir}\\plug-ins\\script-fu;${gimp_plugin_dir}\\plug-ins") (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 # 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. # the GIMP if the script-fu plug-in is never run.
@ -81,17 +86,17 @@
(module-path "${gimp_dir}\\modules;${gimp_plugin_dir}\\modules") (module-path "${gimp_dir}\\modules;${gimp_plugin_dir}\\modules")
# The tile cache is used to make sure the gimp doesn't thrash # The tile cache is used to make sure the gimp doesn't thrash
# tiles between memory and disk. Setting this value higher will # tiles between memory and disk. Setting this value higher will
# cause the gimp to use less swap space, but will also cause # cause the gimp to use less swap space, but will also cause
# the gimp to use more memory. Conversely, a smaller cache size # the gimp to use more memory. Conversely, a smaller cache size
# causes the gimp to use more swap space and less memory. # causes the gimp to use more swap space and less memory.
# Note: the gimp will still run even if `tile-cache-size' is # 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', # set to 0. The actual size can contain a suffix of 'm', 'M',
# 'k', 'K', 'b' or 'B', which makes the gimp interpret the # 'k', 'K', 'b' or 'B', which makes the gimp interpret the
# size as being specified in megabytes, kilobytes and bytes # size as being specified in megabytes, kilobytes and bytes
# respectively. If no suffix is specified the size defaults to # respectively. If no suffix is specified the size defaults to
# being specified in kilobytes. # being specified in kilobytes.
(tile-cache-size 10m) (tile-cache-size 32m)
# Speed of marching ants in the selection outline # Speed of marching ants in the selection outline
# this value is in milliseconds # this value is in milliseconds
@ -101,17 +106,22 @@
# Set the number of operations kept on the undo stack # Set the number of operations kept on the undo stack
(undo-levels 5) (undo-levels 5)
# Set the color-cube resource for dithering on 8-bit displays # Set the minimal number of colors for dithering on 8-bit displays.
# The 4 values stand for Shades of red, green, blue and grays # 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 # Multiplying the # of shades of each primary color yields
# the total number of colors that will be allocated from the # the total number of colors that will be allocated for the
# gimp colormap. This number should not exceed 256. Most of the # GIMP colormap.
# colors remaining after the allocation of the colorcube # This number must not exceed 256. Most of the colors remaining after
# will be left to the system palette in an effort to reduce # the allocation of the colorcube will be left to the system palette
# colormap "flashing". # 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) (min-colors 144)
# Install a GIMP colormap by default -- only for 8-bit displays # Install a private GIMP colormap by default -- only for 8-bit displays
# (install-colormap) # (install-colormap)
# Specify that marching ants for selected regions will be drawn # Specify that marching ants for selected regions will be drawn
@ -140,24 +150,44 @@
# Uncomment this line to disable them. # Uncomment this line to disable them.
# (no-cursor-updating) # (no-cursor-updating)
# Layer preview sizes: # Layer preview sizes (also used for the Undo History):
# none: no previews in layers dialog/layer selector # none: no previews in layers dialog/layer selector
# tiny: 24x24
# small: 32x32 # small: 32x32
# medium: 64x64 # medium: 48x48
# large: 128x128 # large: 64x64
# #: #x# # huge: 128x128
# #: #x#
(preview-size small) (preview-size small)
# Navigation window preview sizes:
# small: 48x48
# medium: 80x80
# large: 112x112
# #: #x#
(nav-preview-size large)
# Tooltips # Tooltips
# Comment this out to disable the tooltips in the toolbox # Comment this out to disable the tooltips in the toolbox
# (dont-show-tool-tips) # (dont-show-tool-tips)
# Help System
# Comment this out to disable context-sensitive help with F1 key
# (dont-use-help)
# Controlling ruler visibility # Controlling ruler visibility
# The default behavior is for rulers to be ON. # The default behavior is for rulers to be ON.
# This can also be toggled with the View->Toggle Rulers command # This can also be toggled with the View->Toggle Rulers command
# or shift+control+r # or shift+control+r
# (dont-show-rulers) # (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 # Default units
# This is the default unit of a new image. It will appear in the # 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 # File/New dialog and will be the unit for coordinate display when
@ -180,12 +210,6 @@
(default-xresolution 72.0) (default-xresolution 72.0)
(default-yresolution 72.0) (default-yresolution 72.0)
# 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)
# Disable auto saving # Disable auto saving
# Auto saving is not yet implemented! Nothing will be auto-saved, no matter # Auto saving is not yet implemented! Nothing will be auto-saved, no matter
# how you set this here. # how you set this here.
@ -201,13 +225,15 @@
# use the GIMP. To disable this behaviour, uncomment the line below... # use the GIMP. To disable this behaviour, uncomment the line below...
# (dont-save-session-info) # (dont-save-session-info)
# To let GIMP try to restore your last saved session, # Session managment
# uncomment the line below... # To let GIMP try to restore your last saved session,
# (always-restore-session) # just uncomment the line below...
(always-restore-session)
# Setting the level of interpolation # Setting the level of interpolation
# Uncommenting this line will enable cubic interpolation. # Uncommenting this line will enable cubic interpolation.
# By default, GIMP uses linear interpolation, which is faster, but has poorer quality # By default, GIMP uses linear interpolation, which is faster, but
# has poorer quality
# (cubic-interpolation) # (cubic-interpolation)
# Set the gamma correction values for the display # Set the gamma correction values for the display
@ -224,7 +250,7 @@
# by removing this line, or setting the values to 1.0. # by removing this line, or setting the values to 1.0.
# gamma-correction 1.0 # gamma-correction 1.0
# gamma-correction 2.0 # gamma-correction 2.0
# ___ #
(gamma-correction 1.0) (gamma-correction 1.0)
# Set the manner in which transparency is displayed in images # Set the manner in which transparency is displayed in images
@ -242,13 +268,10 @@
(transparency-type 1) (transparency-type 1)
(transparency-size 2) (transparency-size 2)
# gfig pattern directory
(gfig-path "${gimp_dir}\\gfig;${gimp_data_dir}\\gfig")
# This string sets how image window titles are formatted. # This string sets how image window titles are formatted.
# The following percent expansions are performed: # The following percent expansions are performed:
# %% literal percent sign # %% literal percent sign
# %f bare filename, or "Untiltled" # %f bare filename, or "Untitled"
# %F full path to file # %F full path to file
# %p PDB image id # %p PDB image id
# %i view instance number # %i view instance number
@ -256,7 +279,9 @@
# %z zoom factor as a percentage # %z zoom factor as a percentage
# %s source scale factor # %s source scale factor
# %d destination scale factor # %d destination scale factor
(image-title-format "%f-%p.%i (%t) %z%%") # %Dx expands to x if the image is dirty
# See gimprc(5) for further details.
(image-title-format "%D*%f-%p.%i (%t) %z%%")
# Global paint options # Global paint options
# By default options for the paint tools are local, e.g. all paint tools # By default options for the paint tools are local, e.g. all paint tools
@ -294,17 +319,21 @@
# the help pages using your default web browser. # the help pages using your default web browser.
(help-browser netscape) (help-browser netscape)
# 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")
# Fractalexplorer path # Fractalexplorer path
# This path will be searched for fractals when you use the Fractalexplorer # This path will be searched for fractals when you use the Fractalexplorer
# plug-in. # plug-in.
(fractalexplorer-path "${gimp_dir}\\fractalexplorer;${gimp_data_dir}\\fractalexplorer") (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 # GFlare path
# This path will be searched for gflares when you use the GFlare plug-in. # This path will be searched for gflares when you use the GFlare plug-in.
(gflare-path "${gimp_dir}\\gflare;${gimp_data_dir}\\gflare") (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] # [end of file]

139
gimprc.win32
View File

@ -21,25 +21,30 @@
(gimp_plugin_dir "${gimp_install_dir}") (gimp_plugin_dir "${gimp_install_dir}")
# Set the temporary storage directory...files will appear here # Set the temporary storage directory...files will appear here
# during the course of running the gimp. Most files will disappear # during the course of running the gimp. Most files will disappear
# when the gimp exits, but some files are likely to remain, # when the gimp exits, but some files are likely to remain,
# such as working palette files, so it is best if this directory # such as working palette files, so it is best if this directory
# not be one that is shared by other users. # not be one that is shared by other users or is cleared on machine
# reboot such as /tmp.
(temp-path "${TEMP}") (temp-path "${TEMP}")
# Set the swap file location. The gimp uses a tile based memory # Set the swap file location. The gimp uses a tile based memory
# allocation scheme. The swap file is used to quickly and easily # 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 # 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. # 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 # Also, things can get horribly slow if the swap file is created on
# a directory that is shared over a network. For these reasons, it may # a directory that is mounted over NFS. For these reasons, it may
# be desirable to put your swap file in your %TEMP% directory. # be desirable to put your swap file in "/tmp".
(swap-path "${TEMP}") (swap-path "${TEMP}")
# Set the brush search path...this path will be searched for valid # Set the brush search path...this path will be searched for valid
# brushes at startup. # brushes at startup.
(brush-path "${gimp_dir}\\brushes;${gimp_data_dir}\\brushes") (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 # Specify a default brush. If none is specified it defaults to the
# "1circle.gbr" brush which is just a single pixel sized brush. # "1circle.gbr" brush which is just a single pixel sized brush.
# The brush is searched for in the brush path. # The brush is searched for in the brush path.
@ -55,7 +60,7 @@
# Set the palette search path...this path will be searched for valid # Set the palette search path...this path will be searched for valid
# palettes at startup. # palettes at startup.
(palette-path "${gimp_dir}\\palettes;${gimp_data_dir}\\palettes") (palette-path "${gimp_dir}\\palettes")
# Specify a default palette. # Specify a default palette.
# The pattern is searched for in the specified pattern paths. # The pattern is searched for in the specified pattern paths.
@ -71,7 +76,7 @@
# Set the plug-in search path...this path will be searched for # Set the plug-in search path...this path will be searched for
# plug-ins when the plug-in is run. # plug-ins when the plug-in is run.
(plug-in-path "${gimp_dir}\\plug-ins;${gimp_dir}\\plug-ins\\script-fu;${gimp_plugin_dir}\\plug-ins") (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 # 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. # the GIMP if the script-fu plug-in is never run.
@ -81,17 +86,17 @@
(module-path "${gimp_dir}\\modules;${gimp_plugin_dir}\\modules") (module-path "${gimp_dir}\\modules;${gimp_plugin_dir}\\modules")
# The tile cache is used to make sure the gimp doesn't thrash # The tile cache is used to make sure the gimp doesn't thrash
# tiles between memory and disk. Setting this value higher will # tiles between memory and disk. Setting this value higher will
# cause the gimp to use less swap space, but will also cause # cause the gimp to use less swap space, but will also cause
# the gimp to use more memory. Conversely, a smaller cache size # the gimp to use more memory. Conversely, a smaller cache size
# causes the gimp to use more swap space and less memory. # causes the gimp to use more swap space and less memory.
# Note: the gimp will still run even if `tile-cache-size' is # 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', # set to 0. The actual size can contain a suffix of 'm', 'M',
# 'k', 'K', 'b' or 'B', which makes the gimp interpret the # 'k', 'K', 'b' or 'B', which makes the gimp interpret the
# size as being specified in megabytes, kilobytes and bytes # size as being specified in megabytes, kilobytes and bytes
# respectively. If no suffix is specified the size defaults to # respectively. If no suffix is specified the size defaults to
# being specified in kilobytes. # being specified in kilobytes.
(tile-cache-size 10m) (tile-cache-size 32m)
# Speed of marching ants in the selection outline # Speed of marching ants in the selection outline
# this value is in milliseconds # this value is in milliseconds
@ -101,17 +106,22 @@
# Set the number of operations kept on the undo stack # Set the number of operations kept on the undo stack
(undo-levels 5) (undo-levels 5)
# Set the color-cube resource for dithering on 8-bit displays # Set the minimal number of colors for dithering on 8-bit displays.
# The 4 values stand for Shades of red, green, blue and grays # 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 # Multiplying the # of shades of each primary color yields
# the total number of colors that will be allocated from the # the total number of colors that will be allocated for the
# gimp colormap. This number should not exceed 256. Most of the # GIMP colormap.
# colors remaining after the allocation of the colorcube # This number must not exceed 256. Most of the colors remaining after
# will be left to the system palette in an effort to reduce # the allocation of the colorcube will be left to the system palette
# colormap "flashing". # 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) (min-colors 144)
# Install a GIMP colormap by default -- only for 8-bit displays # Install a private GIMP colormap by default -- only for 8-bit displays
# (install-colormap) # (install-colormap)
# Specify that marching ants for selected regions will be drawn # Specify that marching ants for selected regions will be drawn
@ -140,24 +150,44 @@
# Uncomment this line to disable them. # Uncomment this line to disable them.
# (no-cursor-updating) # (no-cursor-updating)
# Layer preview sizes: # Layer preview sizes (also used for the Undo History):
# none: no previews in layers dialog/layer selector # none: no previews in layers dialog/layer selector
# tiny: 24x24
# small: 32x32 # small: 32x32
# medium: 64x64 # medium: 48x48
# large: 128x128 # large: 64x64
# #: #x# # huge: 128x128
# #: #x#
(preview-size small) (preview-size small)
# Navigation window preview sizes:
# small: 48x48
# medium: 80x80
# large: 112x112
# #: #x#
(nav-preview-size large)
# Tooltips # Tooltips
# Comment this out to disable the tooltips in the toolbox # Comment this out to disable the tooltips in the toolbox
# (dont-show-tool-tips) # (dont-show-tool-tips)
# Help System
# Comment this out to disable context-sensitive help with F1 key
# (dont-use-help)
# Controlling ruler visibility # Controlling ruler visibility
# The default behavior is for rulers to be ON. # The default behavior is for rulers to be ON.
# This can also be toggled with the View->Toggle Rulers command # This can also be toggled with the View->Toggle Rulers command
# or shift+control+r # or shift+control+r
# (dont-show-rulers) # (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 # Default units
# This is the default unit of a new image. It will appear in the # 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 # File/New dialog and will be the unit for coordinate display when
@ -180,12 +210,6 @@
(default-xresolution 72.0) (default-xresolution 72.0)
(default-yresolution 72.0) (default-yresolution 72.0)
# 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)
# Disable auto saving # Disable auto saving
# Auto saving is not yet implemented! Nothing will be auto-saved, no matter # Auto saving is not yet implemented! Nothing will be auto-saved, no matter
# how you set this here. # how you set this here.
@ -201,13 +225,15 @@
# use the GIMP. To disable this behaviour, uncomment the line below... # use the GIMP. To disable this behaviour, uncomment the line below...
# (dont-save-session-info) # (dont-save-session-info)
# To let GIMP try to restore your last saved session, # Session managment
# uncomment the line below... # To let GIMP try to restore your last saved session,
# (always-restore-session) # just uncomment the line below...
(always-restore-session)
# Setting the level of interpolation # Setting the level of interpolation
# Uncommenting this line will enable cubic interpolation. # Uncommenting this line will enable cubic interpolation.
# By default, GIMP uses linear interpolation, which is faster, but has poorer quality # By default, GIMP uses linear interpolation, which is faster, but
# has poorer quality
# (cubic-interpolation) # (cubic-interpolation)
# Set the gamma correction values for the display # Set the gamma correction values for the display
@ -224,7 +250,7 @@
# by removing this line, or setting the values to 1.0. # by removing this line, or setting the values to 1.0.
# gamma-correction 1.0 # gamma-correction 1.0
# gamma-correction 2.0 # gamma-correction 2.0
# ___ #
(gamma-correction 1.0) (gamma-correction 1.0)
# Set the manner in which transparency is displayed in images # Set the manner in which transparency is displayed in images
@ -242,13 +268,10 @@
(transparency-type 1) (transparency-type 1)
(transparency-size 2) (transparency-size 2)
# gfig pattern directory
(gfig-path "${gimp_dir}\\gfig;${gimp_data_dir}\\gfig")
# This string sets how image window titles are formatted. # This string sets how image window titles are formatted.
# The following percent expansions are performed: # The following percent expansions are performed:
# %% literal percent sign # %% literal percent sign
# %f bare filename, or "Untiltled" # %f bare filename, or "Untitled"
# %F full path to file # %F full path to file
# %p PDB image id # %p PDB image id
# %i view instance number # %i view instance number
@ -256,7 +279,9 @@
# %z zoom factor as a percentage # %z zoom factor as a percentage
# %s source scale factor # %s source scale factor
# %d destination scale factor # %d destination scale factor
(image-title-format "%f-%p.%i (%t) %z%%") # %Dx expands to x if the image is dirty
# See gimprc(5) for further details.
(image-title-format "%D*%f-%p.%i (%t) %z%%")
# Global paint options # Global paint options
# By default options for the paint tools are local, e.g. all paint tools # By default options for the paint tools are local, e.g. all paint tools
@ -294,17 +319,21 @@
# the help pages using your default web browser. # the help pages using your default web browser.
(help-browser netscape) (help-browser netscape)
# 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")
# Fractalexplorer path # Fractalexplorer path
# This path will be searched for fractals when you use the Fractalexplorer # This path will be searched for fractals when you use the Fractalexplorer
# plug-in. # plug-in.
(fractalexplorer-path "${gimp_dir}\\fractalexplorer;${gimp_data_dir}\\fractalexplorer") (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 # GFlare path
# This path will be searched for gflares when you use the GFlare plug-in. # This path will be searched for gflares when you use the GFlare plug-in.
(gflare-path "${gimp_dir}\\gflare;${gimp_data_dir}\\gflare") (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] # [end of file]

38
libgimp/gimp.def
View File

@ -1,9 +1,4 @@
EXPORTS EXPORTS
g_deserialize
g_free_serial_description
g_new_serial_description
g_new_serial_item
g_serialize
gimp_attach_new_parasite gimp_attach_new_parasite
gimp_channel_copy gimp_channel_copy
gimp_channel_delete gimp_channel_delete
@ -69,6 +64,7 @@ EXPORTS
gimp_gamma gimp_gamma
gimp_get_data gimp_get_data
gimp_get_data_size gimp_get_data_size
gimp_get_progname
gimp_gradients_get_active gimp_gradients_get_active
gimp_gradients_get_list gimp_gradients_get_list
gimp_gradients_sample_custom gimp_gradients_sample_custom
@ -203,8 +199,20 @@ EXPORTS
gimp_palette_set_background gimp_palette_set_background
gimp_palette_set_foreground gimp_palette_set_foreground
gimp_parasite_attach gimp_parasite_attach
gimp_parasite_compare
gimp_parasite_copy
gimp_parasite_data
gimp_parasite_data_size
gimp_parasite_detach gimp_parasite_detach
gimp_parasite_find gimp_parasite_find
gimp_parasite_flags
gimp_parasite_free
gimp_parasite_has_flag
gimp_parasite_is_persistent
gimp_parasite_is_type
gimp_parasite_is_undoable
gimp_parasite_name
gimp_parasite_new
gimp_path_free gimp_path_free
gimp_path_get_user_writable_dir gimp_path_get_user_writable_dir
gimp_path_parse gimp_path_parse
@ -223,9 +231,12 @@ EXPORTS
gimp_pixel_rgns_process gimp_pixel_rgns_process
gimp_pixel_rgns_register gimp_pixel_rgns_register
gimp_pixel_rgns_register2 gimp_pixel_rgns_register2
gimp_pixpipe_params_init
gimp_pixpipe_params_build
gimp_pixpipe_params_parse
gimp_plugin_domain_add gimp_plugin_domain_add
gimp_plugin_domain_add_with_path gimp_plugin_domain_add_with_path
gimp_plugin_help_func gimp_plugin_help_register
gimp_progress_init gimp_progress_init
gimp_progress_update gimp_progress_update
gimp_query_database gimp_query_database
@ -309,21 +320,6 @@ EXPORTS
gp_tile_ack_write gp_tile_ack_write
gp_tile_data_write gp_tile_data_write
gp_tile_req_write gp_tile_req_write
parasite_compare
parasite_copy
parasite_data
parasite_data_size
parasite_flags
parasite_free
parasite_has_flag
parasite_is_persistent
parasite_is_type
parasite_is_undoable
parasite_name
parasite_new
pixpipeparams_build
pixpipeparams_init
pixpipeparams_parse
set_gimp_PLUG_IN_INFO_PTR set_gimp_PLUG_IN_INFO_PTR
wire_clear_error wire_clear_error
wire_destroy wire_destroy

1
libgimp/gimpui.def
View File

@ -91,4 +91,5 @@ EXPORTS
gimp_toggle_button_sensitive_update gimp_toggle_button_sensitive_update
gimp_toggle_button_update gimp_toggle_button_update
gimp_ui_init gimp_ui_init
gimp_uint_adjustment_update
gimp_unit_menu_update gimp_unit_menu_update

174
libgimp/makefile.cygwin
View File

@ -1,39 +1,22 @@
## Makefile for building the GIMP DLLs and LIBs with gcc -mno-cygwin. ## Makefile for building the GIMP DLLs and LIBs with gcc -mno-cygwin.
## Use: make -f makefile.cygwin ## Use: make -f makefile.cygwin
# Change this to wherever you want to install the DLLs. This directory
# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
# only, it probably is best to keep them in the GIMP's bin directory.
BIN = /install/gimp/bin
# The name of the directory in your %HOME% where the GIMP's personal settings # The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved. # and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER) GIMPDIR = _gimp$(GIMP_VER)
OPTIMIZE = -O TOP = ../..
include $(TOP)/build/win32/make.mingw
################################################################ ################################################################
# Nothing much configurable below # Nothing much configurable below
CC = gcc -mno-cygwin -mpentium -fnative-struct
CP = cp
LD = ld
DLLTOOL = dlltool
INSTALL = install
GTK_VER = 1.3
GLIB_VER = 1.3
GIMP_VER = 1.1 GIMP_VER = 1.1
GTK = ../../gtk+ INCLUDES = -I .. $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS)
GLIB = ../../glib DEFINES = -DGIMPDIR=\"$(GIMPDIR)\"
INTL = ../../intl
GIMP_VER = 1.1
CFLAGS = $(OPTIMIZE) -I.. -I$(GLIB) -I$(GTK)/gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"
all : \ all : \
../config.h \ ../config.h \
@ -42,141 +25,88 @@ all : \
gimpui-$(GIMP_VER).dll gimpui-$(GIMP_VER).dll
../config.h : ../config.h.win32 ../config.h : ../config.h.win32
cp ../config.h.win32 ../config.h cp $@ $<
install : all
$(INSTALL) gimp-$(GIMP_VER).dll $(BIN)
$(INSTALL) gimpui-$(GIMP_VER).dll $(BIN)
gimpi_OBJECTS = \ gimpi_OBJECTS = \
gimpenv.o \ gimpenv.o \
gimpchainbutton.o \ gimpchainbutton.o \
gimpcolorbutton.o \ gimpcolorbutton.o \
gimpcolorspace.o \ gimpcolorspace.o \
gimpdialog.o \ gimpdialog.o \
gimpfileselection.o\ gimpfileselection.o \
gimphelpui.o \ gimphelpui.o \
gimpmatrix.o \ gimpmatrix.o \
gimppatheditor.o\ gimpparasite.o \
gimppixmap.o \ gimpparasiteio.o \
gimpprotocol.o \ gimppatheditor.o \
gimpquerybox.o \ gimppixmap.o \
gimpsizeentry.o \ gimpprotocol.o \
gimpunitmenu.o \ gimpquerybox.o \
gimpvector.o \ gimpsizeentry.o \
gimpwidgets.o \ gimpunitmenu.o \
gimpwire.o \ gimpvector.o \
gserialize.o \ gimpwidgets.o \
parasite.o \ gimpwire.o
parasiteio.o
libgimpi.a : $(gimpi_OBJECTS) libgimpi.a : $(gimpi_OBJECTS)
ar cr libgimpi.a $(gimpi_OBJECTS) ar cr libgimpi.a $(gimpi_OBJECTS)
gimp_OBJECTS = \ gimp_OBJECTS = \
gimp.o \ gimp.o \
gimpchannel.o \ gimpchannel_pdb.o \
gimpcolorspace.o \ gimpcolorspace.o \
gimpdisplay.o \ gimpdisplay_pdb.o \
gimpdrawable.o \ gimpdrawable_pdb.o \
gimpenv.o \ gimpenv.o \
gimpgradient.o \ gimpgradient_pdb.o \
gimphelp.o \ gimphelp_pdb.o \
gimpimage.o \ gimpimage_pdb.o \
gimplayer.o \ gimplayer_pdb.o \
gimpmatrix.o \ gimpmatrix.o \
gimppalette.o \ gimppalette_pdb.o \
gimpparasite.o \ gimpparasite.o \
gimppixelrgn.o \ gimpparasite_pdb.o \
gimpprotocol.o \ gimpparasiteio.o \
gimpselection.o \ gimppixelrgn.o \
gimptile.o \ gimpprotocol.o \
gimpunit.o \ gimpselection_pdb.o \
gimpvector.o \ gimptile.o \
gimpwire.o \ gimpunit_pdb.o \
gserialize.o \ gimpvector.o \
parasite.o \ gimpwire.o
parasiteio.o
gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def
$(GLIB)/build-dll gimp $(GIMP_VER) gimp.def -s $(gimp_OBJECTS) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) -luser32 $(GLIB)/build-dll gimp $(GIMP_VER) gimp.def -s $(gimp_OBJECTS) $(INTL_LIBS) $(GLIB_LIBS) -luser32
# Pass -DLIBGIMP_COMPILATION when compiling gimp_OBJECTS # Pass -DLIBGIMP_COMPILATION when compiling gimp.c which
# defines the exported variables.
gimp.o : gimp.c gimp.o : gimp.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimp.c $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimp.c
gimpchannel.o : gimpchannel.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpchannel.c
gimpdisplay.o : gimpdisplay.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpdisplay.c
gimpdrawable.o : gimpdrawable.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpdrawable.c
gimpenv.o : gimpenv.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpenv.c
gimpgradient.o : gimpgradient.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpgradient.c
gimphelp.o : gimphelp.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimphelp.c
gimpimage.o : gimpimage.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpimage.c
gimplayer.o : gimplayer.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimplayer.c
gimpmatrix.o : gimpmatrix.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpmatrix.c
gimppalette.o : gimppalette.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimppalette.c
gimpparasite.o : gimpparasite.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpparasite.c
gimppixelrgn.o : gimppixelrgn.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimppixelrgn.c
gimpprotocol.o : gimpprotocol.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpprotocol.c
gimpselection.o : gimpselection.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpselection.c
gimptile.o : gimptile.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimptile.c
gimpunit.o : gimpunit.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpunit.c
gimpvector.o : gimpvector.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpvector.c
gimpwire.o : gimpwire.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimpwire.c
gserialize.o : gserialize.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gserialize.c
parasite.o : parasite.c
$(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION parasite.c
gimpui_OBJECTS = \ gimpui_OBJECTS = \
gimpmenu.o \ gimpmenu.o \
gimpbrushmenu.o \ gimpbrushmenu.o \
gimpchainbutton.o \ gimpchainbutton.o \
gimpcolorbutton.o \ gimpcolorbutton.o \
gimpdialog.o \ gimpdialog.o \
gimpexport.o \ gimpexport.o \
gimpfileselection.o \ gimpfileselection.o \
gimphelpui.o \ gimphelpui.o \
gimpgradientmenu.o \ gimpgradientmenu.o \
gimppatheditor.o \ gimppatheditor.o \
gimppatternmenu.o \ gimppatternmenu.o \
gimppixmap.o \ gimppixmap.o \
gimpquerybox.o \ gimpquerybox.o \
gimpsizeentry.o \ gimpsizeentry.o \
gimpui.o \ gimpui.o \
gimpunitmenu.o \ gimpunitmenu.o \
gimpwidgets.o gimpwidgets.o
gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def
$(GLIB)/build-dll gimpui $(GIMP_VER) gimpui.def -s $(gimpui_OBJECTS) -L . -lgimp-$(GIMP_VER) -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER) $(GLIB)/build-dll gimpui $(GIMP_VER) gimpui.def -s $(gimpui_OBJECTS) -L . -lgimp-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS)
.SUFFIXES: .c .o .i
# General rule for compiling, used by the objects that don't go into # General rule for compiling, used by the objects that don't go into
# gimp-$(GIMP_VER).dll. # gimp-$(GIMP_VER).dll.
.c.o: .c.o:
$(CC) $(CFLAGS) -c $< $(CC) $(CFLAGS) -c $<
.c.i:
$(CC) $(CFLAGS) -E $< >$@
clean:
-rm *.o *.exe *.dll *.a *.base *.exp

69
libgimp/makefile.msc
View File

@ -81,76 +81,35 @@ gimpi.lib : $(gimpi_OBJECTS)
gimp_OBJECTS = \ gimp_OBJECTS = \
gimp.obj \ gimp.obj \
gimpchannel.obj \ gimpchannel_pdb.obj \
gimpcolorspace.obj \ gimpcolorspace.obj \
gimpdisplay.obj \ gimpdisplay_pdb.obj \
gimpdrawable.obj \ gimpdrawable_pdb.obj \
gimpenv.obj \ gimpenv.obj \
gimpgradient.obj \ gimpgradient_pdb.obj \
gimphelp.obj \ gimphelp_pdb.obj \
gimpimage.obj \ gimpimage_pdb.obj \
gimplayer.obj \ gimplayer_pdb.obj \
gimpmatrix.obj \ gimpmatrix.obj \
gimppalette.obj \ gimppalette_pdb.obj \
gimpparasite.obj \ gimpparasite.obj \
gimpparasite_pdb.obj \
gimpparasiteio.obj \
gimppixelrgn.obj \ gimppixelrgn.obj \
gimpprotocol.obj \ gimpprotocol.obj \
gimpselection.obj \ gimpselection_pdb.obj \
gimptile.obj \ gimptile.obj \
gimpunit.obj \ gimpunit_pdb.obj \
gimpvector.obj \ gimpvector.obj \
gimpwire.obj \ gimpwire.obj
gserialize.obj \
parasite.obj \
parasiteio.obj
gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def
$(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def $(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def
# Pass -DLIBGIMP_COMPILATION when compiling gimp_OBJECTS # Pass -DLIBGIMP_COMPILATION when compiling gimp.c
gimp.obj : gimp.c gimp.obj : gimp.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimp.c
gimpchannel.obj : gimpchannel.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpchannel.c
gimpdisplay.obj : gimpdisplay.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpdisplay.c
gimpdrawable.obj : gimpdrawable.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpdrawable.c
gimpenv.obj : gimpenv.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpenv.c
gimpgradient.obj : gimpgradient.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpgradient.c
gimphelp.obj : gimphelp.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimphelp.c
gimpimage.obj : gimpimage.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpimage.c
gimplayer.obj : gimplayer.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimplayer.c
gimpmatrix.obj : gimpmatrix.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpmatrix.c
gimppalette.obj : gimppalette.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimppalette.c
gimpparasite.obj : gimpparasite.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpparasite.c
gimppixelrgn.obj : gimppixelrgn.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimppixelrgn.c
gimpprotocol.obj : gimpprotocol.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpprotocol.c
gimpselection.obj : gimpselection.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpselection.c
gimptile.obj : gimptile.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimptile.c
gimpunit.obj : gimpunit.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpunit.c
gimpvector.obj : gimpvector.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpvector.c
gimpwire.obj : gimpwire.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gimpwire.c
gserialize.obj : gserialize.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION gserialize.c
parasite.obj : parasite.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION parasite.c
gimpui_OBJECTS = \ gimpui_OBJECTS = \
gimpmenu.obj \ gimpmenu.obj \

30
modules/makefile.cygwin
View File

@ -6,26 +6,19 @@
# will pick it up. # will pick it up.
GIMP = /install/gimp GIMP = /install/gimp
OPTIMIZE = -O TOP = ../..
include $(TOP)/build/win32/make.mingw
################################################################ ################################################################
# Nothing much configurable below # Nothing much configurable below
CC = gcc -mno-cygwin -mpentium -fnative-struct
INSTALL = install
GIMP_VER = 1.1 GIMP_VER = 1.1
GTK_VER = 1.3
GLIB_VER = 1.3
GLIB = ../../glib DEFINES = -DMODULE_COMPILATION
GMODULE = $(GLIB)/gmodule INCLUDES = -I . -I .. $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS)
GTK = ../../gtk+
INTL = ../../intl
CFLAGS = $(OPTIMIZE) -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)/gdk -I$(GTK) -I$(INTL)
LDFLAGS = -s LDFLAGS = -s
BIN = $(GIMP)/modules BIN = $(GIMP)/modules
@ -47,19 +40,16 @@ install : all
cp ../config.h.win32 $@ cp ../config.h.win32 $@
colorsel_gtk-$(GIMP_VER).dll : colorsel_gtk.o module.def 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 -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) $(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 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 -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) $(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 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 -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) $(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 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) -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) $(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 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) -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) $(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)
clean:
-rm *.dll *.a *.o *.exp *.base

2
plug-ins/common/compressor.c
View File

@ -440,7 +440,7 @@ save_image (gchar *filename,
TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL,
&startupinfo, &processinfo)) &startupinfo, &processinfo))
{ {
g_message ("gz: CreateProcess failed\n"); g_message ("gz: CreateProcess failed. Do you have gzip.exe in your PATH?\n");
g_free (tmpname); g_free (tmpname);
_exit (127); _exit (127);
} }

2
plug-ins/common/gz.c
View File

@ -440,7 +440,7 @@ save_image (gchar *filename,
TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL,
&startupinfo, &processinfo)) &startupinfo, &processinfo))
{ {
g_message ("gz: CreateProcess failed\n"); g_message ("gz: CreateProcess failed. Do you have gzip.exe in your PATH?\n");
g_free (tmpname); g_free (tmpname);
_exit (127); _exit (127);
} }

6
tips/gimp_tips.txt
View File

@ -139,8 +139,10 @@ Download and install them.
# All other files in ~/.gimp can be kept after an upgrade. # All other files in ~/.gimp can be kept after an upgrade.
# In particular, we should try to preserve gimprc. --Raphael # In particular, we should try to preserve gimprc. --Raphael
When installing a new version, be sure to When installing a new version, be sure to delete your personal GIMP
delete your ~/.gimp directory first. settings directory first (on Unix: ~/.gimp-1.1, on Windows: _gimp1.1
in your home directory, or _gimp1.1.<username> in the GIMP
installation directory).
Using Edit->Stroke allows you to draw simple squares or circles by Using Edit->Stroke allows you to draw simple squares or circles by
painting the edge of your current selection with the active brush. painting the edge of your current selection with the active brush.