From aface5c12a8311816f2e81b6c23bf53058a3a660 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sun, 26 Aug 2007 18:59:34 +0000 Subject: [PATCH] updated msvc build include for get_osfhandle() prototype 2007-08-26 Hans Breuer * **/makefile.msc : updated msvc build * app/main.c : include for get_osfhandle() * plug-ins/jpeg/jpeg-settings.h : prototype jpeg_swap_original_settings svn path=/trunk/; revision=23377 --- ChangeLog | 7 +++++++ app/core/makefile.msc | 2 +- app/main.c | 4 ++++ app/paint-funcs/makefile.msc | 5 +++-- app/plug-in/makefile.msc | 1 + gimpdefs.msc | 2 +- libgimpbase/makefile.msc | 8 ++++---- libgimpwidgets/makefile.msc | 6 ++++-- modules/makefile.msc | 3 ++- plug-ins/jpeg/jpeg-settings.h | 2 ++ 10 files changed, 29 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc3a662e2b..c47697a252 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-08-26 Hans Breuer + + * **/makefile.msc app/gimpcore.def : updated msvc build + * app/main.c : include for get_osfhandle() + * plug-ins/jpeg/jpeg-settings.h : prototype + jpeg_swap_original_settings + 2007-08-26 Martin Nordholts * libgimpwidgets/gimpcolorprofilestore.h: Add a G_END_DECLS. diff --git a/app/core/makefile.msc b/app/core/makefile.msc index f340148390..3a45ee3d65 100644 --- a/app/core/makefile.msc +++ b/app/core/makefile.msc @@ -192,7 +192,7 @@ INCLUDES = \ DEFINES = \ -DGIMP_COMPILATION \ - -DGIMP_APP_VERSION=\"2.3\" \ + -DGIMP_APP_VERSION=\"2.4\" \ -DG_LOG_DOMAIN=\"Gimp-Core\" all : \ diff --git a/app/main.c b/app/main.c index ca7af608ca..9fd4db0682 100644 --- a/app/main.c +++ b/app/main.c @@ -37,6 +37,10 @@ #include +#ifdef G_OS_WIN32 +#include /* get_osfhandle */ +#endif + #if HAVE_DBUS_GLIB #include #endif diff --git a/app/paint-funcs/makefile.msc b/app/paint-funcs/makefile.msc index 4ba76d64e8..304f20ebd9 100644 --- a/app/paint-funcs/makefile.msc +++ b/app/paint-funcs/makefile.msc @@ -14,8 +14,9 @@ LT_RELEASE = $(PKG_VER) OBJECTS = \ paint-funcs.obj \ - scale-funcs.obj \ - sample-funcs.obj \ + reduce-region.obj \ + scale-region.obj \ + subsample-region.obj \ mmx_sources = \ diff --git a/app/plug-in/makefile.msc b/app/plug-in/makefile.msc index cb31ef25f6..17cc482c61 100644 --- a/app/plug-in/makefile.msc +++ b/app/plug-in/makefile.msc @@ -20,6 +20,7 @@ OBJECTS = \ gimpenvirontable.obj \ gimpinterpreterdb.obj \ gimpplugin.obj \ + gimppluginerror.obj \ gimpplugin-cleanup.obj \ gimpplugin-context.obj \ gimpplugindebug.obj \ diff --git a/gimpdefs.msc b/gimpdefs.msc index e07693975b..a202cc8a96 100644 --- a/gimpdefs.msc +++ b/gimpdefs.msc @@ -7,7 +7,7 @@ GIMP_VER = 2.0 # and stuff is saved. GIMPDIR = _gimp$(GIMP_VER) # don't interfer with stable version -GIMPDIR = _gimp-2.3.x +GIMPDIR = _gimp-2.4 # Build app/* as DLLs; don't define this, it doesn't work yet. #DLLGIMP = 1 diff --git a/libgimpbase/makefile.msc b/libgimpbase/makefile.msc index 864a3dbeab..2f15632294 100644 --- a/libgimpbase/makefile.msc +++ b/libgimpbase/makefile.msc @@ -10,10 +10,10 @@ PKG_VER = $(GIMP_VER) DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DDATADIR=\"\" -DSYSCONFDIR=\"\" \ -DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\" \ - -DGIMP_PACKAGE=\"gimp-2.3\" \ - -DGIMP_DATA_VERSION=\"2.3\" \ - -DGIMP_PLUGIN_VERSION=\"2.3\" \ - -DGIMP_SYSCONF_VERSION=\"2.3\" \ + -DGIMP_PACKAGE=\"gimp-2.4\" \ + -DGIMP_DATA_VERSION=\"2.4\" \ + -DGIMP_PLUGIN_VERSION=\"2.4\" \ + -DGIMP_SYSCONF_VERSION=\"2.4\" \ top_srcdir = $(PRJ_TOP) top_builddir = $(PRJ_TOP) diff --git a/libgimpwidgets/makefile.msc b/libgimpwidgets/makefile.msc index 20a7cef46a..d0d93831a2 100644 --- a/libgimpwidgets/makefile.msc +++ b/libgimpwidgets/makefile.msc @@ -40,8 +40,11 @@ OBJECTS = \ gimpcolorarea.obj \ gimpcolorbutton.obj \ gimpcolordisplay.obj \ + gimpcolordisplaystack.obj \ gimpcolorhexentry.obj \ gimpcolornotebook.obj \ + gimpcolorprofilecombobox.obj \ + gimpcolorprofilestore.obj \ gimpcolorscale.obj \ gimpcolorscales.obj \ gimpcolorselect.obj \ @@ -61,6 +64,7 @@ OBJECTS = \ gimpintcombobox.obj \ gimpintstore.obj \ gimpmemsizeentry.obj \ + gimpnumberpairentry.obj \ gimpoffsetarea.obj \ gimpoldwidgets.obj \ gimppageselector.obj \ @@ -70,11 +74,9 @@ OBJECTS = \ gimppreviewarea.obj \ gimppreview.obj \ gimppropwidgets.obj \ - gimpratioentry.obj \ gimpscrolledpreview.obj \ gimpstringcombobox.obj \ gimpquerybox.obj \ -# gimpresolutionentry.obj \ gimpsizeentry.obj \ gimpstock.obj \ gimpunitmenu.obj \ diff --git a/modules/makefile.msc b/modules/makefile.msc index affa460b7c..857581657a 100644 --- a/modules/makefile.msc +++ b/modules/makefile.msc @@ -83,9 +83,10 @@ cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.obj cdisplay_lcms-$(GIMP_VER).dll : cdisplay_lcms.obj $(CC) $(CFLAGS) $(LCMS_CFLAGS) -LD -Fe$@ cdisplay_lcms.obj $(LDFLAGS) \ ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ + ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ ..\libgimpconfig\gimpconfig-$(GIMP_VER).lib \ ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ - $(DEPLIBS) $(LCMS_LIBS) + $(DEPLIBS) $(LCMS_LIBS) user32.lib gdi32.lib cdisplay_proof-$(GIMP_VER).dll : cdisplay_proof.obj $(CC) $(CFLAGS) $(LCMS_CFLAGS) -LD -Fe$@ cdisplay_proof.obj $(LDFLAGS) \ diff --git a/plug-ins/jpeg/jpeg-settings.h b/plug-ins/jpeg/jpeg-settings.h index d1e3ceb975..ad39a3259f 100644 --- a/plug-ins/jpeg/jpeg-settings.h +++ b/plug-ins/jpeg/jpeg-settings.h @@ -29,3 +29,5 @@ gboolean jpeg_restore_original_settings (gint32 image_ID, guint **jpeg_restore_original_tables (gint32 image_ID, gint num_quant_tables); + +void jpeg_swap_original_settings (gint32 image_ID);