mirror of https://github.com/GNOME/gimp.git
Mention using GNU gettext.
* README.win32: Mention using GNU gettext. * config.h.win32: Enable NLS stuff. Remove the X11 & Unix vs. Win32 feature test macros, we use those from glibconfig.h and gdkconfig.h. * app/makefile.msc: Use gettext. New object files. * app/batch.c: No need to include <io.h> on Win32. * app/errorconsole.c * app/plug_in.c * app/tile_swap.c: Include <glib.h> early to get Win32 feature test macros from <glibconfig.h>. * app/gimpset.c: Remove unnecessary (?) warning. * app/main.c * libgimp/stdplugins-intl.h: If no LOCALEDIR defined (as on Win32), use the "locale" subdir in gimp_data_directory(). * app/palette.c: Open palette file in text mode. * app/session.c * app/text_tool.c: Use GDK's GDK_WINDOWING feature test macro if available, not WINDOWS_DISPLAY. * libgimp/gimpfeatures.h.win32: Correct GIMP_VERSION. * libgimp/makefile.msc: Use gettext. * plug-ins/makefile.msc: Use gettext. Add some missing plug-ins. Advice how to build "unofficial" plug-ins. * plug-ins/FractalExplorer/FractalExplorer.c * plug-ins/faxg3/faxg3.c * plug-ins/gbr/gbr.c * plug-ins/gz/gz.c: Include <glib.h> early. * plug-ins/tga/tga.c: Include config.h, use HAVE_UNISTD_H.
This commit is contained in:
Tor Lillqvist
parent
dddfa3a900
commit
776cd54ca9
42
ChangeLog
42
ChangeLog
|
|
@ -1,3 +1,45 @@
|
|||
1999-06-15 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* README.win32: Mention using GNU gettext.
|
||||
|
||||
* config.h.win32: Enable NLS stuff. Remove the X11 & Unix vs. Win32
|
||||
feature test macros, we use those from glibconfig.h and gdkconfig.h.
|
||||
|
||||
* app/makefile.msc: Use gettext. New object files.
|
||||
|
||||
* app/batch.c: No need to include <io.h> on Win32.
|
||||
|
||||
* app/errorconsole.c
|
||||
* app/plug_in.c
|
||||
* app/tile_swap.c: Include <glib.h> early to get Win32 feature
|
||||
test macros from <glibconfig.h>.
|
||||
|
||||
* app/gimpset.c: Remove unnecessary (?) warning.
|
||||
|
||||
* app/main.c
|
||||
* libgimp/stdplugins-intl.h: If no LOCALEDIR defined
|
||||
(as on Win32), use the "locale" subdir in gimp_data_directory().
|
||||
|
||||
* app/palette.c: Open palette file in text mode.
|
||||
|
||||
* app/session.c
|
||||
* app/text_tool.c: Use GDK's GDK_WINDOWING feature test macro
|
||||
if available, not WINDOWS_DISPLAY.
|
||||
|
||||
* libgimp/gimpfeatures.h.win32: Correct GIMP_VERSION.
|
||||
|
||||
* libgimp/makefile.msc: Use gettext.
|
||||
|
||||
* plug-ins/makefile.msc: Use gettext. Add some missing
|
||||
plug-ins. Advice how to build "unofficial" plug-ins.
|
||||
|
||||
* plug-ins/FractalExplorer/FractalExplorer.c
|
||||
* plug-ins/faxg3/faxg3.c
|
||||
* plug-ins/gbr/gbr.c
|
||||
* plug-ins/gz/gz.c: Include <glib.h> early.
|
||||
|
||||
* plug-ins/tga/tga.c: Include config.h, use HAVE_UNISTD_H.
|
||||
|
||||
Sun Jun 13 21:05:00 CST 1999 Seth Burgess <sjburges@gimp.org>
|
||||
|
||||
* app/devices
|
||||
|
|
|
|||
|
|
@ -11,6 +11,12 @@ compiler. Eventually gcc (egcs) on cygwin will also be supported, but
|
|||
without the produced executables depending on the cygwin dll (gcc
|
||||
-mno-cygwin).
|
||||
|
||||
The GIMP wants to be built with the GNU gettext library for
|
||||
internationalisation (i18n). Get the version ported to Win32 (not a
|
||||
very big deal) from tml's web site mentioned above. 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.
|
||||
|
||||
First, build in the libgimp directory, then in tools/gcg, then in app,
|
||||
plug-ins, and finally in modules. Check the makefile.msc files in said
|
||||
directories.
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
|
|
|||
|
|
@ -9,10 +9,6 @@
|
|||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef NATIVE_WIN32
|
||||
#include <io.h>
|
||||
#endif
|
||||
|
||||
#include "appenv.h"
|
||||
#include "app_procs.h"
|
||||
#include "batch.h"
|
||||
|
|
@ -133,6 +129,7 @@ batch_run_cmd (char *cmd)
|
|||
return;
|
||||
}
|
||||
|
||||
#ifndef NATIVE_WIN32
|
||||
|
||||
static void
|
||||
batch_read (gpointer data,
|
||||
|
|
@ -188,6 +185,8 @@ batch_read (gpointer data,
|
|||
}
|
||||
}
|
||||
|
||||
#endif /* !NATIVE_WIN32 */
|
||||
|
||||
static void
|
||||
batch_pserver (int run_mode,
|
||||
int flags,
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -230,7 +230,6 @@ void
|
|||
gimp_set_set_active (GimpSet* set, gpointer ob)
|
||||
{
|
||||
if (ob != set->active_element && gimp_set_have(set, ob)) {
|
||||
g_warning("Gimp_Set got new active element");
|
||||
set->active_element = ob;
|
||||
gtk_signal_emit (GTK_OBJECT(set), gimp_set_signals[ACTIVE_CHANGED], ob);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -479,7 +479,7 @@ palette_entries_save (PaletteEntriesP palette,
|
|||
return;
|
||||
|
||||
/* Open the requested file */
|
||||
if (! (fp = fopen (filename, "wb")))
|
||||
if (! (fp = fopen (filename, "w")))
|
||||
{
|
||||
g_message (_("can't save palette \"%s\"\n"), filename);
|
||||
return;
|
||||
|
|
@ -607,7 +607,7 @@ palette_entries_load (char *filename)
|
|||
|
||||
/* Open the requested file */
|
||||
|
||||
if (!(fp = fopen (filename, "rb")))
|
||||
if (!(fp = fopen (filename, "r")))
|
||||
{
|
||||
palette_entries_free (entries);
|
||||
g_warning ("failed to open palette file %s: can't happen?", filename);
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ session_set_window_geometry (GtkWidget *window,
|
|||
if ( window == NULL || info == NULL)
|
||||
return;
|
||||
|
||||
#ifdef WINDOWS_DISPLAY
|
||||
#if defined(GDK_WINDOWING) && (GDK_WINDOWING == GDK_WINDOWING_WIN32)
|
||||
/* We should not position windows so that no decoration is visible */
|
||||
if (info->y > 0)
|
||||
gtk_widget_set_uposition (window, info->x, info->y);
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
#endif /* WAIT_ANY */
|
||||
|
||||
#include "libgimp/gimpfeatures.h"
|
||||
#include "libgimp/gimpenv.h"
|
||||
|
||||
#include "appenv.h"
|
||||
#include "app_procs.h"
|
||||
|
|
@ -123,7 +124,14 @@ main (int argc, char **argv)
|
|||
#ifdef HAVE_LC_MESSAGES
|
||||
setlocale(LC_MESSAGES, "");
|
||||
#endif
|
||||
#ifdef LOCALEDIR
|
||||
bindtextdomain("gimp", LOCALEDIR);
|
||||
#else
|
||||
bindtextdomain("gimp", g_strconcat (gimp_data_directory (),
|
||||
G_DIR_SEPARATOR_S,
|
||||
"locale",
|
||||
NULL));
|
||||
#endif
|
||||
textdomain("gimp");
|
||||
|
||||
gtk_init (&argc, &argv);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ CC = cl -GA -G5 -GF $(OPTIMIZE) -W3 -MD -nologo
|
|||
# Change to /subsystem:console when debugging
|
||||
LDFLAGS = /link /subsystem:windows /machine:ix86 /debug
|
||||
INSTALL = copy
|
||||
TOUCH = copy makefile.msc+nul
|
||||
|
||||
GIMP_VER = 1.1
|
||||
GTK_VER = 1.3
|
||||
|
|
@ -28,24 +27,27 @@ GLIB_VER = 1.3
|
|||
GTK = ..\..\gtk+
|
||||
GLIB = ..\..\glib
|
||||
GMODULE = $(GLIB)\gmodule
|
||||
GETTEXT = ..\..\gettext-0.10.35
|
||||
|
||||
CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk\win32 -I$(GTK)
|
||||
CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk\win32 -I$(GTK) -I$(GETTEXT)\intl
|
||||
|
||||
GCG = ..\tools\gcg\gcg -I. -I ..\tools\gcg\gh
|
||||
|
||||
all : \
|
||||
..\config.h \
|
||||
..\libgimp\gimpfeatures.h \
|
||||
gimpim.lib \
|
||||
colormap_dialog.c \
|
||||
gimp.exe
|
||||
$(TOUCH) all
|
||||
|
||||
install : gimp.exe
|
||||
$(INSTALL) gimp.exe $(BIN)
|
||||
$(TOUCH) install
|
||||
|
||||
..\config.h : ..\config.h.win32
|
||||
copy ..\config.h.win32 ..\config.h
|
||||
copy ..\config.h.win32 $@
|
||||
|
||||
..\libgimp\gimpfeatures.h : ..\libgimp\gimpfeatures.h.win32
|
||||
copy ..\libgimp\gimpfeatures.h.win32 $@
|
||||
|
||||
gimpim_OBJECTS = \
|
||||
gimpdrawable.obj\
|
||||
|
|
@ -148,7 +150,7 @@ gimp_OBJECTS = \
|
|||
gradient.obj \
|
||||
gradient_cmds.obj \
|
||||
gradient_select.obj \
|
||||
gradient_select_cmds.obj \
|
||||
gradient_select_cmds.obj\
|
||||
guides_cmds.obj \
|
||||
gximage.obj \
|
||||
histogramwidget.obj \
|
||||
|
|
@ -156,6 +158,7 @@ gimp_OBJECTS = \
|
|||
hue_saturation.obj \
|
||||
image_map.obj \
|
||||
image_render.obj \
|
||||
indicator_area.obj \
|
||||
info_dialog.obj \
|
||||
info_window.obj \
|
||||
ink.obj \
|
||||
|
|
@ -169,6 +172,7 @@ gimp_OBJECTS = \
|
|||
layer_cmds.obj \
|
||||
layer_select.obj \
|
||||
layers_dialog.obj \
|
||||
lc_dialog.obj \
|
||||
levels.obj \
|
||||
lut_funcs.obj \
|
||||
magnify.obj \
|
||||
|
|
@ -241,7 +245,7 @@ gimp.res : gimp.rc wilber.ico
|
|||
rc -r -fo gimp.res gimp.rc
|
||||
|
||||
gimp.exe : ..\config.h $(gimp_OBJECTS) gimpim.lib gimp.def gimp.res ..\libgimp\gimpi.lib
|
||||
$(CC) $(CFLAGS) -Fegimp.exe $(gimp_OBJECTS) gimpim.lib ..\libgimp\gimpi.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(LDFLAGS) gimp.res gdi32.lib user32.lib /def:gimp.def
|
||||
$(CC) $(CFLAGS) -Fegimp.exe $(gimp_OBJECTS) gimpim.lib ..\libgimp\gimpi.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GETTEXT)\intl\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(LDFLAGS) gimp.res gdi32.lib user32.lib /def:gimp.def
|
||||
|
||||
# General rule for building $(gimp_OBJECTS)
|
||||
.c.obj:
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -479,7 +479,7 @@ palette_entries_save (PaletteEntriesP palette,
|
|||
return;
|
||||
|
||||
/* Open the requested file */
|
||||
if (! (fp = fopen (filename, "wb")))
|
||||
if (! (fp = fopen (filename, "w")))
|
||||
{
|
||||
g_message (_("can't save palette \"%s\"\n"), filename);
|
||||
return;
|
||||
|
|
@ -607,7 +607,7 @@ palette_entries_load (char *filename)
|
|||
|
||||
/* Open the requested file */
|
||||
|
||||
if (!(fp = fopen (filename, "rb")))
|
||||
if (!(fp = fopen (filename, "r")))
|
||||
{
|
||||
palette_entries_free (entries);
|
||||
g_warning ("failed to open palette file %s: can't happen?", filename);
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ session_set_window_geometry (GtkWidget *window,
|
|||
if ( window == NULL || info == NULL)
|
||||
return;
|
||||
|
||||
#ifdef WINDOWS_DISPLAY
|
||||
#if defined(GDK_WINDOWING) && (GDK_WINDOWING == GDK_WINDOWING_WIN32)
|
||||
/* We should not position windows so that no decoration is visible */
|
||||
if (info->y > 0)
|
||||
gtk_widget_set_uposition (window, info->x, info->y);
|
||||
|
|
|
|||
|
|
@ -531,7 +531,8 @@ text_gdk_image_to_region (GdkImage *image,
|
|||
unsigned char * data;
|
||||
|
||||
scale2 = scale * scale;
|
||||
#ifndef WINDOWS_DISPLAY
|
||||
/* GDK_WINDOWING is defined only with GTk+ 1.3 */
|
||||
#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
|
||||
black.red = black.green = black.blue = 0;
|
||||
gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
|
||||
black_pixel = black.pixel;
|
||||
|
|
@ -669,7 +670,7 @@ text_render (GimpImage *gimage,
|
|||
/* get black and white pixels for this gdisplay */
|
||||
black.red = black.green = black.blue = 0;
|
||||
white.red = white.green = white.blue = 65535;
|
||||
#ifndef WINDOWS_DISPLAY
|
||||
#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
|
||||
gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
|
||||
gdk_colormap_alloc_color (gdk_colormap_get_system (), &white, FALSE, TRUE);
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
|
|
|||
|
|
@ -531,7 +531,8 @@ text_gdk_image_to_region (GdkImage *image,
|
|||
unsigned char * data;
|
||||
|
||||
scale2 = scale * scale;
|
||||
#ifndef WINDOWS_DISPLAY
|
||||
/* GDK_WINDOWING is defined only with GTk+ 1.3 */
|
||||
#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
|
||||
black.red = black.green = black.blue = 0;
|
||||
gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
|
||||
black_pixel = black.pixel;
|
||||
|
|
@ -669,7 +670,7 @@ text_render (GimpImage *gimage,
|
|||
/* get black and white pixels for this gdisplay */
|
||||
black.red = black.green = black.blue = 0;
|
||||
white.red = white.green = white.blue = 65535;
|
||||
#ifndef WINDOWS_DISPLAY
|
||||
#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
|
||||
gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
|
||||
gdk_colormap_alloc_color (gdk_colormap_get_system (), &white, FALSE, TRUE);
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -531,7 +531,8 @@ text_gdk_image_to_region (GdkImage *image,
|
|||
unsigned char * data;
|
||||
|
||||
scale2 = scale * scale;
|
||||
#ifndef WINDOWS_DISPLAY
|
||||
/* GDK_WINDOWING is defined only with GTk+ 1.3 */
|
||||
#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
|
||||
black.red = black.green = black.blue = 0;
|
||||
gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
|
||||
black_pixel = black.pixel;
|
||||
|
|
@ -669,7 +670,7 @@ text_render (GimpImage *gimage,
|
|||
/* get black and white pixels for this gdisplay */
|
||||
black.red = black.green = black.blue = 0;
|
||||
white.red = white.green = white.blue = 65535;
|
||||
#ifndef WINDOWS_DISPLAY
|
||||
#if !defined(GDK_WINDOWING) || (GDK_WINDOWING == GDK_WINDOWING_X11)
|
||||
gdk_colormap_alloc_color (gdk_colormap_get_system (), &black, FALSE, TRUE);
|
||||
gdk_colormap_alloc_color (gdk_colormap_get_system (), &white, FALSE, TRUE);
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -479,7 +479,7 @@ palette_entries_save (PaletteEntriesP palette,
|
|||
return;
|
||||
|
||||
/* Open the requested file */
|
||||
if (! (fp = fopen (filename, "wb")))
|
||||
if (! (fp = fopen (filename, "w")))
|
||||
{
|
||||
g_message (_("can't save palette \"%s\"\n"), filename);
|
||||
return;
|
||||
|
|
@ -607,7 +607,7 @@ palette_entries_load (char *filename)
|
|||
|
||||
/* Open the requested file */
|
||||
|
||||
if (!(fp = fopen (filename, "rb")))
|
||||
if (!(fp = fopen (filename, "r")))
|
||||
{
|
||||
palette_entries_free (entries);
|
||||
g_warning ("failed to open palette file %s: can't happen?", filename);
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@
|
|||
/* #undef TIME_WITH_SYS_TIME */
|
||||
|
||||
/* #undef ENABLE_MP */
|
||||
/* #undef ENABLE_NLS */
|
||||
#define ENABLE_NLS 1
|
||||
/* #undef HAVE_CATGETS */
|
||||
/* #undef HAVE_DIRENT_H */
|
||||
/* #undef HAVE_DOPRNT */
|
||||
|
|
@ -187,22 +187,3 @@
|
|||
|
||||
/* Define if you have the i library (-li). */
|
||||
/* #undef HAVE_LIBI */
|
||||
|
||||
/* There are three orthogonal switches regarding Unix, X11 and Windows:
|
||||
* GDK_WINDOWING (from GTk+), WIN32 (vs __unix__ or something else),
|
||||
* NATIVE_WIN32 vs. __CYGWIN32__
|
||||
*/
|
||||
|
||||
/* Define if the X Window System is missing or not being used. */
|
||||
#define X_DISPLAY_MISSING 1
|
||||
|
||||
/* Define if compiling for Win32 (but possibly still for X). */
|
||||
#define WIN32 1
|
||||
|
||||
/* Define if the Win32 GDI API is being used. */
|
||||
#define WINDOWS_DISPLAY 1
|
||||
|
||||
/* Define if compiling for Win32 but not with the Cygwin POSIX emulation,
|
||||
* i.e. with Microsoft C runtime. This macro probably should be renamed.
|
||||
*/
|
||||
#define NATIVE_WIN32 1
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ extern "C" {
|
|||
#define GIMP_MAJOR_VERSION (1)
|
||||
#define GIMP_MINOR_VERSION (1)
|
||||
#define GIMP_MICRO_VERSION (5)
|
||||
#define GIMP_VERSION "1.1.2"
|
||||
#define GIMP_VERSION "1.1.5"
|
||||
#define GIMP_CHECK_VERSION(major, minor, micro) \
|
||||
(GIMP_MAJOR_VERSION > (major) || \
|
||||
(GIMP_MAJOR_VERSION == (major) && GIMP_MINOR_VERSION > (minor)) || \
|
||||
|
|
|
|||
|
|
@ -29,8 +29,9 @@ GLIB_VER = 1.3
|
|||
|
||||
GTK = ..\..\gtk+
|
||||
GLIB = ..\..\glib
|
||||
GETTEXT = ..\..\gettext-0.10.35
|
||||
|
||||
CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK) -DGIMPDIR=\"$(GIMPDIR)\"
|
||||
CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK) -I$(GETTEXT)\intl -DGIMPDIR=\"$(GIMPDIR)\"
|
||||
|
||||
all : \
|
||||
..\config.h \
|
||||
|
|
@ -88,7 +89,7 @@ gimp_OBJECTS = \
|
|||
parasite.obj
|
||||
|
||||
gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def
|
||||
$(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def
|
||||
$(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(GETTEXT)\intl\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) user32.lib /def:gimp.def
|
||||
|
||||
# Pass -DLIBGIMP_COMPILATION when compiling these
|
||||
|
||||
|
|
@ -137,7 +138,7 @@ gimpui_OBJECTS = \
|
|||
gimppatternmenu.obj
|
||||
|
||||
gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def
|
||||
$(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) gimp-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def
|
||||
$(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) gimp-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GETTEXT)\intl\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def
|
||||
|
||||
gimpmenu.obj : gimpmenu.c
|
||||
$(CC) $(CFLAGS) -GD -c gimpmenu.c
|
||||
|
|
|
|||
|
|
@ -1,6 +1,13 @@
|
|||
#include "libgimp/gimpintl.h"
|
||||
#include <locale.h>
|
||||
|
||||
#ifndef LOCALEDIR
|
||||
#define LOCALEDIR g_strconcat (gimp_data_directory (), \
|
||||
G_DIR_SEPARATOR_S, \
|
||||
"locale", \
|
||||
NULL)
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LC_MESSAGES
|
||||
#define INIT_I18N() \
|
||||
setlocale(LC_MESSAGES, ""); \
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h> /* Include early for NATIVE_WIN32 */
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -58,6 +58,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h> /* For NATIVE_WIN32 */
|
||||
|
||||
#ifdef NATIVE_WIN32
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h> /* Include early for NATIVE_WIN32 */
|
||||
#include <setjmp.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
|||
|
|
@ -58,6 +58,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h> /* For NATIVE_WIN32 */
|
||||
|
||||
#ifdef NATIVE_WIN32
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
|
|
|
|||
|
|
@ -68,6 +68,8 @@
|
|||
/* #define PROFILE 1 */
|
||||
/* #define VERBOSE 1 */
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#ifdef PROFILE
|
||||
# include <sys/times.h>
|
||||
#endif
|
||||
|
|
@ -75,7 +77,9 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <gtk/gtk.h>
|
||||
#include "libgimp/gimp.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h> /* For NATIVE_WIN32 */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#ifdef HAVE_UNISTD_H
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h> /* Include early for NATIVE_WIN32 */
|
||||
#include <setjmp.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
|||
|
|
@ -58,6 +58,8 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h> /* For NATIVE_WIN32 */
|
||||
|
||||
#ifdef NATIVE_WIN32
|
||||
#define STRICT
|
||||
#include <windows.h>
|
||||
|
|
|
|||
|
|
@ -19,19 +19,18 @@ BIN = $(GIMP)\plug-ins
|
|||
FROMPLUGINSDIR=YES # Used to bypass other parts below
|
||||
|
||||
# List plug-ins. We must use several lists to work around nmake's limits
|
||||
SIMPLE1 = AlienMap CEL CML_explorer FractalExplorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur bumpmap borderaverage c_astretch checkerboard colorify compose convmatrix cubism
|
||||
SIMPLE1 = AlienMap CEL CML_explorer FractalExplorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard colorify compose convmatrix cubism
|
||||
SIMPLE2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace
|
||||
SIMPLE3 = gauss_iir gauss_rle gbr gif gee gfig gicon glasstile gqbist gradmap grid gtm guillotine header hot hrz gz illusion jigsaw laplace lic
|
||||
SIMPLE3 = gauss_iir gauss_rle gbr gee gfig gicon gif gifload glasstile gqbist gradmap grid gtm guillotine header hot hrz gz illusion jigsaw laplace lic
|
||||
SIMPLE4 = mapcolor max_rgb mblur mosaic newsprint nlfilt noisify normalize nova oilify pagecurl palette papertile pat pcx pix pixelize plasma plugindetails pnm polar psd randomize ripple rotate rotators
|
||||
SIMPLE5 = scatter_hsv semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spread threshold_alpha tile tileit tiler waves whirlpinch wind video vinvert vpropagate wmf xbm zealouscrop
|
||||
COMPLEX1 = Lighting MapObject bmp dbbrowser faxg3 fits flame fp gfli ifscompose iwarp jpeg maze png tiff
|
||||
SIMPLE5 = scatter_hsv semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spread struc tga threshold_alpha tile tileit tiler video vinvert vpropagate waves whirlpinch wind wmf xbm zealouscrop
|
||||
COMPLEX1 = Lighting MapObject bmp dbbrowser faxg3 fits flame fp gfli ifscompose iwarp jpeg maze png rcm tiff
|
||||
|
||||
# These are unofficial, ie not in the CVS To build these, you should
|
||||
# get tml's source snapshot and copy them from
|
||||
# ..\unofficial-plug-ins. Also uncomment the reference to COMPLEX2
|
||||
# below.
|
||||
# get tml's source snapshot and copy this makefile to the
|
||||
# ..\unofficial-plug-ins directory, and do "nmake -f makefile.msc unofficial".
|
||||
|
||||
COMPLEX2 = guash user_filter twain
|
||||
UNOFFICIAL = guash user_filter twain
|
||||
|
||||
# The main target
|
||||
|
||||
|
|
@ -42,6 +41,9 @@ all : ..\config.h libs-all simple-plugins-all complex-plugins-all
|
|||
|
||||
install : libs-install simple-plugins-install complex-plugins-install scripts-install
|
||||
|
||||
unofficial:
|
||||
for %d in ($(UNOFFICIAL)) do nmake -nologo -f makefile.msc sub-one-complex DIR=%d TARGET=install
|
||||
|
||||
clean : libs-clean simple-plugins-clean complex-plugins-clean
|
||||
|
||||
libs-all :
|
||||
|
|
@ -107,7 +109,6 @@ sub-complex-plugins :
|
|||
@cd script-fu
|
||||
@nmake -nologo -f ..\makefile.msc TOP=..\.. PLUGIN=script-fu COMPLEX_script_fu=1 $(TARGET)
|
||||
@cd ..
|
||||
# for %d in ($(COMPLEX2)) do nmake -nologo -f makefile.msc sub-one-complex DIR=%d TARGET=$(TARGET)
|
||||
|
||||
sub-one-complex :
|
||||
@cd $(DIR)
|
||||
|
|
@ -118,6 +119,7 @@ scripts-install :
|
|||
$(INSTALL) script-fu\scripts\*.scm $(GIMP)\scripts
|
||||
$(INSTALL) script-fu\scripts\*.jpg $(GIMP)\scripts
|
||||
$(INSTALL) FractalExplorer\fractalexplorer-examples\* $(GIMP)\fractalexplorer
|
||||
del $(GIMP)\fractalexplorer\Makefile.am
|
||||
|
||||
!ENDIF
|
||||
!ENDIF
|
||||
|
|
@ -241,6 +243,16 @@ EXTRACFLAGS = -I$(PNG) -I$(ZLIB)
|
|||
EXTRALIBS = $(PNG)\libpng.lib $(ZLIB)\zlib.lib
|
||||
!ENDIF
|
||||
|
||||
!IFDEF COMPLEX_rcm
|
||||
OBJECTS = \
|
||||
rcm.obj \
|
||||
rcm_callback.obj \
|
||||
rcm_dialog.obj \
|
||||
rcm_gdk.obj \
|
||||
rcm_misc.obj
|
||||
OPTIMIZE =
|
||||
!ENDIF
|
||||
|
||||
!IFDEF COMPLEX_script_fu
|
||||
OBJECTS = \
|
||||
interp_md5.obj \
|
||||
|
|
@ -285,14 +297,13 @@ OBJECTS = \
|
|||
|
||||
!IFDEF COMPLEX_twain
|
||||
OBJECTS = \
|
||||
tw_dump.obj \
|
||||
tw_func.obj \
|
||||
tw_sess.obj \
|
||||
tw_util.obj \
|
||||
twain.obj
|
||||
EXTRALIBS = user32.lib
|
||||
!ENDIF
|
||||
|
||||
LDFLAGS = /link /subsystem:windows /machine:ix86 /debug
|
||||
LDFLAGS = /link /subsystem:windows /machine:ix86 # /debug
|
||||
|
||||
GIMP_VER = 1.1
|
||||
GTK_VER = 1.3
|
||||
|
|
@ -300,16 +311,17 @@ GLIB_VER = 1.3
|
|||
|
||||
GTK = $(TOP)\..\gtk+
|
||||
GLIB = $(TOP)\..\glib
|
||||
GETTEXT = $(TOP)\..\gettext-0.10.35
|
||||
|
||||
PLUGINDIR = $(TOP)\plug-ins
|
||||
|
||||
!IFNDEF OPTIMIZE
|
||||
#OPTIMIZE = -Ox
|
||||
OPTIMIZE = -Zi
|
||||
OPTIMIZE = -Ox
|
||||
#OPTIMIZE = -Zi
|
||||
!ENDIF
|
||||
CC = cl -nologo -G5 -GF $(OPTIMIZE) -W3 -MD -Zm200
|
||||
CC = cl -nologo -G5 -GF $(OPTIMIZE) -W2 -MD -Zm200
|
||||
|
||||
CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(TOP) -I$(PLUGINDIR) -I$(PLUGINDIR)\libgck -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK)
|
||||
CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(TOP) -I$(PLUGINDIR) -I$(PLUGINDIR)\libgck -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK) -I$(GETTEXT)\intl
|
||||
|
||||
!IFDEF PLUGIN
|
||||
|
||||
|
|
@ -334,7 +346,7 @@ RESOURCE = ..\..\app\gimp.res
|
|||
!ENDIF
|
||||
|
||||
$(PLUGIN).exe : $(OBJECTS) $(RESOURCE)
|
||||
$(CC) $(CFLAGS) -MD -Fe$(PLUGIN).exe $(OBJECTS) $(RESOURCE) ..\megawidget\megawidget.lib ..\gpc\gpc.lib ..\libgck\gck\gck.lib ..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(EXTRALIBS) $(LDFLAGS)
|
||||
$(CC) $(CFLAGS) -MD -Fe$(PLUGIN).exe $(OBJECTS) $(RESOURCE) $(PLUGINDIR)\megawidget\megawidget.lib $(PLUGINDIR)\gpc\gpc.lib $(PLUGINDIR)\libgck\gck\gck.lib ..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GETTEXT)\intl\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(EXTRALIBS) $(LDFLAGS)
|
||||
|
||||
$(PLUGIN).res : $(PLUGIN).rc
|
||||
rc -r -fo $(PLUGIN).res $(PLUGIN).rc
|
||||
|
|
@ -367,5 +379,7 @@ clean :
|
|||
erase *.lib
|
||||
erase *.exp
|
||||
erase *.exe
|
||||
erase *.pdb
|
||||
erase *.ilk
|
||||
|
||||
!ENDIF
|
||||
|
|
|
|||
|
|
@ -68,6 +68,8 @@
|
|||
/* #define PROFILE 1 */
|
||||
/* #define VERBOSE 1 */
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#ifdef PROFILE
|
||||
# include <sys/times.h>
|
||||
#endif
|
||||
|
|
@ -75,7 +77,9 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <gtk/gtk.h>
|
||||
#include "libgimp/gimp.h"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue