diff --git a/ChangeLog b/ChangeLog index bedc401bb6..9146b2b93a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ -2003-10-08 Hans Breuer +2003-11-16 Hans Breuer * app/text/*.c : still unacceptable patched to compile - without FT2, see bug # + without FT2, see bug #113681 * **makefile.msc : updated diff --git a/app/base/makefile.msc b/app/base/makefile.msc index 07023141f4..988ddb9922 100644 --- a/app/base/makefile.msc +++ b/app/base/makefile.msc @@ -11,6 +11,7 @@ PKG_LINK = \ $(GLIB_LIBS) \ ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ + ..\composite\appcomposite-$(PKG_VER).lib \ ..\config\appconfig-$(PKG_VER).lib OBJECTS = \ diff --git a/app/composite/makefile.msc b/app/composite/makefile.msc index 0a9c806671..71127eec4f 100644 --- a/app/composite/makefile.msc +++ b/app/composite/makefile.msc @@ -12,10 +12,18 @@ LT_RELEASE = $(PKG_VER) OBJECTS = \ gimp-composite.obj \ - gimp-composite-dispatch.obj \ gimp-composite-generic.obj \ + gimp-composite-generic-installer.obj \ gimp-composite-mmx.obj \ gimp-composite-sse.obj \ + gimp-composite-sse2.obj \ + \ + gimp-composite-3dnow-installer.obj \ + gimp-composite-altivec-installer.obj \ + gimp-composite-mmx-installer.obj \ + gimp-composite-sse-installer.obj \ + gimp-composite-sse2-installer.obj \ + gimp-composite-vis-installer.obj \ mmx_sources = \ diff --git a/app/config/gimpconfig-dump.c b/app/config/gimpconfig-dump.c index 24bbd018a1..5722dfc9fc 100644 --- a/app/config/gimpconfig-dump.c +++ b/app/config/gimpconfig-dump.c @@ -29,6 +29,10 @@ #include +#ifdef G_OS_WIN32 +#include +#endif + #include "libgimpbase/gimpbase.h" #include "config-types.h" diff --git a/app/config/makefile.msc b/app/config/makefile.msc index bea2534126..35a3dd5d2a 100644 --- a/app/config/makefile.msc +++ b/app/config/makefile.msc @@ -13,7 +13,9 @@ PKG_LINK = \ ..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib \ ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ - $(GLIB_LIBS) $(INTL_LIBS) + ..\..\libgimpmath\gimpmath-$(PKG_VER).lib \ + $(GLIB_LIBS) $(GOBJECT_LIBS) $(INTL_LIBS) \ + $(GDK_PIXBUF_LIBS) OBJECTS = \ gimpbaseconfig.obj \ @@ -33,14 +35,20 @@ OBJECTS = \ gimppluginconfig.obj \ gimprc.obj \ gimpscanner.obj \ + gimpxmlparser.obj \ \ -# config-noelf.obj +!IFDEF DLLGIMP + config-noelf.obj +!ENDIF INCLUDES = \ -FImsvc_recommended_pragmas.h \ -I $(PRJ_TOP) \ -I $(PRJ_TOP)/app \ $(GLIB_CFLAGS) \ + $(GDK_PIXBUF_CFLAGS) + +# -DG_DISABLE_CAST_CHECKS DEFINES = \ -DG_LOG_DOMAIN=\"Gimp-Config\" diff --git a/app/core/makefile.msc b/app/core/makefile.msc index 4a029516b5..cd8ed75cd1 100644 --- a/app/core/makefile.msc +++ b/app/core/makefile.msc @@ -6,8 +6,9 @@ PKG_VER = 1.3 !INCLUDE $(TOP)\glib\build\win32\make.msc PKG_LINK = \ - $(GLIB_LIBS) $(GTK2)\gdk-pixbuf\gdk_pixbuf-$(GTK2_VER).lib $(INTL_LIBS) \ - $(LIBART_LIBS) $(PANGOFT2_LIBS) \ + $(GLIB_LIBS) $(GTK_PIXBUF_LIBS) $(INTL_LIBS) $(LIBART_LIBS) \ + $(PANGOWIN32_LIBS) $(GDK_PIXBUF_LIBS) \ +# $(PANGOFT2_LIBS) \ \ ..\..\regexrepl\regexrepl.lib \ \ @@ -15,29 +16,34 @@ PKG_LINK = \ ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ ..\..\libgimpmath\gimpmath-$(PKG_VER).lib \ ..\..\libgimpmodule\gimpmodule-$(PKG_VER).lib \ - ..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib \ \ ..\config\appconfig-$(PKG_VER).lib \ ..\base\appbase-$(PKG_VER).lib \ ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ - ..\vectors\appvectors.lib \ - ..\paint\apppaint.lib \ - ..\pdb\apppdb.lib \ - ..\plug-in\appplug-in.lib \ - ..\file\appfile.lib \ - ..\xcf\xcf.lib \ +# ..\vectors\appvectors.lib \ +# ..\text\apptext.lib \ +# ..\paint\apppaint.lib \ +# ..\pdb\apppdb.lib \ +# ..\plug-in\appplug-in.lib \ +# ..\file\appfile.lib \ +# ..\xcf\xcf.lib \ OBJECTS = \ # ..\undo.obj \ core-enums.obj \ cpercep.obj \ gimp.obj \ + gimp-edit.obj \ + gimp-units.obj \ gimpbrush.obj \ gimpbrushgenerated.obj \ gimpbrushpipe.obj \ gimpbuffer.obj \ gimpchannel.obj \ + gimpchannel-combine.obj \ + gimpchannel-select.obj \ gimpcontainer.obj \ + gimpcontainer-filter.obj \ gimpcontext.obj \ gimpdata.obj \ gimpdatafactory.obj \ @@ -47,15 +53,16 @@ OBJECTS = \ gimpdrawable.obj \ gimpdrawable-blend.obj \ gimpdrawable-bucket-fill.obj \ + gimpdrawable-combine.obj \ gimpdrawable-desaturate.obj \ gimpdrawable-equalize.obj \ gimpdrawable-histogram.obj \ gimpdrawable-invert.obj \ gimpdrawable-offset.obj \ gimpdrawable-preview.obj \ + gimpdrawable-stroke.obj \ gimpdrawable-transform.obj \ - gimpdrawable-transform-utils.obj \ - gimpedit.obj \ +# gimpdrawable-transform-utils.obj \ gimpenvirontable.obj \ gimpgradient.obj \ gimpgrid.obj \ @@ -71,8 +78,8 @@ OBJECTS = \ gimpimage-flip.obj \ gimpimage-grid.obj \ gimpimage-guides.obj \ - gimpimage-mask.obj \ - gimpimage-mask-select.obj \ +# gimpimage-mask.obj \ +# gimpimage-mask-select.obj \ gimpimage-merge.obj \ gimpimage-new.obj \ gimpimage-pick-color.obj \ @@ -85,16 +92,18 @@ OBJECTS = \ gimpimage-scale.obj \ gimpimage-undo.obj \ gimpimage-undo-push.obj \ + gimpimage-unit.obj \ gimpimagefile.obj \ gimpitem.obj \ gimpitem-linked.obj \ + gimpitem-preview.obj \ gimpitemundo.obj \ gimplayer.obj \ gimplayer-floating-sel.obj \ gimplayermask.obj \ gimplist.obj \ gimpmarshal.obj \ - gimpmodules.obj \ + gimp-modules.obj \ gimpobject.obj \ gimppaintinfo.obj \ gimppalette.obj \ @@ -104,14 +113,17 @@ OBJECTS = \ gimppattern.obj \ gimppreviewcache.obj \ gimpscanconvert.obj \ + gimpselection.obj \ + gimpstrokeoptions.obj \ gimptemplate.obj \ gimptooloptions.obj \ + gimp-transform-utils.obj \ gimp-templates.obj \ gimptoolinfo.obj \ gimpundo.obj \ gimpundostack.obj \ gimpunit.obj \ - gimpunits.obj \ +# gimpunits.obj \ gimpviewable.obj \ gimp-utils.obj \ diff --git a/app/display/makefile.msc b/app/display/makefile.msc index 72dcdd6455..af39d0c079 100644 --- a/app/display/makefile.msc +++ b/app/display/makefile.msc @@ -21,10 +21,12 @@ PKG_LINK = \ ..\core\appcore-$(PKG_VER).lib \ OBJECTS = \ + gimpcanvas.obj \ gimpdisplay.obj \ gimpdisplay-area.obj \ gimpdisplay-foreach.obj \ gimpdisplay-handlers.obj \ + gimpdisplayoptions.obj \ gimpdisplayshell.obj \ gimpdisplayshell-appearance.obj \ gimpdisplayshell-callbacks.obj \ diff --git a/app/file/makefile.msc b/app/file/makefile.msc index 7751bfb33e..e39c6465e4 100644 --- a/app/file/makefile.msc +++ b/app/file/makefile.msc @@ -15,6 +15,7 @@ INCLUDES = \ -I$(PRJ_TOP) \ -I$(PRJ_TOP)/app \ $(GLIB_CFLAGS) \ + $(GDK_PIXBUF_CFLAGS) DEFINES = \ -DG_LOG_DOMAIN=\"Gimp-File\" diff --git a/app/gui/makefile.msc b/app/gui/makefile.msc index bdbf93e7c6..f1cf1da8c4 100644 --- a/app/gui/makefile.msc +++ b/app/gui/makefile.msc @@ -57,6 +57,8 @@ OBJECTS = \ file-save-dialog.obj \ file-save-menu.obj \ font-select.obj \ + fonts-commands.obj \ + fonts-menu.obj \ gradient-editor-commands.obj \ gradient-editor-menu.obj \ gradients-commands.obj \ @@ -64,6 +66,7 @@ OBJECTS = \ gradient-select.obj \ grid-dialog.obj \ gui.obj \ + gui-vtable.obj \ help-commands.obj \ image-commands.obj \ image-menu.obj \ @@ -94,11 +97,14 @@ OBJECTS = \ select-commands.obj \ session.obj \ splash.obj \ + stroke-dialog.obj \ templates-commands.obj \ templates-menu.obj \ + themes.obj \ tips-dialog.obj \ tips-parser.obj \ - tool-options-dialog.obj \ + tool-options-commands.obj \ + tool-options-menu.obj \ toolbox-menu.obj \ tools-commands.obj \ user-install-dialog.obj \ diff --git a/app/gui/themes.c b/app/gui/themes.c index b023ad58fb..a873030870 100644 --- a/app/gui/themes.c +++ b/app/gui/themes.c @@ -208,6 +208,7 @@ themes_apply_theme (Gimp *gimp, gchar *gtkrc_user; gchar *themerc; FILE *file; + gchar *name; g_return_if_fail (GIMP_IS_GIMP (gimp)); @@ -239,18 +240,27 @@ themes_apply_theme (Gimp *gimp, goto cleanup; } - fprintf (file, - "# GIMP themerc\n" - "#\n" - "# This file is written on GIMP startup and on every theme change.\n" - "# It is NOT supposed to be edited manually. Edit your personal\n" - "# gtkrc file instead (%s).\n" - "\n" - "include \"%s\"\n" - "include \"%s\"\n" - "\n" - "# end of themerc\n", - gtkrc_user, gtkrc_theme, gtkrc_user); + { + gchar *esc_gtkrc_theme = g_strescape (gtkrc_theme, NULL); + gchar *esc_gtkrc_user = g_strescape (gtkrc_user, NULL); + + fprintf (file, + "# GIMP themerc\n" + "#\n" + "# This file is written on GIMP startup and on every theme change.\n" + "# It is NOT supposed to be edited manually. Edit your personal\n" + "# gtkrc file instead (%s).\n" + "\n" + "include \"%s\"\n" + "include \"%s\"\n" + "\n" + "# end of themerc\n", + gtkrc_user, + esc_gtkrc_theme, esc_gtkrc_user); + + g_free (esc_gtkrc_theme); + g_free (esc_gtkrc_user); + } fclose (file); diff --git a/app/makefile.msc b/app/makefile.msc index 7d8157fbac..5e5040a13b 100644 --- a/app/makefile.msc +++ b/app/makefile.msc @@ -79,7 +79,7 @@ OBJECTS = \ main.obj \ batch.obj \ errors.obj \ - libgimp_glue.obj \ + units.obj \ EXTRA_DIST = \ diff --git a/app/paint/makefile.msc b/app/paint/makefile.msc index fb9efff768..b7e9001d0b 100644 --- a/app/paint/makefile.msc +++ b/app/paint/makefile.msc @@ -23,6 +23,7 @@ PKG_LINK = \ ..\widgets\appwidgets-$(PKG_VER).lib \ OBJECTS = \ + gimp-paint.obj \ gimpairbrush.obj \ gimpairbrushoptions.obj \ gimpclone.obj \ @@ -42,7 +43,6 @@ OBJECTS = \ gimppenciloptions.obj \ gimpsmudge.obj \ gimpsmudgeoptions.obj \ - paint.obj \ paint-enums.obj \ INCLUDES = \ diff --git a/app/pdb/makefile.msc b/app/pdb/makefile.msc index 43b08d3e98..43625ae62d 100644 --- a/app/pdb/makefile.msc +++ b/app/pdb/makefile.msc @@ -43,6 +43,7 @@ OBJECTS = \ edit_cmds.obj \ fileops_cmds.obj \ floating_sel_cmds.obj \ + fonts_cmds.obj \ font_select_cmds.obj \ gimprc_cmds.obj \ gradients_cmds.obj \ diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index e772fde790..f84ed12dd9 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -254,7 +254,8 @@ plug_ins_init (Gimp *gimp, g_slist_prepend (gimp->plug_in_locale_domains, def); g_print ("added locale domain \"%s\" for path \"%s\"\n", - def->domain_name, def->domain_path); + def->domain_name ? def->domain_name : "(null)", + def->domain_path ? def->domain_path : "(null)"); } if (plug_in_def->help_domain_name) @@ -271,7 +272,8 @@ plug_ins_init (Gimp *gimp, g_slist_prepend (gimp->plug_in_help_domains, def); g_print ("added help domain \"%s\" for base uri \"%s\"\n", - def->domain_name, def->domain_uri); + def->domain_name ? def->domain_name : "(null)", + def->domain_uri ? def->domain_uri : "(null)"); } } diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index e772fde790..f84ed12dd9 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -254,7 +254,8 @@ plug_ins_init (Gimp *gimp, g_slist_prepend (gimp->plug_in_locale_domains, def); g_print ("added locale domain \"%s\" for path \"%s\"\n", - def->domain_name, def->domain_path); + def->domain_name ? def->domain_name : "(null)", + def->domain_path ? def->domain_path : "(null)"); } if (plug_in_def->help_domain_name) @@ -271,7 +272,8 @@ plug_ins_init (Gimp *gimp, g_slist_prepend (gimp->plug_in_help_domains, def); g_print ("added help domain \"%s\" for base uri \"%s\"\n", - def->domain_name, def->domain_uri); + def->domain_name ? def->domain_name : "(null)", + def->domain_uri ? def->domain_uri : "(null)"); } } diff --git a/app/text/makefile.msc b/app/text/makefile.msc index 9e4e7ea50b..e202fddf7b 100644 --- a/app/text/makefile.msc +++ b/app/text/makefile.msc @@ -14,12 +14,19 @@ PKG_LINK = \ ..\core\appcore-$(PKG_VER).lib OBJECTS = \ + gimp-fonts.obj \ gimpfont.obj \ gimpfontlist.obj \ gimptext.obj \ + gimptext-parasite.obj \ + gimptext-bitmap-win32.obj \ gimptext-compat.obj \ + gimptext-vectors-win32.obj \ + gimptext-xlfd.obj \ gimptextlayer.obj \ + gimptextlayer-xcf.obj \ gimptextlayout.obj \ + gimptextlayout-render.obj \ text-enums.obj \ INCLUDES = \ diff --git a/app/tools/makefile.msc b/app/tools/makefile.msc index 5674437ef7..3dc8005c0c 100644 --- a/app/tools/makefile.msc +++ b/app/tools/makefile.msc @@ -51,7 +51,8 @@ OBJECTS = \ gimpfliptool.obj \ gimpfreeselecttool.obj \ gimpfuzzyselecttool.obj \ - gimphistogramtool.obj \ + gimphistogramoptions.obj \ +# gimphistogramtool.obj \ gimphuesaturationtool.obj \ gimpimagemaptool.obj \ gimpinkoptions.obj \ @@ -90,7 +91,7 @@ OBJECTS = \ gimpvectoroptions.obj \ gimpvectortool.obj \ tool_manager.obj \ - tools.obj \ + gimp-tools.obj \ tools-enums.obj \ INCLUDES = \ diff --git a/app/vectors/makefile.msc b/app/vectors/makefile.msc index c6fbb27dfe..bb121c22c5 100644 --- a/app/vectors/makefile.msc +++ b/app/vectors/makefile.msc @@ -9,7 +9,7 @@ PKG_LINK = \ $(GLIB_LIBS) \ ..\base\appbase-$(PKG_VER).lib \ \ - ..\core\appcore-$(PKG_VER).lib \ +# ..\core\appcore-$(PKG_VER).lib \ top_srcdir = $(PRJ_TOP) top_builddir = $(PRJ_TOP) @@ -24,9 +24,11 @@ INCLUDES = \ OBJECTS = \ gimpanchor.obj \ - gimpvectors.obj \ - gimpbezierstroke.obj \ + gimpcoordmath.obj \ gimpstroke.obj \ + gimpvectors-export.obj \ + gimpvectors-import.obj \ + gimpbezierstroke.obj \ gimpvectors.obj \ gimpvectors-compat.obj \ gimpvectors-preview.obj \ diff --git a/app/widgets/gimppropwidgets.c b/app/widgets/gimppropwidgets.c index 0f240dca19..f4178f01d2 100644 --- a/app/widgets/gimppropwidgets.c +++ b/app/widgets/gimppropwidgets.c @@ -932,7 +932,11 @@ gimp_prop_adjustment_notify (GObject *config, g_object_get (config, param_spec->name, &uint64_value, NULL); +#if defined _MSC_VER && (_MSC_VER < 1200) + value = (gint64) uint64_value; +#else value = uint64_value; +#endif } else if (G_IS_PARAM_SPEC_DOUBLE (param_spec)) { @@ -992,8 +996,14 @@ gimp_prop_memsize_entry_new (GObject *config, uint64_spec = G_PARAM_SPEC_UINT64 (param_spec); +#ifndef _MSC_VER + /* avoid getting gimppropwidgets.c(999) : warning C4056: + * overflow in floating-point constant arithmetic + * and runtime failing (the check seems not the useful to me anyway) + */ g_return_val_if_fail (uint64_spec->minimum <= (guint64) G_MAXDOUBLE, NULL); g_return_val_if_fail (uint64_spec->maximum <= (guint64) G_MAXDOUBLE, NULL); +#endif entry = gimp_memsize_entry_new (value, uint64_spec->minimum, diff --git a/app/widgets/makefile.msc b/app/widgets/makefile.msc index 6bee01afbd..f17e401550 100644 --- a/app/widgets/makefile.msc +++ b/app/widgets/makefile.msc @@ -30,6 +30,7 @@ OBJECTS = \ gimpcellrendererviewable.obj \ gimpchanneltreeview.obj \ gimpcoloreditor.obj \ + gimpcolorframe.obj \ gimpcolormapeditor.obj \ gimpcolorpanel.obj \ gimpcomponenteditor.obj \ @@ -53,16 +54,18 @@ OBJECTS = \ gimpdock.obj \ gimpdockable.obj \ gimpdockbook.obj \ + gimpdocked.obj \ gimpdocumentview.obj \ gimpdrawabletreeview.obj \ gimpeditor.obj \ gimpenummenu.obj \ gimperrorconsole.obj \ - gimpfontselection.obj \ - gimpfontselection-dialog.obj \ + gimpfontview.obj \ gimpgradienteditor.obj \ + gimpgrideditor.obj \ gimphelp.obj \ gimphistogrambox.obj \ + gimphistogrameditor.obj \ gimphistogramview.obj \ gimpimagedock.obj \ gimpimageeditor.obj \ @@ -81,10 +84,13 @@ OBJECTS = \ gimppreviewrendererdrawable.obj \ gimppreviewrenderergradient.obj \ gimppreviewrendererimage.obj \ - gimppreviewrenderertextlayer.obj \ + gimppreviewrendererlayer.obj \ + gimppreviewrenderervectors.obj \ gimppreviewrenderer-utils.obj \ gimppropwidgets.obj \ gimpselectioneditor.obj \ + gimpsessioninfo.obj \ + gimpstrokeeditor.obj \ gimptemplateeditor.obj \ gimptemplateview.obj \ gimptexteditor.obj \ @@ -92,6 +98,8 @@ OBJECTS = \ gimptoolbox-dnd.obj \ gimptoolbox-color-area.obj \ gimptoolbox-indicator-area.obj \ + gimptooldialog.obj \ + gimptooloptionseditor.obj \ gimpundoeditor.obj \ gimpvectorstreeview.obj \ gimpviewablebutton.obj \ diff --git a/libgimp/makefile.msc b/libgimp/makefile.msc index bbdfa8683a..5c68804157 100644 --- a/libgimp/makefile.msc +++ b/libgimp/makefile.msc @@ -55,6 +55,7 @@ PDB_WRAPPERS_O = \ gimpedit_pdb.obj \ gimpfileops_pdb.obj \ gimpfloatingsel_pdb.obj \ + gimpfonts_pdb.obj \ gimpfontselect_pdb.obj \ gimpgimprc_pdb.obj \ gimpgradients_pdb.obj \ @@ -68,6 +69,8 @@ PDB_WRAPPERS_O = \ gimpmisctools_pdb.obj \ gimppainttools_pdb.obj \ gimppalette_pdb.obj \ + gimppalettes_pdb.obj \ + gimppaletteselect_pdb.obj \ gimpparasite_pdb.obj \ gimppaths_pdb.obj \ gimppatterns_pdb.obj \ @@ -99,17 +102,21 @@ gimp_OBJECTS = \ gimp.obj \ $(PDB_WRAPPERS_O) \ # $(gimpi_OBJECTS) \ + gimpbrushselect.obj \ gimpchannel.obj \ gimpdrawable.obj \ + gimpfontselect.obj \ + gimpgradientselect.obj \ # gimphelp.obj \ gimpimage.obj \ gimplayer.obj \ gimpmisc.obj \ + gimppatternselect.obj \ gimppixelrgn.obj \ gimpproceduraldb.obj \ gimpselection.obj \ gimptile.obj \ - gimpunit.obj \ + gimpunitcache.obj \ #? gimpprotocol.obj \ @@ -127,15 +134,11 @@ gimp.obj : gimp.c gimpui_OBJECTS = \ gimpui.obj \ gimpbrushmenu.obj \ - gimpbrushselect.obj \ gimpfontmenu.obj \ - gimpfontselect.obj \ gimpfontselect_pdb.obj \ gimpgradientmenu.obj \ - gimpgradientselect.obj \ gimpmenu.obj \ gimppatternmenu.obj \ - gimppatternselect.obj \ gimpexport.obj \ gimpmiscui.obj \ # gimppatheditor.obj \ @@ -143,6 +146,7 @@ gimpui_OBJECTS = \ gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def $(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) \ gimp-$(GIMP_VER).lib ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ + ..\libgimpmodule\gimpmodule-$(GIMP_VER).lib \ ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ $(GTK2_LIBS) $(INTL_LIBS) $(DEPLIBS) $(LDFLAGS) /def:gimpui.def diff --git a/libgimpbase/gimputils.c b/libgimpbase/gimputils.c index bad0df3141..b9766f4a06 100644 --- a/libgimpbase/gimputils.c +++ b/libgimpbase/gimputils.c @@ -184,6 +184,15 @@ gimp_any_to_utf8 (const gchar *str, gchar * gimp_memsize_to_string (guint64 memsize) { +#if defined _MSC_VER && (_MSC_VER < 1200) +/* sorry, error C2520: conversion from unsigned __int64 to double not + * implemented, use signed __int64 + */ +# define CAST_DOUBLE (gdouble)(gint64) +#else +# define CAST_DOUBLE (gdouble) +#endif + if (memsize < 1024) { return g_strdup_printf (_("%d Bytes"), (gint) memsize); @@ -191,11 +200,11 @@ gimp_memsize_to_string (guint64 memsize) if (memsize < 1024 * 10) { - return g_strdup_printf (_("%.2f KB"), (gdouble) memsize / 1024.0); + return g_strdup_printf (_("%.2f KB"), CAST_DOUBLE memsize / 1024.0); } else if (memsize < 1024 * 100) { - return g_strdup_printf (_("%.1f KB"), (gdouble) memsize / 1024.0); + return g_strdup_printf (_("%.1f KB"), CAST_DOUBLE memsize / 1024.0); } else if (memsize < 1024 * 1024) { @@ -206,11 +215,11 @@ gimp_memsize_to_string (guint64 memsize) if (memsize < 1024 * 10) { - return g_strdup_printf (_("%.2f MB"), (gdouble) memsize / 1024.0); + return g_strdup_printf (_("%.2f MB"), CAST_DOUBLE memsize / 1024.0); } else if (memsize < 1024 * 100) { - return g_strdup_printf (_("%.1f MB"), (gdouble) memsize / 1024.0); + return g_strdup_printf (_("%.1f MB"), CAST_DOUBLE memsize / 1024.0); } else if (memsize < 1024 * 1024) { @@ -221,16 +230,17 @@ gimp_memsize_to_string (guint64 memsize) if (memsize < 1024 * 10) { - return g_strdup_printf (_("%.2f GB"), (gdouble) memsize / 1024.0); + return g_strdup_printf (_("%.2f GB"), CAST_DOUBLE memsize / 1024.0); } else if (memsize < 1024 * 100) { - return g_strdup_printf (_("%.1f GB"), (gdouble) memsize / 1024.0); + return g_strdup_printf (_("%.1f GB"), CAST_DOUBLE memsize / 1024.0); } else { return g_strdup_printf (_("%d GB"), (gint) memsize / 1024); } +#undef CAST_DOUBLE } /** diff --git a/libgimpbase/makefile.msc b/libgimpbase/makefile.msc index bab0aeef4c..39ca71e899 100644 --- a/libgimpbase/makefile.msc +++ b/libgimpbase/makefile.msc @@ -28,12 +28,14 @@ PKG_LINK = \ $(GLIB_LIBS) $(INTL_LIBS) OBJECTS = \ + gimpbase-private.obj \ gimpenv.obj \ gimpdatafiles.obj \ gimpsignal.obj \ gimpparasite.obj \ gimpparasiteio.obj \ gimpprotocol.obj \ + gimpunit.obj \ gimputils.obj \ gimpwire.obj \ diff --git a/libgimpmodule/gimpmodule.def b/libgimpmodule/gimpmodule.def index 40275fdf1b..832fcdb576 100644 --- a/libgimpmodule/gimpmodule.def +++ b/libgimpmodule/gimpmodule.def @@ -6,11 +6,11 @@ EXPORTS gimp_module_db_refresh gimp_module_db_set_load_inhibit gimp_module_get_type - gimp_module_new - gimp_module_modified - gimp_module_set_load_inhibit - gimp_module_info_new gimp_module_info_copy gimp_module_info_free + gimp_module_info_new + gimp_module_modified + gimp_module_new gimp_module_query_module + gimp_module_set_load_inhibit gimp_module_state_name diff --git a/libgimpwidgets/gimpfileentry.c b/libgimpwidgets/gimpfileentry.c index 2f408e4748..934fce25e4 100644 --- a/libgimpwidgets/gimpfileentry.c +++ b/libgimpwidgets/gimpfileentry.c @@ -40,16 +40,6 @@ #include "libgimp/libgimp-intl.h" -#ifdef G_OS_WIN32 -# ifndef S_ISDIR -# define S_ISDIR(m) ((m) & _S_IFDIR) -# endif -# ifndef S_ISREG -# define S_ISREG(m) ((m) & _S_IFREG) -# endif -#endif - - enum { FILENAME_CHANGED, diff --git a/libgimpwidgets/gimpfileselection.c b/libgimpwidgets/gimpfileselection.c index 2f408e4748..934fce25e4 100644 --- a/libgimpwidgets/gimpfileselection.c +++ b/libgimpwidgets/gimpfileselection.c @@ -40,16 +40,6 @@ #include "libgimp/libgimp-intl.h" -#ifdef G_OS_WIN32 -# ifndef S_ISDIR -# define S_ISDIR(m) ((m) & _S_IFDIR) -# endif -# ifndef S_ISREG -# define S_ISREG(m) ((m) & _S_IFREG) -# endif -#endif - - enum { FILENAME_CHANGED, diff --git a/libgimpwidgets/gimpmemsizeentry.c b/libgimpwidgets/gimpmemsizeentry.c index 19e1e04a2a..a36d54bf1b 100644 --- a/libgimpwidgets/gimpmemsizeentry.c +++ b/libgimpwidgets/gimpmemsizeentry.c @@ -147,17 +147,24 @@ gimp_memsize_entry_unit_callback (GtkWidget *widget, guint shift = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget), "gimp-item-data")); +#if _MSC_VER < 1200 +# define CAST (gint64) +#else +# define CAST +#endif + if (shift != entry->shift) { entry->shift = shift; - entry->adjustment->value = entry->value >> shift; - entry->adjustment->lower = entry->lower >> shift; - entry->adjustment->upper = entry->upper >> shift; + entry->adjustment->value = CAST entry->value >> shift; + entry->adjustment->lower = CAST entry->lower >> shift; + entry->adjustment->upper = CAST entry->upper >> shift; gtk_adjustment_value_changed (entry->adjustment); gtk_adjustment_changed (entry->adjustment); } +#undef CAST } @@ -180,6 +187,12 @@ gimp_memsize_entry_new (guint64 value, GimpMemsizeEntry *entry; guint shift; +#if _MSC_VER < 1200 +# define CAST (gint64) +#else +# define CAST +#endif + g_return_val_if_fail (value >= lower && value <= upper, NULL); entry = g_object_new (GIMP_TYPE_MEMSIZE_ENTRY, NULL); @@ -196,9 +209,11 @@ gimp_memsize_entry_new (guint64 value, entry->shift = shift; entry->spinbutton = gimp_spin_button_new ((GtkObject **) &entry->adjustment, - (value >> shift), - (lower >> shift), - (upper >> shift), 1, 8, 0, 1, 0); + CAST (value >> shift), + CAST (lower >> shift), + CAST (upper >> shift), 1, 8, 0, 1, 0); + +#undef CAST g_object_ref (entry->adjustment); gtk_object_sink (GTK_OBJECT (entry->adjustment)); @@ -257,7 +272,15 @@ gimp_memsize_entry_set_value (GimpMemsizeEntry *entry, gimp_int_option_menu_set_history (GTK_OPTION_MENU (entry->menu), shift); } - gtk_adjustment_set_value (entry->adjustment, value >> shift); +#if _MSC_VER < 1200 +# define CAST (gint64) +#else +# define CAST +#endif + + gtk_adjustment_set_value (entry->adjustment, CAST (value >> shift)); + +#undef CASE } /** diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c index 0f240dca19..f4178f01d2 100644 --- a/libgimpwidgets/gimppropwidgets.c +++ b/libgimpwidgets/gimppropwidgets.c @@ -932,7 +932,11 @@ gimp_prop_adjustment_notify (GObject *config, g_object_get (config, param_spec->name, &uint64_value, NULL); +#if defined _MSC_VER && (_MSC_VER < 1200) + value = (gint64) uint64_value; +#else value = uint64_value; +#endif } else if (G_IS_PARAM_SPEC_DOUBLE (param_spec)) { @@ -992,8 +996,14 @@ gimp_prop_memsize_entry_new (GObject *config, uint64_spec = G_PARAM_SPEC_UINT64 (param_spec); +#ifndef _MSC_VER + /* avoid getting gimppropwidgets.c(999) : warning C4056: + * overflow in floating-point constant arithmetic + * and runtime failing (the check seems not the useful to me anyway) + */ g_return_val_if_fail (uint64_spec->minimum <= (guint64) G_MAXDOUBLE, NULL); g_return_val_if_fail (uint64_spec->maximum <= (guint64) G_MAXDOUBLE, NULL); +#endif entry = gimp_memsize_entry_new (value, uint64_spec->minimum, diff --git a/libgimpwidgets/makefile.msc b/libgimpwidgets/makefile.msc index 6cc95bdc3a..dd95b5a7e0 100644 --- a/libgimpwidgets/makefile.msc +++ b/libgimpwidgets/makefile.msc @@ -46,6 +46,7 @@ OBJECTS = \ gimpcolorscale.obj \ gimpcolorscales.obj \ gimpcolorselect.obj \ + gimpcolorselection.obj \ gimpcolorselector.obj \ gimpdialog.obj \ gimpfileselection.obj \ @@ -77,6 +78,7 @@ gimpunit.obj : ..\app\gimpunit.c gimpwidgets-$(GIMP_VER).dll : $(OBJECTS) gimpwidgets.def $(CC) $(CFLAGS) -LD -Fegimpwidgets-$(GIMP_VER).dll $(OBJECTS) \ ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ + ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ $(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpwidgets.def # ..\app\gimp.lib \ diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc index 18d7e93b61..e3143dfcba 100644 --- a/plug-ins/makefile.msc +++ b/plug-ins/makefile.msc @@ -31,11 +31,11 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below # List plug-ins. We must use several lists to work around nmake's limits # The COMMON* ones are in the common subdirectory -COMMON1 = AlienMap AlienMap2 CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard color_enhance colorify colortoalpha compose convmatrix csource cubism curve_bend +COMMON1 = AlienMap AlienMap2 ccanalyze CEL CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard color_enhance colorify colortoalpha compose convmatrix csource cubism curve_bend COMMON2 = decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange film flarefx fractaltrace COMMON3 = gauss_iir gauss_rle gbr gee gee_zoom gicon gif gifload gih glasstile gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar ps psd psd_save psp randomize ripple rotate -COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spheredesigner spread struc sunras tga threshold_alpha tiff tile tileit tiler uniteditor unsharp video vinvert vpropagate +COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spheredesigner spread struc sunras svg tga threshold_alpha tiff tile tileit tiler uniteditor unsharp video vinvert vpropagate COMMON6 = warp waves whirlpinch winclipboard wind winprint wiredebug wmf xbm xwd zealouscrop # These have own subdirectories each @@ -46,7 +46,7 @@ SEPARATE = FractalExplorer Lighting MapObject bmp dbbrowser faxg3 fits flame fp # ..\unofficial-plug-ins directory, go there, and do "nmake -f # makefile.msc unofficial". -UNOFFICIAL = Anamorphose DigitalSignature RGB_Displace ccanalyze gimp_ace guash sel_gauss magiceye psd_save user_filter +UNOFFICIAL = Anamorphose DigitalSignature RGB_Displace gimp_ace guash sel_gauss magiceye psd_save user_filter # The main target @@ -163,9 +163,7 @@ guash-data-install : !IFDEF EXTRA_FractalExplorer OBJECTS = \ Dialogs.obj \ - Events.obj \ - FractalExplorer.obj \ - Globals.obj + FractalExplorer.obj !ENDIF !IFDEF EXTRA_Lighting @@ -280,6 +278,15 @@ EXTRA_DEPS = images/gfig-stock-pixbufs.h OBJECTS = \ gfig.obj \ + gfig-arc.obj \ + gfig-bezier.obj \ + gfig-circle.obj \ + gfig-dobject.obj \ + gfig-ellipse.obj \ + gfig-line.obj \ + gfig-poly.obj \ + gfig-spiral.obj \ + gfig-star.obj \ gfig-stock.obj !ENDIF @@ -450,6 +457,11 @@ OBJECTS = \ sgilib.obj !ENDIF +!IFDEF EXTRA_svg +EXTRACFLAGS = $(RSVG_CFLAGS) +EXTRALIBS = $(RSVG_LIBS) +!ENDIF + !IFDEF EXTRA_tiff EXTRACFLAGS = -I$(TIFF) EXTRALIBS = $(TIFF)\libtiff.lib $(JPEG)\libjpeg.lib $(ZLIB)\zlib.lib user32.lib @@ -556,8 +568,7 @@ EXTRALIBS = user32.lib gdi32.lib !IFDEF EXTRA_xjt OBJECTS = \ xjt.obj \ - xjpeg.obj \ - xpdb_calls.obj + xjpeg.obj EXTRACFLAGS = $(JPEG_CFLAGS) EXTRALIBS = $(JPEG_LIBS) !ENDIF diff --git a/themes/Default/images/makefile.msc b/themes/Default/images/makefile.msc index 7637620eb6..720080366d 100644 --- a/themes/Default/images/makefile.msc +++ b/themes/Default/images/makefile.msc @@ -13,14 +13,14 @@ STOCK_VARIABLES = \ stock_button_duplicate stock-button-duplicate.png \ stock_button_edit stock-button-edit.png \ stock_button_eye stock-button-eye.png \ - stock_button_hchain_broken stock-button-hchain-broken.png \ stock_button_hchain stock-button-hchain.png \ + stock_button_hchain_broken stock-button-hchain-broken.png \ stock_button_linked stock-button-linked.png \ stock_button_lower stock-button-lower.png \ stock_button_new stock-button-new.png \ + stock_button_paste stock-button-paste.png \ stock_button_paste_as_new stock-button-paste-as-new.png \ stock_button_paste_into stock-button-paste-into.png \ - stock_button_paste stock-button-paste.png \ stock_button_path_stroke stock-button-path-stroke.png \ stock_button_raise stock-button-raise.png \ stock_button_refresh stock-button-refresh.png \ @@ -34,8 +34,11 @@ STOCK_VARIABLES = \ stock_button_stroke stock-button-stroke.png \ stock_button_to_path stock-button-to-path.png \ stock_button_to_selection stock-button-to-selection.png \ - stock_button_vchain_broken stock-button-vchain-broken.png \ stock_button_vchain stock-button-vchain.png \ + stock_button_vchain_broken stock-button-vchain-broken.png \ + stock_cap_butt_16 stock-cap-butt-16.png \ + stock_cap_round_16 stock-cap-round-16.png \ + stock_cap_square_16 stock-cap-square-16.png \ stock_channel_16 stock-channel-16.png \ stock_channel_24 stock-channel-24.png \ stock_channel_32 stock-channel-32.png \ @@ -63,6 +66,7 @@ STOCK_VARIABLES = \ stock_channels_16 stock-channels-16.png \ stock_channels_24 stock-channels-24.png \ stock_char_picker_22 stock-char-picker-22.png \ + stock_close_12 stock-close-12.png \ stock_color_picker_black_18 stock-color-picker-black-18.png \ stock_color_picker_gray_18 stock-color-picker-gray-18.png \ stock_color_picker_white_18 stock-color-picker-white-18.png \ @@ -75,6 +79,7 @@ STOCK_VARIABLES = \ stock_default_colors_12 stock-default-colors-12.png \ stock_delete_16 stock-delete-16.png \ stock_device_status_16 stock-device-status-16.png \ + stock_device_status_24 stock-device-status-24.png \ stock_duplicate_16 stock-duplicate-16.png \ stock_edit_16 stock-edit-16.png \ stock_error_64 stock-error-64.png \ @@ -82,6 +87,10 @@ STOCK_VARIABLES = \ stock_eye_20 stock-eye-20.png \ stock_flip_horizontal_16 stock-flip-horizontal-16.png \ stock_flip_vertical_16 stock-flip-vertical-16.png \ + stock_floating_selection_16 stock-floating-selection-16.png \ + stock_floating_selection_24 stock-floating-selection-24.png \ + stock_floating_selection_32 stock-floating-selection-32.png \ + stock_floating_selection_48 stock-floating-selection-48.png \ stock_gradient_bilinear_16 stock-gradient-bilinear-16.png \ stock_gradient_conical_asymmetric_16 stock-gradient-conical-asymmetric-16.png \ stock_gradient_conical_symmetric_16 stock-gradient-conical-symmetric-16.png \ @@ -103,6 +112,10 @@ STOCK_VARIABLES = \ stock_gravity_west_24 stock-gravity-west-24.png \ stock_grid_16 stock-grid-16.png \ stock_grow_16 stock-grow-16.png \ + stock_histogram_16 stock-histogram-16.png \ + stock_histogram_22 stock-histogram-22.png \ + stock_histogram_linear_16 stock-histogram-linear-16.png \ + stock_histogram_logarithmic_16 stock-histogram-logarithmic-16.png \ stock_hchain_24 stock-hchain-24.png \ stock_hchain_broken_24 stock-hchain-broken-24.png \ stock_image_16 stock-image-16.png \ @@ -111,10 +124,15 @@ STOCK_VARIABLES = \ stock_image_48 stock-image-48.png \ stock_images_16 stock-images-16.png \ stock_images_24 stock-images-24.png \ + stock_indexed_palette_16 stock-indexed-palette-16.png \ + stock_indexed_palette_24 stock-indexed-palette-24.png \ stock_info_16 stock-info-16.png \ stock_info_24 stock-info-24.png \ stock_info_64 stock-info-64.png \ stock_invert_16 stock-invert-16.png \ + stock_join_bevel_16 stock-join-bevel-16.png \ + stock_join_miter_16 stock-join-miter-16.png \ + stock_join_round_16 stock-join-round-16.png \ stock_landscape_16 stock-landscape-16.png \ stock_layer_16 stock-layer-16.png \ stock_layer_24 stock-layer-24.png \ @@ -132,18 +150,22 @@ STOCK_VARIABLES = \ stock_menu_convert_grayscale stock-menu-convert-grayscale.png \ stock_menu_convert_indexed stock-menu-convert-indexed.png \ stock_menu_convert_rgb stock-menu-convert-rgb.png \ + stock_menu_left_12 stock-menu-left-12.png \ stock_menu_merge_down stock-menu-merge-down.png \ stock_menu_navigation stock-menu-navigation.png \ stock_menu_qmask_off stock-menu-qmask-off.png \ stock_menu_qmask_on stock-menu-qmask-on.png \ stock_menu_reshow_filter stock-menu-reshow-filter.png \ stock_menu_resize stock-menu-resize.png \ + stock_menu_right_12 stock-menu-right-12.png \ stock_menu_rotate_180 stock-menu-rotate-180.png \ stock_menu_rotate_270 stock-menu-rotate-270.png \ stock_menu_rotate_90 stock-menu-rotate-90.png \ stock_menu_scale stock-menu-scale.png \ stock_menu_selection_to_channel stock-menu-selection-to-channel.png \ stock_merge_down_16 stock-merge-down-16.png \ + stock_move_to_screen_16 stock-move-to-screen-16.png \ + stock_move_to_screen_24 stock-move-to-screen-24.png \ stock_navigation_16 stock-navigation-16.png \ stock_new_16 stock-new-16.png \ stock_none_16 stock-none-16.png \ @@ -195,6 +217,13 @@ STOCK_VARIABLES = \ stock_toilet_paper_16 stock-toilet-paper-16.png \ stock_toilet_paper_24 stock-toilet-paper-24.png \ stock_tool_options_16 stock-tool-options-16.png \ + stock_tool_options_24 stock-tool-options-24.png \ + stock_tools_16 stock-tools-16.png \ + stock_tools_24 stock-tools-24.png \ + stock_transparency_16 stock-transparency-16.png \ + stock_transparency_24 stock-transparency-24.png \ + stock_undo_history_16 stock-undo-history-16.png \ + stock_undo_history_24 stock-undo-history-24.png \ stock_vchain_24 stock-vchain-24.png \ stock_vchain_broken_24 stock-vchain-broken-24.png \ stock_video_16 stock-video-16.png \ @@ -303,7 +332,7 @@ STOCK_TOOL_VARIABLES = \ stock_tool_move_22 tools/stock-tool-move-22.png \ stock_tool_paintbrush_16 tools/stock-tool-paintbrush-16.png \ stock_tool_paintbrush_22 tools/stock-tool-paintbrush-22.png \ -# stock_tool_path_16 tools/stock-tool-path-16.png \ + stock_tool_path_16 tools/stock-tool-path-16.png \ stock_tool_path_22 tools/stock-tool-path-22.png \ stock_tool_pencil_16 tools/stock-tool-pencil-16.png \ stock_tool_pencil_22 tools/stock-tool-pencil-22.png \