Commit 1baa2d45 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

[ I've postponed my reservations against pangoft2/fontconfig/freetype2

2003-12-12  Hans Breuer  <hans@breuer.org>

	[
	 I've postponed my reservations against pangoft2/fontconfig/freetype2
	 usage, so The Gimp should now build with msvc without patching it.
	]

	* app/makefile.msc app/text/makefile.msc : use $(PANGOFT2_CFLAGS) etc.

	* libgimpthumb/makefile.msc : (new file)
	* makefile.msc : added libgimpthumb

	* libgimpthumb/gimpthumbnail.c : include gimpwin32-io.h
	* libgimpthumb/gimpthumb-utils.c : don't compare size pointer
	with GIMP_THUMB_SIZE_FAIL but *size

	* plug-ins/makefile.msc : handle libgimpoldpreview

	* plug-ins/common/decompose.c : define cbrt() if not __GLIBC__

	* plug-ins/common/winclipboard.c : make it compile without gimpcompat.h

	* plug-ins/imagemap/imagemap_csim_lex.c : its a generated file
	but still win32/msvc has no unistd.h

	* plug-ins/pygimp/makefile.msc : (new file) to use the binary you
	need to patch glib, see bug #98737

	* plug-ins/libgimpoldpreview.c : use <libgimp/gimp.h> instead of "gimp.h"

	* **/Makefile.am : added makefile.msc to EXTRA_DIST
parent b3481c80
2003-12-12 Hans Breuer <hans@breuer.org>
[
I've postponed my reservations against pangoft2/fontconfig/freetype2
usage, so The Gimp should now build with msvc without patching it.
]
* app/makefile.msc app/text/makefile.msc : use $(PANGOFT2_CFLAGS) etc.
* libgimpthumb/makefile.msc : (new file)
* makefile.msc : added libgimpthumb
* libgimpthumb/gimpthumbnail.c : include gimpwin32-io.h
* libgimpthumb/gimpthumb-utils.c : don't compare size pointer
with GIMP_THUMB_SIZE_FAIL but *size
* plug-ins/makefile.msc : handle libgimpoldpreview
* plug-ins/common/decompose.c : define cbrt() if not __GLIBC__
* plug-ins/common/winclipboard.c : make it compile without gimpcompat.h
* plug-ins/imagemap/imagemap_csim_lex.c : its a generated file
but still win32/msvc has no unistd.h
* plug-ins/pygimp/makefile.msc : (new file) to use the binary you
need to patch glib, see bug #98737
* plug-ins/libgimpoldpreview.c : use <libgimp/gimp.h> instead of "gimp.h"
* **/Makefile.am : added makefile.msc to EXTRA_DIST
2003-12-12 Michael Natterer <mitch@gimp.org>
* libgimp/gimplayer.h: removed preserve_transparency #defines.
......@@ -60,6 +60,7 @@ EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
makefile.msc \
po-libgimp/update.sh \
po-plug-ins/update.sh \
po-script-fu/update.sh
......
......@@ -64,6 +64,7 @@ regenerate: gimp-composite-generic.o gimp-composite-mmx.o gimp-composite-sse.o g
EXTRA_DIST = \
make-installer.py \
makefile.msc \
ns.py
......
......@@ -58,6 +58,8 @@ INCLUDES = \
EXTRA_PROGRAMS = test-config
EXTRA_DIST = makefile.msc
#
# unit tests for the GimpConfig system
#
......
......@@ -71,6 +71,8 @@ libappdisplay_a_SOURCES = \
$(libappdisplay_a_built_sources) \
$(libappdisplay_a_sources)
EXTRA_DIST = makefile.msc
#
# rules to generate built sources
#
......
......@@ -20,3 +20,5 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc
......@@ -44,9 +44,10 @@ PKG_LINK = \
plug-in/appplug-in.lib \
$(PRJ_TOP)/regexrepl/regexrepl.lib \
\
$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
$(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \
$(top_builddir)/libgimpmath/gimpmath-$(LT_RELEASE).lib \
$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
$(top_builddir)/libgimpthumb/gimpthumb-$(LT_RELEASE).lib \
$(top_builddir)/libgimpmodule/gimpmodule-$(LT_RELEASE).lib \
$(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \
$(GLIB_LIBS) \
......@@ -55,7 +56,12 @@ PKG_LINK = \
$(GIMP_MP_LIBS) \
$(INTL_LIBS) \
$(LIBART_LIBS) \
$(PANGOWIN32_LIBS)
$(PANGOWIN32_LIBS) \
!IFNDEF PANGO_WIN32_EXTENDED
$(PANGOFT2_LIBS) \
$(FREETYPE2_LIBS) \
$(FONTCONFIG_LIBS) \
!ENDIF
gimp_LDFLAGS = \
-export-dynamic -export-symbols $(srcdir)/gimp.sym
......
......@@ -64,6 +64,8 @@ libapppaint_a_built_sources = paint-enums.c
libapppaint_a_SOURCES = $(libapppaint_a_built_sources) $(libapppaint_a_sources)
EXTRA_DIST = makefile.msc
#
# rules to generate built sources
#
......
......@@ -58,3 +58,5 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc
......@@ -37,3 +37,5 @@ libappplug_in_a_SOURCES = \
plug-in-run.h \
plug-in-shm.c \
plug-in-shm.h
EXTRA_DIST = makefile.msc
......@@ -51,6 +51,8 @@ libapptext_a_built_sources = text-enums.c
libapptext_a_SOURCES = $(libapptext_a_built_sources) $(libapptext_a_sources)
EXTRA_DIST = makefile.msc
#
# rules to generate built sources
#
......
......@@ -7,6 +7,7 @@ PKG_VER = 1.3
PKG_LINK = \
$(GLIB_LIBS) $(PANGOFT2_LIBS) \
$(FREETYPE2_LIBS) \
..\config\appconfig-$(PKG_VER).lib \
..\base\appbase-$(PKG_VER).lib \
..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
......@@ -19,9 +20,14 @@ OBJECTS = \
gimpfontlist.obj \
gimptext.obj \
gimptext-parasite.obj \
!IFNDEF PANGO_WIN32_EXTENDED
gimptext-bitmap.obj \
gimptext-vectors.obj \
!ELSE
gimptext-bitmap-win32.obj \
gimptext-compat.obj \
gimptext-vectors-win32.obj \
!ENDIF
gimptext-compat.obj \
gimptext-xlfd.obj \
gimptextlayer.obj \
gimptextlayer-xcf.obj \
......@@ -37,8 +43,9 @@ INCLUDES = \
$(GLIB_CFLAGS) \
$(FONTCONFIG_CFLAGS) \
$(PANGO_CFLAGS) $(GTK2_CFLAGS) \
# $(FREETYPE2_CFLAGS)
!IFNDEF PANGO_WIN32_EXTENDED
$(FREETYPE2_CFLAGS)
!ENDIF
all : \
$(PRJ_TOP)\config.h \
......
......@@ -157,6 +157,7 @@ INCLUDES = \
$(GTK_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc
#
# rules to generate built sources
......
......@@ -34,3 +34,5 @@ libappvectors_a_SOURCES = \
gimpvectors-import.h \
gimpvectors-preview.c \
gimpvectors-preview.h
EXTRA_DIST = makefile.msc
......@@ -200,6 +200,8 @@ libappwidgets_a_built_sources = widgets-enums.c
libappwidgets_a_SOURCES = \
$(libappwidgets_a_built_sources) $(libappwidgets_a_sources)
EXTRA_DIST = makefile.msc
#
# rules to generate built sources
#
......
......@@ -29,6 +29,7 @@ OBJECTS = \
gimpcellrenderertoggle.obj \
gimpcellrendererviewable.obj \
gimpchanneltreeview.obj \
gimpcolordisplayeditor.obj \
gimpcoloreditor.obj \
gimpcolorframe.obj \
gimpcolormapeditor.obj \
......
......@@ -27,3 +27,5 @@ INCLUDES = \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir)
EXTRA_DIST = makefile.msc
......@@ -57,14 +57,15 @@ EXPORTS
gimp_drawable_fill
gimp_drawable_flush
gimp_drawable_get
gimp_drawable_get_name
gimp_drawable_get_image
gimp_drawable_get_linked
gimp_drawable_get_name
gimp_drawable_get_tattoo
gimp_drawable_get_visible
gimp_drawable_get_thumbnail_data
gimp_drawable_get_tile
gimp_drawable_get_tile2
gimp_drawable_get_visible
gimp_drawable_get_visible
gimp_drawable_has_alpha
gimp_drawable_height
gimp_drawable_is_channel
......@@ -83,12 +84,11 @@ EXPORTS
gimp_drawable_parasite_list
gimp_drawable_set_linked
gimp_drawable_set_name
gimp_drawable_set_visible
gimp_drawable_set_tattoo
gimp_drawable_set_visible
gimp_drawable_type
gimp_drawable_type_with_alpha
gimp_drawable_update
gimp_drawable_visible
gimp_drawable_width
gimp_edit_clear
gimp_edit_copy
......@@ -123,8 +123,8 @@ EXPORTS
gimp_fuzzy_select
gimp_gamma
gimp_get_bg_guchar
gimp_get_fg_guchar
gimp_get_default_comment
gimp_get_fg_guchar
gimp_get_module_load_inhibit
gimp_get_monitor_resolution
gimp_get_path_by_tattoo
......@@ -147,11 +147,9 @@ EXPORTS
gimp_help
gimp_histogram
gimp_hue_saturation
gimp_image_active_drawable
gimp_image_add_channel
gimp_image_add_hguide
gimp_image_add_layer
gimp_image_add_layer_mask
gimp_image_add_vguide
gimp_image_attach_new_parasite
gimp_image_base_type
......@@ -169,6 +167,7 @@ EXPORTS
gimp_image_floating_sel_attached_to
gimp_image_free_shadow
gimp_image_get_active_channel
gimp_image_get_active_drawable
gimp_image_get_active_layer
gimp_image_get_channel_by_tattoo
gimp_image_get_channels
......@@ -206,7 +205,6 @@ EXPORTS
gimp_image_raise_layer_to_top
gimp_image_remove_channel
gimp_image_remove_layer
gimp_image_remove_layer_mask
gimp_image_resize
gimp_image_scale
gimp_image_set_active_channel
......@@ -232,6 +230,7 @@ EXPORTS
gimp_install_temp_proc
gimp_invert
gimp_layer_add_alpha
gimp_layer_add_mask
gimp_layer_copy
gimp_layer_create_mask
gimp_layer_get_apply_mask
......@@ -244,6 +243,7 @@ EXPORTS
gimp_layer_is_floating_sel
gimp_layer_new
gimp_layer_new_from_drawable
gimp_layer_remove_mask
gimp_layer_resize
gimp_layer_resize_to_image_size
gimp_layer_scale
......@@ -376,13 +376,13 @@ EXPORTS
gimp_selection_translate
gimp_selection_value
gimp_shear
gimp_shm_ID
gimp_shm_addr
gimp_shm_ID
gimp_show_tool_tips
gimp_smudge
gimp_smudge_default
gimp_temp_PDB_name
gimp_temp_name
gimp_temp_PDB_name
gimp_text
gimp_text_fontname
gimp_text_get_extents
......@@ -401,3 +401,4 @@ EXPORTS
gimp_version
gimp_wm_class
gimp_wm_name
......@@ -5,16 +5,6 @@ EXPORTS
gimp_channel_menu_new
gimp_drawable_menu_new
gimp_export_image
gimp_fixme_preview_do_row
gimp_fixme_preview_fill
gimp_fixme_preview_fill_scaled
gimp_fixme_preview_fill_with_thumb
gimp_fixme_preview_free
gimp_fixme_preview_get_pixel
gimp_fixme_preview_new
gimp_fixme_preview_new2
gimp_fixme_preview_put_pixel
gimp_fixme_preview_update
gimp_font_select_widget_close
gimp_font_select_widget_new
gimp_font_select_widget_set
......@@ -23,7 +13,6 @@ EXPORTS
gimp_gradient_select_widget_set
gimp_image_menu_new
gimp_layer_menu_new
gimp_parameter_settings_new
gimp_pattern_select_widget_close
gimp_pattern_select_widget_new
gimp_pattern_select_widget_set
......
......@@ -176,7 +176,7 @@ gimp_thumb_find_thumb (const gchar *uri,
gint i, n;
g_return_val_if_fail (gimp_thumb_initialized, NULL);
g_return_val_if_fail (size > GIMP_THUMB_SIZE_FAIL, NULL);
g_return_val_if_fail (*size > GIMP_THUMB_SIZE_FAIL, NULL);
name = gimp_thumb_png_name (uri);
......
......@@ -33,6 +33,10 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#ifdef G_OS_WIN32
#include <libgimpbase/gimpwin32-io.h>
#endif
#include "gimpthumb-types.h"
#include "gimpthumb-utils.h"
#include "gimpthumbnail.h"
......
## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc
# 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 = C:\install\gimp\bin
TOP = ..\..
!include $(TOP)\glib\build\win32\make.msc
GIMP_VER = 1.3
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
################################################################
# Nothing much configurable below
INCLUDES = -I.. $(GDK_PIXBUF_CFLAGS)
# DEFINES = -DG_LOG_DOMAIN=\"LibGimpThump\"
DEPCFLAGS = \
-FImsvc_recommended_pragmas.h \
$(GLIB_CFLAGS)
DEPLIBS = $(GLIB_LIBS) $(GDK_PIXBUF_LIBS) $(INTL_LIBS) \
..\libgimpbase\gimpbase-$(GIMP_VER).lib \
..\libgimpmath\gimpmath-$(GIMP_VER).lib
all : \
..\config.h \
gimpthumb-$(GIMP_VER).dll
..\config.h : ..\config.h.win32
copy ..\config.h.win32 ..\config.h
install : all
$(INSTALL) gimpcolor-$(GIMP_VER).dll $(BIN)
OBJECTS = \
gimpthumb-enums.obj \
gimpthumb-error.obj \
gimpthumb-utils.obj \
gimpthumbnail.obj \
!IFNDEF PERL
PERL = perl
!ENDIF
gimpthumb-enums.c: gimpthumb-enums.h
$(PERL) ..\tools\gimp-mkenums \
--fhead "#include \"config.h\"\n#include <glib-object.h>\n#include \"gimpthumb-enums.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "\nstatic const GEnumValue @enum_name@_enum_values[] =\n{" \
--vprod " { @VALUENAME@, @valuedesc@, \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n};\n\nGType\n@enum_name@_get_type (void)\n{\n static GType enum_type = 0;\n\n if (!enum_type)\n enum_type = g_enum_register_static (\"@EnumName@\", @enum_name@_enum_values);\n\n return enum_type;\n}\n" \
gimpthumb-enums.h > $@
gimpthumb-$(GIMP_VER).dll : $(OBJECTS) gimpthumb.def
$(CC) $(CFLAGS) -LD -Fegimpthumb-$(GIMP_VER).dll $(OBJECTS) $(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpthumb.def
......@@ -47,6 +47,7 @@ OBJECTS = \
gimpcolorscales.obj \
gimpcolorselect.obj \
gimpcolorselection.obj \
gimpcolordisplaystack.obj \
gimpcolorselector.obj \
gimpdialog.obj \
gimpfileentry.obj \
......
......@@ -10,6 +10,7 @@ SUBDIRS = \
libgimpbase \
libgimpcolor \
libgimpmath \
libgimpthumb \
libgimpwidgets \
libgimp \
# libgimptool \
......@@ -35,7 +36,7 @@ sub-clean:
sub-themes:
cd themes\Default\images
nmake -nologo -f makefile.msc
cd ....
cd ..\..\..
all : \
$(PRJ_TOP)\config.h \
......
......@@ -40,6 +40,10 @@
#include "libgimp/stdplugins-intl.h"
#ifndef __GLIBC__
/* cbrt() is a GNU extension */
#define cbrt(x) (pow(x, 1.0/3.0))
#endif
/* Declare local functions
*/
......
......@@ -671,7 +671,7 @@ CB_PasteImage (gboolean interactive,
gimp_display_new (image_ID);
else
{
gimp_layer_set_visible (drawable_ID, TRUE);
gimp_drawable_set_visible (drawable_ID, TRUE);
gimp_displays_flush ();
}
}
......
......@@ -26,8 +26,13 @@
#define YY_FLEX_MINOR_VERSION 5
#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef _WIN32
#include <io.h>
#define isatty(h) _isatty(h)
#endif
/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
#ifdef c_plusplus
......
......@@ -33,10 +33,10 @@
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtk.h>
#include "gimp.h"
#include <libgimp/gimp.h>
#include "gimpoldpreview.h"
#include "libgimp-intl.h"
#include <libgimp/libgimp-intl.h>
#define PREVIEW_SIZE 128
......
......@@ -75,7 +75,12 @@ sub-libs:
cd libgck\gck
nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. LIBRARY=gck OBJECTS="gckcolor.obj" $(TARGET)
cd ..\..
cd libgimpoldpreview
nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. LIBRARY=gimpoldpreview OBJECTS="gimpoldpreview.obj" $(TARGET)
cd ..
cd script-fu\siod
nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. LIBRARY=siod OBJECTS="trace.obj slib.obj sliba.obj regex.obj" $(TARGET)
cd ..\..
common-plugins-all :
......@@ -283,8 +288,10 @@ OBJECTS = \
gfig-circle.obj \
gfig-dobject.obj \
gfig-ellipse.obj \
gfig-grid.obj \
gfig-line.obj \
gfig-poly.obj \
gfig-preview.obj \
gfig-spiral.obj \
gfig-star.obj \
gfig-stock.obj
......@@ -421,11 +428,6 @@ OPTIMIZE =
!IFDEF EXTRA_script_fu
OBJECTS = \
interp_md5.obj \
interp_regex.obj \
interp_slib.obj \
interp_sliba.obj \
interp_trace.obj \
siod-wrapper.obj \
script-fu.obj \
script-fu-console.obj \
......@@ -433,7 +435,7 @@ OBJECTS = \
script-fu-scripts.obj \
script-fu-text-console.obj \
..\dbbrowser\dbbrowser_utils.obj
EXTRALIBS = ..\..\regexrepl\regexrepl.lib kernel32.lib
EXTRALIBS = ..\..\regexrepl\regexrepl.lib siod\siod.lib kernel32.lib
EXTRACFLAGS = -DREGEX_MALLOC
HAVE_RESOURCE = YES
!ENDIF
......@@ -499,7 +501,12 @@ OBJECTS = \
!ENDIF
!IFDEF EXTRA_helpbrowser
OBJECTS = helpwin.obj
OBJECTS = \
helpbrowser.obj \
domain.obj \
dialog.obj \
queue.obj \
uri.obj
!ENDIF
!IFDEF EXTRA_guash
......@@ -598,7 +605,8 @@ CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200
CFLAGS = -FImsvc_recommended_pragmas.h \
-DHAVE_CONFIG_H $(EXTRACFLAGS) \
-DLOCALEDIR=\"?\" \
-I. -I$(GIMPTOP) -I$(PLUGINDIR) $(GTK2_CFLAGS) $(INTL_CFLAGS)
-I. -I$(GIMPTOP) -I$(PLUGINDIR) -I$(PLUGINDIR)\libgimpoldpreview \
$(GTK2_CFLAGS) $(INTL_CFLAGS)
LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
......@@ -631,6 +639,7 @@ $(PLUGIN).exe : $(EXTRA_DEPS) $(OBJECTS) $(RESOURCE)
..\..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
..\..\libgimpmath\gimpmath-$(GIMP_VER).lib \
..\..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
..\libgimpoldpreview\gimpoldpreview.lib \
$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) $(EXTRALIBS) $(LDFLAGS)
$(PLUGIN).res : $(PLUGIN).rc
......
......@@ -40,3 +40,5 @@ install-data-local:
snap:
$(MAKE) dist distdir=$(PACKAGE)-SNAP-`date +"%Y%m%d"`
EXTRA_DIST = makefile.msc
MODULE = gimp
#OPTIMIZE = -Od -Op
#DEBUG=1
OBJECTS = \
gimpmodule.obj \
pygimp-image.obj \
pygimp-drawable.obj \
pygimp-tile.obj \
pygimp-display.obj \
pygimp-parasite.obj \
pygimp-pdb.obj
PYTHON = ..\..\..\..\python22
!IFNDEF DEBUG
EXTRALIBS = $(PYTHON)\libs\python22.lib user32.lib
!ELSE
EXTRALIBS = $(PYTHON)\libs\python22_d.lib user32.lib
!ENDIF
EXTRACFLAGS = -I$(PYTHON)\include
GIMPTOP=..\..
# Lib Extension is
MODULE_EXT = pyd
!include ..\makefile.msc
\ No newline at end of file
......@@ -15,4 +15,5 @@ AM_CPPFLAGS = \
EXTRA_DIST = \
regex.c \
regex.h
regex.h \
makefile.msc
......@@ -296,7 +296,8 @@ themedata_DATA = $(STOCK_IMAGES)
EXTRA_DIST = \
$(themedata_DATA) \
$(WILBER_IMAGES) \
gimp-dialog-icons.xcf.gz
gimp-dialog-icons.xcf.gz \
makefile.msc
noinst_DATA = gimp-stock-pixbufs.h gimp-wilber-pixbufs.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment