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

Clarifications. 

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

* README.win32: Clarifications.

* app/makefile.{cygwin,msc}: Remove docindexif.

* app/gimprc.c (save_gimprc_strings): Pass strings through
gimp_strescape().

* libgimp/gimpui.def: Add gimp_toggle_button_sensitive_update.

* plug-ins/makefile.{cygwin,msc}: Add some new unofficial
plug-ins. Remove bmpos2 object.
This commit is contained in:
Tor Lillqvist 2000-05-10 19:39:03 +00:00 committed by Tor Lillqvist
parent a39fd6d69f
commit aec3c5a51a
8 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2000-05-10 Tor Lillqvist <tml@iki.fi>
* README.win32: Clarifications.
* app/makefile.{cygwin,msc}: Remove docindexif.
* app/gimprc.c (save_gimprc_strings): Pass strings through
gimp_strescape().
* libgimp/gimpui.def: Add gimp_toggle_button_sensitive_update.
* plug-ins/makefile.{cygwin,msc}: Add some new unofficial
plug-ins. Remove bmpos2 object.
Wed May 10 04:58:13 CEST 2000 Marc Lehmann <pcg@goof.com>
* app/plug_in.c: Fix endless loop problem for certain image_types,

37
README.win32
View File

@ -1,34 +1,31 @@
This is an unstable version of the GIMP, intended for developers
only. Even more so the Win32 port.
For more information about the port or GLib, GTk+ and the GIMP to
native Windows, and pre-built binary packages, see
http://www.iki.fi/tml/gimp/win32/ or
http://www.gimp.org/~tml/gimp/win32/
To build the GIMP on Win32, you can use either Microsoft Visual C++ or
gcc under cygwin (without the produced executables depending on the
cygwin dll) (gcc -mno-cygwin). For more information about the
preparation necessary for building with gcc, what version you want and
where to get it, etc, read README.win32 in GLib 1.3 (or later). (GLib
1.3 isn't distributed per se, but available from CVS, and in tml's
source snapshots.)
gcc. The gcc to use should be for a mingw configuration (producing
executables that don't depend on the cygwin dll). For more information
about the preparation necessary for building with gcc, what version
you want and where to get it, etc, read README.win32 in GLib 1.3 (or
later). (GLib 1.3 is the developer version and thus isn't distributed
per se, but available from CVS, and especially for Windows in zipfiles
from the web pages mentioned above.)
The GIMP wants to be built with the GNU "intl" library for
internationalisation (i18n). Get the version ported to Win32 from
tml's web site mentioned above. We build the "intl" library to a DLL
called gnu-intl.dll to reduce name clash risks. If you don't want any
i18n stuff, undefine ENABLE_NLS in the config.h.win32 file, and remove
internationalisation (i18n). Get the version ported to Win32 from the
web site mentioned above. We build the "intl" library to a DLL called
gnu-intl.dll to reduce name clash risks. If you don't want any i18n
stuff, undefine ENABLE_NLS in the config.h.win32 file, and remove
references to the gnu-intl library from the makefiles.
Note that while the GNU gettext package is under the GPL (GNU General
Public License), the "intl" library part as distributed with GNU libc
is under the LGPL (GNU Lesser General Public License, a.k.a. GNU
Library General Public License) (like GTk+ and GLib). We want the
LGPL-licensed version of the intl library, even if they are the same,
more or less. It doesn't matter much for the GIMP which itself is also
licensed under the GPL, but it does matter for GTk+, which is licensed
under the LGPL.
Library General Public License). We want the LGPL-licensed version of
the intl library, even if they are the same, more or less. It doesn't
matter for the GIMP which itself is licensed under the GPL, but it
does matter for GTk+, which is licensed under the LGPL.
First, build in the libgimp directory, then in app, plug-ins, and
finally in modules. Check the makefile.msc or makefile.cygwin files in
@ -37,7 +34,7 @@ said directories.
The current build setup for Windows is a mess, with complex
hand-maintained makefiles. I know. Adding parallel makefiles for gcc
didn't make it any cleaner. On the other hand, I don't think using the
Unix style configuration mechanism (under cygwin) is quite feasible,
either.
Unix style configuration mechanism to generate mingw EXEs and DLLs is
quite feasible, either. I would love to be proved wrong.
--Tor Lillqvist <tml@iki.fi>

