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

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>
* plug-ins/gdyntext/gdyntext.c (gdt_get_values): We dont need to say

View file

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

View file

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

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)
# GCG = ../tools/gcg/gcg -I. -I../tools/gcg/gh
all : \
../config.h \
libgimpim.a \
@ -251,11 +249,6 @@ gimp_OBJECTS = \
user_install.o \
xcf.o
# .SUFFIXES: .gc
# .gc.c:
# $(GCG) -o $@ $<
gimpres.o : gimp.rc wilber.ico
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
# 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
$(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
$(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)
.SUFFIXES: .c .o .i

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)
# GCG = ..\tools\gcg\gcg -I. -I ..\tools\gcg\gh
all : \
..\config.h \
gimpim.lib \
@ -258,11 +256,6 @@ gimp_OBJECTS = \
user_install.obj \
xcf.obj
# .SUFFIXES: .gc
# .gc.c:
# $(GCG) -o $@ $<
gimp.res : gimp.rc wilber.ico
rc -r -fo gimp.res gimp.rc

View file

@ -24,7 +24,8 @@
# 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.
# 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
@ -32,14 +33,18 @@
# 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 shared over a network. For these reasons, it may
# be desirable to put your swap file in your %TEMP% directory.
# 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.
@ -55,7 +60,7 @@
# Set the palette search path...this path will be searched for valid
# palettes at startup.
(palette-path "${gimp_dir}\\palettes;${gimp_data_dir}\\palettes")
(palette-path "${gimp_dir}\\palettes")
# Specify a default palette.
# 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
# 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
# the GIMP if the script-fu plug-in is never run.
@ -91,7 +96,7 @@
# 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 10m)
(tile-cache-size 32m)
# Speed of marching ants in the selection outline
# this value is in milliseconds
@ -101,17 +106,22 @@
# Set the number of operations kept on the undo stack
(undo-levels 5)
# Set the color-cube resource for dithering on 8-bit displays
# The 4 values stand for Shades of red, green, blue and grays
# 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 from the
# gimp colormap. This number should 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".
# 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 GIMP colormap by default -- only for 8-bit displays
# Install a private GIMP colormap by default -- only for 8-bit displays
# (install-colormap)
# Specify that marching ants for selected regions will be drawn
@ -140,24 +150,44 @@
# Uncomment this line to disable them.
# (no-cursor-updating)
# Layer preview sizes:
# Layer preview sizes (also used for the Undo History):
# none: no previews in layers dialog/layer selector
# tiny: 24x24
# small: 32x32
# medium: 64x64
# large: 128x128
# 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
@ -180,12 +210,6 @@
(default-xresolution 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
# Auto saving is not yet implemented! Nothing will be auto-saved, no matter
# how you set this here.
@ -201,13 +225,15 @@
# 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,
# uncomment the line below...
# (always-restore-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
# By default, GIMP uses linear interpolation, which is faster, but
# has poorer quality
# (cubic-interpolation)
# Set the gamma correction values for the display
@ -224,7 +250,7 @@
# 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
@ -242,13 +268,10 @@
(transparency-type 1)
(transparency-size 2)
# gfig pattern directory
(gfig-path "${gimp_dir}\\gfig;${gimp_data_dir}\\gfig")
# This string sets how image window titles are formatted.
# The following percent expansions are performed:
# %% literal percent sign
# %f bare filename, or "Untiltled"
# %f bare filename, or "Untitled"
# %F full path to file
# %p PDB image id
# %i view instance number
@ -256,7 +279,9 @@
# %z zoom factor as a percentage
# %s source 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
# 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.
(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
# 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]

View file

@ -24,7 +24,8 @@
# 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.
# 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
@ -32,14 +33,18 @@
# 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 shared over a network. For these reasons, it may
# be desirable to put your swap file in your %TEMP% directory.
# 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.
@ -55,7 +60,7 @@
# Set the palette search path...this path will be searched for valid
# palettes at startup.
(palette-path "${gimp_dir}\\palettes;${gimp_data_dir}\\palettes")
(palette-path "${gimp_dir}\\palettes")
# Specify a default palette.
# 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
# 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
# the GIMP if the script-fu plug-in is never run.
@ -91,7 +96,7 @@
# 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 10m)
(tile-cache-size 32m)
# Speed of marching ants in the selection outline
# this value is in milliseconds
@ -101,17 +106,22 @@
# Set the number of operations kept on the undo stack
(undo-levels 5)
# Set the color-cube resource for dithering on 8-bit displays
# The 4 values stand for Shades of red, green, blue and grays
# 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 from the
# gimp colormap. This number should 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".
# 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 GIMP colormap by default -- only for 8-bit displays
# Install a private GIMP colormap by default -- only for 8-bit displays
# (install-colormap)
# Specify that marching ants for selected regions will be drawn
@ -140,24 +150,44 @@
# Uncomment this line to disable them.
# (no-cursor-updating)
# Layer preview sizes:
# Layer preview sizes (also used for the Undo History):
# none: no previews in layers dialog/layer selector
# tiny: 24x24
# small: 32x32
# medium: 64x64
# large: 128x128
# 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
@ -180,12 +210,6 @@
(default-xresolution 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
# Auto saving is not yet implemented! Nothing will be auto-saved, no matter
# how you set this here.
@ -201,13 +225,15 @@
# 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,
# uncomment the line below...
# (always-restore-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
# By default, GIMP uses linear interpolation, which is faster, but
# has poorer quality
# (cubic-interpolation)
# Set the gamma correction values for the display
@ -224,7 +250,7 @@
# 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
@ -242,13 +268,10 @@
(transparency-type 1)
(transparency-size 2)
# gfig pattern directory
(gfig-path "${gimp_dir}\\gfig;${gimp_data_dir}\\gfig")
# This string sets how image window titles are formatted.
# The following percent expansions are performed:
# %% literal percent sign
# %f bare filename, or "Untiltled"
# %f bare filename, or "Untitled"
# %F full path to file
# %p PDB image id
# %i view instance number
@ -256,7 +279,9 @@
# %z zoom factor as a percentage
# %s source 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
# 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.
(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
# 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]

View file

@ -1,9 +1,4 @@
EXPORTS
g_deserialize
g_free_serial_description
g_new_serial_description
g_new_serial_item
g_serialize
gimp_attach_new_parasite
gimp_channel_copy
gimp_channel_delete
@ -69,6 +64,7 @@ EXPORTS
gimp_gamma
gimp_get_data
gimp_get_data_size
gimp_get_progname
gimp_gradients_get_active
gimp_gradients_get_list
gimp_gradients_sample_custom
@ -203,8 +199,20 @@ EXPORTS
gimp_palette_set_background
gimp_palette_set_foreground
gimp_parasite_attach
gimp_parasite_compare
gimp_parasite_copy
gimp_parasite_data
gimp_parasite_data_size
gimp_parasite_detach
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_get_user_writable_dir
gimp_path_parse
@ -223,9 +231,12 @@ EXPORTS
gimp_pixel_rgns_process
gimp_pixel_rgns_register
gimp_pixel_rgns_register2
gimp_pixpipe_params_init
gimp_pixpipe_params_build
gimp_pixpipe_params_parse
gimp_plugin_domain_add
gimp_plugin_domain_add_with_path
gimp_plugin_help_func
gimp_plugin_help_register
gimp_progress_init
gimp_progress_update
gimp_query_database
@ -309,21 +320,6 @@ EXPORTS
gp_tile_ack_write
gp_tile_data_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
wire_clear_error
wire_destroy

View file

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

View file

@ -1,39 +1,22 @@
## Makefile for building the GIMP DLLs and LIBs with gcc -mno-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
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
OPTIMIZE = -O
TOP = ../..
include $(TOP)/build/win32/make.mingw
################################################################
# 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
GTK = ../../gtk+
GLIB = ../../glib
INTL = ../../intl
GIMP_VER = 1.1
CFLAGS = $(OPTIMIZE) -I.. -I$(GLIB) -I$(GTK)/gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"
INCLUDES = -I .. $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS)
DEFINES = -DGIMPDIR=\"$(GIMPDIR)\"
all : \
../config.h \
@ -42,11 +25,7 @@ all : \
gimpui-$(GIMP_VER).dll
../config.h : ../config.h.win32
cp ../config.h.win32 ../config.h
install : all
$(INSTALL) gimp-$(GIMP_VER).dll $(BIN)
$(INSTALL) gimpui-$(GIMP_VER).dll $(BIN)
cp $@ $<
gimpi_OBJECTS = \
gimpenv.o \
@ -54,10 +33,12 @@ gimpi_OBJECTS = \
gimpcolorbutton.o \
gimpcolorspace.o \
gimpdialog.o \
gimpfileselection.o\
gimpfileselection.o \
gimphelpui.o \
gimpmatrix.o \
gimppatheditor.o\
gimpparasite.o \
gimpparasiteio.o \
gimppatheditor.o \
gimppixmap.o \
gimpprotocol.o \
gimpquerybox.o \
@ -65,86 +46,43 @@ gimpi_OBJECTS = \
gimpunitmenu.o \
gimpvector.o \
gimpwidgets.o \
gimpwire.o \
gserialize.o \
parasite.o \
parasiteio.o
gimpwire.o
libgimpi.a : $(gimpi_OBJECTS)
ar cr libgimpi.a $(gimpi_OBJECTS)
gimp_OBJECTS = \
gimp.o \
gimpchannel.o \
gimpchannel_pdb.o \
gimpcolorspace.o \
gimpdisplay.o \
gimpdrawable.o \
gimpdisplay_pdb.o \
gimpdrawable_pdb.o \
gimpenv.o \
gimpgradient.o \
gimphelp.o \
gimpimage.o \
gimplayer.o \
gimpgradient_pdb.o \
gimphelp_pdb.o \
gimpimage_pdb.o \
gimplayer_pdb.o \
gimpmatrix.o \
gimppalette.o \
gimppalette_pdb.o \
gimpparasite.o \
gimpparasite_pdb.o \
gimpparasiteio.o \
gimppixelrgn.o \
gimpprotocol.o \
gimpselection.o \
gimpselection_pdb.o \
gimptile.o \
gimpunit.o \
gimpunit_pdb.o \
gimpvector.o \
gimpwire.o \
gserialize.o \
parasite.o \
parasiteio.o
gimpwire.o
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
$(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 = \
gimpmenu.o \
@ -166,17 +104,9 @@ gimpui_OBJECTS = \
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) -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lglib-$(GLIB_VER)
.SUFFIXES: .c .o .i
$(GLIB)/build-dll gimpui $(GIMP_VER) gimpui.def -s $(gimpui_OBJECTS) -L . -lgimp-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS)
# General rule for compiling, used by the objects that don't go into
# gimp-$(GIMP_VER).dll.
.c.o:
$(CC) $(CFLAGS) -c $<
.c.i:
$(CC) $(CFLAGS) -E $< >$@
clean:
-rm *.o *.exe *.dll *.a *.base *.exp

View file

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

View file

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

View file

@ -440,7 +440,7 @@ save_image (gchar *filename,
TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL,
&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);
_exit (127);
}

View file

@ -440,7 +440,7 @@ save_image (gchar *filename,
TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL,
&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);
_exit (127);
}

View file

@ -139,8 +139,10 @@ Download and install them.
# All other files in ~/.gimp can be kept after an upgrade.
# In particular, we should try to preserve gimprc. --Raphael
When installing a new version, be sure to
delete your ~/.gimp directory first.
When installing a new version, be sure to delete your personal GIMP
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
painting the edge of your current selection with the active brush.