Some clarifications.
2000-01-02 Tor Lillqvist <tml@iki.fi> * README.win32: Some clarifications. * app/makefile.{cygwin,msc} * libgimp/makefile.{cygwin,msc} * plug-ins/makefile.{cygwin,msc}: Changes corresponding to the GTk+ source reorg. Add new files. * app/text_tool.c: Remove now unnecessary workaround for Win32 POINTS identifier clash.
This commit is contained in:
Tor Lillqvist
committed by
Tor Lillqvist
Tor Lillqvist
parent
97f4fc02ca
commit
b48c534756
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2000-01-02 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* README.win32: Some clarifications.
|
||||
|
||||
* app/makefile.{cygwin,msc}
|
||||
* libgimp/makefile.{cygwin,msc}
|
||||
* plug-ins/makefile.{cygwin,msc}: Changes corresponding to the GTk+
|
||||
source reorg. Add new files.
|
||||
|
||||
* app/text_tool.c: Remove now unnecessary workaround for Win32
|
||||
POINTS identifier clash.
|
||||
|
||||
2000-01-01 Garry R. Osgood <gosgood@idt.net>
|
||||
Happy New Year.
|
||||
*app/disp_callbacks.c Checked RGB/GRAY/INDEXED combinations
|
||||
|
||||
23
README.win32
23
README.win32
@ -6,19 +6,20 @@ 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 the Microsoft compiler
|
||||
or gcc 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 the GLib 1.3 distribution.
|
||||
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.)
|
||||
|
||||
The GIMP wants to be built with the GNU "intl" library for
|
||||
internationalisation (i18n). Get the version ported to Win32 (not a
|
||||
very big deal) 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 references to the gnu-intl library
|
||||
from the makefiles.
|
||||
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
|
||||
references to the gnu-intl library from the makefiles.
|
||||
|
||||
Note that while the GNU gettext package is under the GPL, the "intl"
|
||||
library part as distributed with GNU libc is under the LGPL (like GTk+
|
||||
|
||||
@ -26,7 +26,7 @@ GLIB = ../../glib
|
||||
GMODULE = $(GLIB)/gmodule
|
||||
INTL = ../../intl
|
||||
|
||||
CFLAGS = $(OPTIMIZE) -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)/gdk/win32 -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
|
||||
|
||||
@ -141,6 +141,7 @@ gimp_OBJECTS = \
|
||||
gimpcontextpreview.o \
|
||||
gimpdnd.o \
|
||||
gimphelp.o \
|
||||
gimphelp_cmds.o \
|
||||
gimphistogram.o \
|
||||
gimplist.o \
|
||||
gimplut.o \
|
||||
|
||||
@ -33,7 +33,7 @@ GLIB = ..\..\glib
|
||||
GMODULE = $(GLIB)\gmodule
|
||||
INTL = ..\..\intl
|
||||
|
||||
CFLAGS = -DREGEX_MALLOC -DHAVE_CONFIG_H -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk\win32 -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
|
||||
|
||||
@ -148,6 +148,7 @@ gimp_OBJECTS = \
|
||||
gimpcontextpreview.obj \
|
||||
gimpdnd.obj \
|
||||
gimphelp.obj \
|
||||
gimphelp_cmds.obj \
|
||||
gimphistogram.obj \
|
||||
gimplist.obj \
|
||||
gimplut.obj \
|
||||
@ -274,7 +275,7 @@ gimp.def: gimp.sym
|
||||
copy /y $@+gimp.sym $@
|
||||
|
||||
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 $(INTL)\gnu-intl.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\gdk-$(GTK_VER).lib $(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:
|
||||
|
||||
@ -21,13 +21,7 @@
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <gdk/gdk.h>
|
||||
|
||||
#ifdef GDK_WINDOWING_WIN32
|
||||
# define POINTS POINTS_win32 /* Guard against clash */
|
||||
#endif
|
||||
#include <gdk/gdkprivate.h>
|
||||
#ifdef GDK_WINDOWING_WIN32
|
||||
# undef POINTS
|
||||
#endif
|
||||
|
||||
#include "appenv.h"
|
||||
#include "drawable.h"
|
||||
|
||||
@ -21,13 +21,7 @@
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <gdk/gdk.h>
|
||||
|
||||
#ifdef GDK_WINDOWING_WIN32
|
||||
# define POINTS POINTS_win32 /* Guard against clash */
|
||||
#endif
|
||||
#include <gdk/gdkprivate.h>
|
||||
#ifdef GDK_WINDOWING_WIN32
|
||||
# undef POINTS
|
||||
#endif
|
||||
|
||||
#include "appenv.h"
|
||||
#include "drawable.h"
|
||||
|
||||
@ -21,13 +21,7 @@
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <gdk/gdk.h>
|
||||
|
||||
#ifdef GDK_WINDOWING_WIN32
|
||||
# define POINTS POINTS_win32 /* Guard against clash */
|
||||
#endif
|
||||
#include <gdk/gdkprivate.h>
|
||||
#ifdef GDK_WINDOWING_WIN32
|
||||
# undef POINTS
|
||||
#endif
|
||||
|
||||
#include "appenv.h"
|
||||
#include "drawable.h"
|
||||
|
||||
@ -33,7 +33,7 @@ INTL = ../../intl
|
||||
|
||||
GIMP_VER = 1.1
|
||||
|
||||
CFLAGS = $(OPTIMIZE) -I.. -I$(GLIB) -I$(GTK)/gdk/win32 -I$(GTK)/gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"
|
||||
CFLAGS = $(OPTIMIZE) -I.. -I$(GLIB) -I$(GTK)/gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"
|
||||
|
||||
all : \
|
||||
../config.h \
|
||||
|
||||
@ -39,7 +39,7 @@ GTK = ..\..\gtk+
|
||||
GLIB = ..\..\glib
|
||||
INTL = ..\..\intl
|
||||
|
||||
CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK)\gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"
|
||||
CFLAGS = -I.. -I$(GLIB) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL) -DGIMPDIR=\"$(GIMPDIR)\"
|
||||
|
||||
all : \
|
||||
..\config.h \
|
||||
@ -149,7 +149,7 @@ gimpui_OBJECTS = \
|
||||
gimpunitmenu.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 $(INTL)\gnu-intl.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\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gimpui.def
|
||||
|
||||
gimpmenu.obj : gimpmenu.c
|
||||
$(CC) $(CFLAGS) -GD -c gimpmenu.c
|
||||
|
||||
@ -532,7 +532,7 @@ OPTIMIZE = -O
|
||||
|
||||
CC = gcc $(OPTIMIZE) -mno-cygwin -mpentium -fnative-struct
|
||||
|
||||
CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(TOP) -I$(PLUGINDIR) -I$(PLUGINDIR)/libgck -I$(GLIB) -I$(GTK)/gdk/win32 -I$(GTK)/gdk -I$(GTK) -I$(INTL)
|
||||
CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(TOP) -I$(PLUGINDIR) -I$(PLUGINDIR)/libgck -I$(GLIB) -I$(GTK)/gdk -I$(GTK) -I$(INTL)
|
||||
|
||||
ifdef PLUGIN
|
||||
|
||||
|
||||
@ -567,7 +567,7 @@ RTL = -MDd
|
||||
|
||||
CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200
|
||||
|
||||
CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(TOP) -I$(PLUGINDIR) -I$(PLUGINDIR)\libgck -I$(GLIB) -I$(GTK)\gdk\win32 -I$(GTK)\gdk -I$(GTK) -I$(INTL)
|
||||
CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) -I. -I$(TOP) -I$(PLUGINDIR) -I$(PLUGINDIR)\libgck -I$(GLIB) -I$(GTK)\gdk -I$(GTK)\gdk -I$(GTK) -I$(INTL)
|
||||
|
||||
LDFLAGS = /link /subsystem:windows /machine:ix86 $(LINKDEBUG)
|
||||
|
||||
@ -594,7 +594,7 @@ RESOURCE = ..\..\app\gimp.res
|
||||
!ENDIF
|
||||
|
||||
$(PLUGIN).exe : $(OBJECTS) $(RESOURCE)
|
||||
$(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 $(INTL)\gnu-intl.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\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(EXTRALIBS) $(LDFLAGS)
|
||||
|
||||
$(PLUGIN).res : $(PLUGIN).rc
|
||||
rc -r -fo $(PLUGIN).res $(PLUGIN).rc
|
||||
|
||||
Reference in New Issue
Block a user