11
app/gimprc.c
View File

@ -517,6 +517,7 @@ save_gimprc_strings (gchar *token,
gchar *error_msg;
gboolean found = FALSE;
gchar *personal_gimprc;
gchar *str;
UnknownToken *ut; /* variables to modify unknown_tokens */
UnknownToken *tmp;
@ -586,12 +587,14 @@ save_gimprc_strings (gchar *token,
fprintf (fp_new, "#- Next line modified %s\n",
timestamp);
}
str = gimp_strescape (value, NULL);
if (!found)
{
fprintf (fp_new, "(%s \"%s\")\n", token, value);
fprintf (fp_new, "(%s \"%s\")\n", token, str);
}
else
fprintf (fp_new, "#- (%s \"%s\")\n", token, value);
fprintf (fp_new, "#- (%s \"%s\")\n", token, str);
g_free (str);
found = TRUE;
continue;
} /* end if token and name match */
@ -617,7 +620,9 @@ save_gimprc_strings (gchar *token,
{
fprintf (fp_new, "#- Next line added %s\n",
timestamp);
fprintf (fp_new, "(%s \"%s\")\n\n", token, value);
str = gimp_strescape (value, NULL);
fprintf (fp_new, "(%s \"%s\")\n\n", token, str);
g_free (str);
}
/* update unknown_tokens to reflect new token value */

1
app/makefile.cygwin
View File

@ -104,7 +104,6 @@ gimp_OBJECTS = \
dialog_handler.o \
disp_callbacks.o \
docindex.o \
docindexif.o \
dodgeburn.o \
draw_core.o \
drawable.o \

1
app/makefile.msc
View File

@ -111,7 +111,6 @@ gimp_OBJECTS = \
dialog_handler.obj \
disp_callbacks.obj \
docindex.obj \
docindexif.obj \
dodgeburn.obj \
draw_core.obj \
drawable.obj \

1
libgimp/gimpui.def
View File

@ -88,6 +88,7 @@ EXPORTS
gimp_size_entry_set_value_boundaries
gimp_spin_button_new
gimp_table_attach_aligned
gimp_toggle_button_sensitive_update
gimp_toggle_button_update
gimp_ui_init
gimp_unit_menu_update

3
plug-ins/makefile.cygwin
View File

@ -39,7 +39,7 @@ SEPARATE = AlienMap AlienMap2 FractalExplorer Lighting MapObject bmp dbbrowser f
# ../unofficial-plug-ins directory, go there, and do "make -f
# makefile.cygwin unofficial".
UNOFFICIAL = Anamorphose DigitalSignature RGB_Displace ccanalyze gimp_ace guash sel_gauss magiceye user_filter
UNOFFICIAL = Anamorphose DigitalSignature RGB_Displace ccanalyze gimp_ace guash sel_gauss magiceye psd_save user_filter
# The main target
@ -183,7 +183,6 @@ endif
ifdef EXTRA_bmp
OBJECTS = \
bmp.o \
bmpos2.o \
bmpread.o \
bmpwrite.o
endif

9
plug-ins/makefile.msc
View File

@ -38,7 +38,7 @@ SEPARATE = AlienMap AlienMap2 FractalExplorer Lighting MapObject bmp dbbrowser f
# ..\unofficial-plug-ins directory, go there, and do "nmake -f
# makefile.msc unofficial".
UNOFFICIAL = Anamorphose DigitalSignature RGB_Displace ccanalyze gimp_ace guash pmosaic sel_gauss user_filter
UNOFFICIAL = Anamorphose DigitalSignature RGB_Displace ccanalyze gimp_ace guash sel_gauss magiceye psd_save user_filter
# The main target
@ -192,7 +192,6 @@ OPTIMIZE =
!IFDEF EXTRA_bmp
OBJECTS = \
bmp.obj \
bmpos2.obj \
bmpread.obj \
bmpwrite.obj
!ENDIF
@ -490,6 +489,12 @@ OBJECTS = \
HAVE_RESOURCE = YES
!ENDIF
!IFDEF EXTRA_magiceye
OBJECTS = \
dialog.obj \
magiceye.obj
!ENDIF
!IFDEF EXTRA_user_filter
uf_lexer.c : uf_lexer.l