Commit 565ca6b1 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist
Browse files

Update, tell people the MSVC makefiles are not up-to-date.

2000-08-24  Tor Lillqvist  <tml@iki.fi>

	* README.win32: Update, tell people the MSVC makefiles are not
	up-to-date.

	* */makefile.msc: Add warning about being outdated.

	* */makefile.cygwin: Remove.

	* */makefile.mingw.in: New files replacing the makefile.cygwin files.

	* */Makefile.am: Change correspondingly.

	* configure.in: Generate corresponding makefile.mingw files.

	* app/about_dialog.c: Include <gdk/gdkconfig.h> for
	GDK_USE_UTF8_MBS. Add UTF-8 version of a string.

	* libgimp/gimp.c: Remove horrible Win32 hack, not needed any longer.

	* plug-ins/common/jpeg.c: Use g_message, not g_warning.

	* plug-ins/common/winclipboard.c
	* plug-ins/common/winprint.c: Remove COMPAT_CRUFT.

	* plug-ins/Lighting/lighing_apply.c: Fix for non-interactive mode
	bug, supplied by Piet van Oostrum.

	* tips/makefile.mingw: New file.

	* tips/Makefile.am: Add it.
parent 828f6983
2000-08-24 Tor Lillqvist <tml@iki.fi>
* README.win32: Update, tell people the MSVC makefiles are not
up-to-date.
* */makefile.msc: Add warning about being outdated.
* */makefile.cygwin: Remove.
* */makefile.mingw.in: New files replacing the makefile.cygwin files.
* */Makefile.am: Change correspondingly.
* configure.in: Generate corresponding makefile.mingw files.
* app/about_dialog.c: Include <gdk/gdkconfig.h> for
GDK_USE_UTF8_MBS. Add UTF-8 version of a string.
* libgimp/gimp.c: Remove horrible Win32 hack, not needed any longer.
* plug-ins/common/jpeg.c: Use g_message, not g_warning.
* plug-ins/common/winclipboard.c
* plug-ins/common/winprint.c: Remove COMPAT_CRUFT.
* plug-ins/Lighting/lighing_apply.c: Fix for non-interactive mode
bug, supplied by Piet van Oostrum.
* tips/makefile.mingw: New file.
* tips/Makefile.am: Add it.
2000-08-24 Sven Neumann <sven@gimp.org>
 
