updated msvc build include <io.h> for get_osfhandle() prototype

2007-08-26  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc : updated msvc build
	* app/main.c : include <io.h> for get_osfhandle()
	* plug-ins/jpeg/jpeg-settings.h : prototype
	jpeg_swap_original_settings


svn path=/trunk/; revision=23377

ChangeLog

@@ -1,3 +1,10 @@
+2007-08-26  Hans Breuer  <hans@breuer.org>
+
+	* **/makefile.msc app/gimpcore.def : updated msvc build
+	* app/main.c : include <io.h> for get_osfhandle()
+	* plug-ins/jpeg/jpeg-settings.h : prototype
+	jpeg_swap_original_settings
+
 2007-08-26  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* libgimpwidgets/gimpcolorprofilestore.h: Add a G_END_DECLS.

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 : \

app/main.c

@@ -37,6 +37,10 @@
 
 #include <glib-object.h>
 
+#ifdef G_OS_WIN32
+#include <io.h> /* get_osfhandle */
+#endif
+
 #if HAVE_DBUS_GLIB
 #include <dbus/dbus-glib.h>
 #endif

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 = \
 	

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 \

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 

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)

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 \

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) \

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);