* libgimp/gimpcompat.h
......
......@@ -3,8 +3,8 @@ 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. The gcc to use should be for a mingw configuration (producing
To build the GIMP on Win32, you can use either gcc or Microsoft Visual
C++. 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
......@@ -12,6 +12,11 @@ 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.)
Unfortunately the makefiles for MSVC aren't quite up-to-date. You will
have to modify them a bit if you want to use MSVC. But quite possibly
by the time you read this somebody might have contributes new
makefiles, or even project files.
The GIMP wants to be built with the GNU "intl" library for
internationalisation (i18n). Get the version ported to Win32 from the
web site mentioned above. We build the "intl" library to a DLL called
......@@ -23,18 +28,18 @@ 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). 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.
the intl library, even if they are the same source code, 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
said directories.
finally in modules. Check the makefile.mingw files in 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 to generate mingw EXEs and DLLs is
quite feasible, either. I would love to be proved wrong.
hand-maintained makefiles. I know. On the other hand, I don't think
using the 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>
......@@ -435,7 +435,8 @@ EXTRA_DIST = \
colormap_dialog.i.h \
colormap_dialog.p.h \
colormap_dialog.t.h \
makefile.cygwin \
makefile.mingw \
makefile.mingw.in \
makefile.msc \
gimp.rc \
gimp.sym \
......@@ -473,6 +474,9 @@ files:
echo $$p; \
done
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/app/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=app/$@ CONFIG_HEADERS= $(SHELL) ./config.status
# GCG stuff
#
# SUFFIXES = .gc .gh
......
......@@ -24,6 +24,7 @@
#include <time.h>
#include <gtk/gtk.h>
#include <gdk/gdkconfig.h> /* For GDK_USE_UTF8_MBS */
#include <gdk/gdkkeysyms.h>
#include "about_dialog.h"
......@@ -108,7 +109,11 @@ static gchar *hadja_text[] =
{
"Hadjaha!",
"Nej!",
#ifndef GDK_USE_UTF8_MBS
"Tvrtom!"
#else
"Tvärtom!"
#endif
};
void
......
......@@ -24,6 +24,7 @@
#include <time.h>
#include <gtk/gtk.h>
#include <gdk/gdkconfig.h> /* For GDK_USE_UTF8_MBS */
#include <gdk/gdkkeysyms.h>
#include "about_dialog.h"
......@@ -108,7 +109,11 @@ static gchar *hadja_text[] =
{
"Hadjaha!",
"Nej!",
#ifndef GDK_USE_UTF8_MBS
"Tvrtom!"
#else
"Tvärtom!"
#endif
};
void
......
......@@ -24,6 +24,7 @@
#include <time.h>
#include <gtk/gtk.h>
#include <gdk/gdkconfig.h> /* For GDK_USE_UTF8_MBS */
#include <gdk/gdkkeysyms.h>
#include "about_dialog.h"
......@@ -108,7 +109,11 @@ static gchar *hadja_text[] =
{
"Hadjaha!",
"Nej!",
#ifndef GDK_USE_UTF8_MBS
"Tvrtom!"
#else
"Tvärtom!"
#endif
};
void
......
## Makefile for building gimp.exe with gcc
## Use: make -f makefile.cygwin
# Change this to wherever you want to install gimp.exe.
# This is what I use as installation target, from where the installer-builder
# will pick it up.
BIN = /install/gimp/bin
################################################################
# Nothing much configurable below
TOP = ../..
GIMP_VER = 1.1
include ../build/win32/make.mingw
DEFINES = -DREGEX_MALLOC -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"Gimp\"
INCLUDES = -I . -I ..
DEPCFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS)
all : \
../config.h \
libgimpim.a \
colormap_dialog.c \
gimp.exe
install : gimp.exe
$(INSTALL) gimp.exe $(BIN)
../config.h : ../config.h.win32
cp ../config.h.win32 ../config.h
gimpim_OBJECTS = \
gimpdrawable.o \
gimpimage.o \
gimpobject.o \
gimppreviewcache.o\
gimpset.o \
gimpsignal.o
libgimpim.a : $(gimpim_OBJECTS)
ar cr libgimpim.a $(gimpim_OBJECTS)
gimp_OBJECTS = \
about_dialog.o \
airbrush.o \
airbrush_blob.o \
app_procs.o \
asupsample.o \
batch.o \
bezier_select.o \
blend.o \
blob.o \
boundary.o \
brightness_contrast.o \
brush_edit.o \
brush_scale.o \
brush_select.o \
brush_select_cmds.o \
brushes_cmds.o \
bucket_fill.o \
by_color_select.o \
channel.o \
channel_cmds.o \
channels_dialog.o \
channel_ops.o \
channel_ops_cmds.o \
clone.o \
color_area.o \
color_balance.o \
color_cmds.o \
color_notebook.o \
color_panel.o \
color_picker.o \
color_select.o \
color_transfer.o \
colormaps.o \
colormap_dialog.o \
commands.o \
context_manager.o \
convert.o \
convert_cmds.o \
convolve.o \
crop.o \
cursorutil.o \
curves.o \
datafiles.o \
desaturate.o \
devices.o \
dialog_handler.o \
disp_callbacks.o \
display_cmds.o \
docindex.o \
dodgeburn.o \
draw_core.o \
drawable.o \
drawable_cmds.o \
edit_cmds.o \
edit_selection.o \
ellipse_select.o \
eraser.o \
errorconsole.o \
errors.o \
equalize.o \
fileops.o \
fileops_cmds.o \
flip_tool.o \
floating_sel.o \
floating_sel_cmds.o \
file_new_dialog.o \
free_select.o \
fuzzy_select.o \
gdisplay.o \
gdisplay_color.o \
gdisplay_color_ui.o \
gdisplay_ops.o \
general.o \
gimage.o \
gimage_mask.o \
gimpbrush.o \
gimpbrushgenerated.o \
gimpbrushlist.o \
gimpbrushpipe.o \
gimpcontext.o \
gimpcontextpreview.o \
gimpdnd.o \
gimphelp.o \
gimphistogram.o \
gimplist.o \
gimplut.o \
gimpparasite.o \
gimpprogress.o \
gimprc.o \
gimprc_cmds.o \
gimpui.o \
gimpunit.o \
global_edit.o \
gradient.o \
gradient_cmds.o \
gradient_select.o \
gradient_select_cmds.o \
gradients_cmds.o \
guides_cmds.o \
gtkwrapbox.o \
gtkhwrapbox.o \
gtkvwrapbox.o \
gximage.o \
help_cmds.o \
histogramwidget.o \
histogram_tool.o \
hue_saturation.o \
image_cmds.o \
image_map.o \
image_new.o \
image_render.o \
indicator_area.o \
info_dialog.o \
info_window.o \
ink.o \
interface.o \
internal_procs.o \
invert.o \
iscissors.o \
layer.o \
layer_cmds.o \
layer_select.o \
layers_dialog.o \
lc_dialog.o \
levels.o \
lut_funcs.o \
magnify.o \
main.o \
measure.o \
menus.o \
message_cmds.o \
misc_cmds.o \
module_db.o \
move.o \
nav_window.o \
ops_buttons.o \
palette.o \
palette_cmds.o \
palette_select.o \
paint_core.o \
paint_funcs.o \
paintbrush.o \
parasite_cmds.o \
parasitelist.o \
path.o \
paths_cmds.o \
paths_dialog.o \
pattern_select.o \
pattern_select_cmds.o \
patterns.o \
patterns_cmds.o \
pencil.o \
perspective_tool.o \
pixel_processor.o \
pixel_region.o \
plug_in.o \
plug_in_cmds.o \
posterize.o \
preferences_dialog.o \
procedural_db.o \
procedural_db_cmds.o \
qmask.o \
rect_select.o \
regex.o \
resize.o \
rotate_tool.o \
scale.o \
scale_tool.o \
scan_convert.o \
scroll.o \
selection.o \
selection_cmds.o \
session.o \
shear_tool.o \
smudge.o \
temp_buf.o \
text_tool.o \
text_tool_cmds.o \
threshold.o \
tile.o \
tile_cache.o \
tile_manager.o \
tile_swap.o \
tips_dialog.o \
tool_options.o \
tools.o \
tools_cmds.o \
transform_core.o \
transform_tool.o \
undo.o \
undo_cmds.o \
undo_history.o \
unit_cmds.o \
user_install.o \
xcf.o
gimpres.o : gimp.rc wilber.ico
windres gimp.rc gimpres.o
gimp.def: gimp.sym
echo EXPORTS >$@
cat $< >>$@
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 $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) 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 $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) 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 $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gimpres.o -lgdi32 -luser32 -lshell32
$(DLLTOOL) --dllname gimp.exe gimp.def --output-lib libgimp.a $(gimp_OBJECTS)
## Makefile for building gimp.exe with gcc on Win32.
## You should use GNU make running on cygwin.
## Use: make -f makefile.mingw
# Change this to wherever you want to install gimp.exe.
# This is what I use as installation target, from where the installer-builder
# will pick it up.
BIN = /install/gimp/bin
TOP = ../..
include ../build/win32/make.mingw
# Possibly override GIMP version from build/win32/module.defs
GIMP_VER = @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@
################################################################
DEFINES = -DREGEX_MALLOC -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"Gimp\"
INCLUDES = -I . -I ..
DEPCFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(INTL_CFLAGS)
all : \
../config.h \
libgimpim.a \
colormap_dialog.c \
gimp.exe
install : gimp.exe
$(INSTALL) gimp.exe $(BIN)
../config.h : ../config.h.win32
cp $@ $<
gimpim_OBJECTS = \
gimpdrawable.o \
gimpimage.o \
gimpobject.o \
gimppreviewcache.o \
gimpset.o \
gimpsignal.o
libgimpim.a : $(gimpim_OBJECTS)
ar cr libgimpim.a $(gimpim_OBJECTS)
gimp_OBJECTS = \
about_dialog.o \
airbrush.o \
airbrush_blob.o \
app_procs.o \
asupsample.o \
batch.o \
bezier_select.o \
blend.o \
blob.o \
boundary.o \
brightness_contrast.o \
brush_edit.o \
brush_scale.o \
brush_select.o \
brush_select_cmds.o \
brushes_cmds.o \
bucket_fill.o \
by_color_select.o \
channel.o \
channel_cmds.o \
channels_dialog.o \
channel_ops.o \
channel_ops_cmds.o \
clone.o \
color_area.o \
color_balance.o \
color_cmds.o \
color_notebook.o \
color_panel.o \
color_picker.o \
color_select.o \
color_transfer.o \
colormaps.o \
colormap_dialog.o \
commands.o \
context_manager.o \
convert.o \
convert_cmds.o \
convolve.o \
crop.o \
cursorutil.o \
curves.o \
datafiles.o \
desaturate.o \
devices.o \
dialog_handler.o \
disp_callbacks.o \
display_cmds.o \
docindex.o \
dodgeburn.o \
draw_core.o \
drawable.o \
drawable_cmds.o \
edit_cmds.o \
edit_selection.o \
ellipse_select.o \
eraser.o \
errorconsole.o \
errors.o \
equalize.o \
fileops.o \
fileops_cmds.o \
flip_tool.o \
floating_sel.o \
floating_sel_cmds.o \
file_new_dialog.o \
free_select.o \
fuzzy_select.o \
gdisplay.o \
gdisplay_color.o \
gdisplay_color_ui.o \
gdisplay_ops.o \
general.o \
gimage.o \
gimage_mask.o \
gimpbrush.o \
gimpbrushgenerated.o \
gimpbrushlist.o \
gimpbrushpipe.o \
gimpcontext.o \
gimpcontextpreview.o \
gimpdnd.o \
gimphelp.o \
gimphistogram.o \
gimplist.o \
gimplut.o \
gimpparasite.o \
gimpprogress.o \
gimprc.o \
gimprc_cmds.o \
gimpui.o \
gimpunit.o \
global_edit.o \
gradient.o \
gradient_cmds.o \
gradient_select.o \
gradient_select_cmds.o \
gradients_cmds.o \
guides_cmds.o \
gtkwrapbox.o \
gtkhwrapbox.o \
gtkvwrapbox.o \
gximage.o \
help_cmds.o \
histogramwidget.o \
histogram_tool.o \
hue_saturation.o \
image_cmds.o \
image_map.o \
image_new.o \
image_render.o \
indicator_area.o \
info_dialog.o \
info_window.o \
ink.o \
interface.o \
internal_procs.o \
invert.o \
iscissors.o \
layer.o \
layer_cmds.o \
layer_select.o \
layers_dialog.o \
lc_dialog.o \
levels.o \
lut_funcs.o \
magnify.o \
main.o \
measure.o \
menus.o \
message_cmds.o \
misc_cmds.o \
module_db.o \
move.o \
nav_window.o \
ops_buttons.o \
palette.o \
palette_cmds.o \
palette_select.o \
paint_core.o \
paint_funcs.o \
paintbrush.o \
parasite_cmds.o \
parasitelist.o \
path.o \
paths_cmds.o \
paths_dialog.o \
pattern_select.o \
pattern_select_cmds.o \
patterns.o \
patterns_cmds.o \
pencil.o \
perspective_tool.o \
pixel_processor.o \
pixel_region.o \
plug_in.o \
plug_in_cmds.o \
posterize.o \
preferences_dialog.o \
procedural_db.o \
procedural_db_cmds.o \
qmask.o \
rect_select.o \
regex.o \
resize.o \
rotate_tool.o \
scale.o \
scale_tool.o \
scan_convert.o \
scroll.o \
selection.o \
selection_cmds.o \
session.o \
shear_tool.o \
smudge.o \
temp_buf.o \
text_tool.o \
text_tool_cmds.o \