#define GETTEXT_PACKAGE

2001-03-28  Hans Breuer  <hans@breuer.org>

	* config.h.win32 : #define GETTEXT_PACKAGE

	* makefile.msc : add theme rule

	* app/makefile.msc : gimp.exe depends on all the libs
	and general update

	* app/base/makefile.msc : updated

	* app/config/gimpconfig-serialize.c : #include <io.h> for win32
	* app/config/gimpconfig-types.c : #include <string.h>

	* app/core/gimpcontext.c app/core/gimpcontainer.c
	  app/core/gimptoolinfo.c : #include <string.h>

	* app/core/gimpdocuments.c (gimp_documents_save_func) :
	need to g_strescape() the filename to not make
	backslashes vanish during de-serialization

	* app/core/gimpimagefile.c : #define S_ISREG for G_OS_WIN32

	* app/core/makefile.msc : add -DGIMP_COMPILATION
	required for cpercep.c build

	* app/display/gimpdisplayshell.c : #include <string.h>

	* app/display/makefile.msc : -FImsvc_recommended_pragmas.h,
	G_LOG_DOMAIN definition and object file update

	* app/file/makefile.msc : -FImsvc_recommended_pragmas.h,
	G_LOG_DOMAIN definition

	* app/file/file-open.c (file_open_with_proc_and_display) :
	use absolute filename for gimp_documents_add()

	* app/gui/channel-commands.c app/gui/colormap-editor-commands.c
	  app/gui/edit-commands.c app/gui/vectors-commands.c :
	#include <string.h>

	* app/gui/makefile.msc : updated

	* app/gui/menus.c : use g_file_test() instead of access()
	to avoid inclusion <unistd.h>

	* app/paint/makefile.msc : updated

	* app/plug-in/plug-in-params.c : #include <string.h>

	* app/plug-in/makefile.msc : updated

	* app/plug-in/plug-in-def.h : #include <time.h> for time_t

	* app/plug-in/plug-in.c : remove definition of S_IFREG

	* app/plug-in/gap/gap_arr_dialog.c : include <config.h>
	before including libgimp/libgimp-intl.h

	* app/tools/makefile.msc : updated

	* app/vectors/makefile.msc : new file

	* app/widgets/makefile.msc : updated

	* libgimp/gimp.def : updated externals

	* libgimpwidgets/gimpwidgets.def : updated externals

	* modules/makefile.msc : updated and disabled colorsel_gtk.

	* plug-in/makefile.msc : don't define GETTEXT_PACKAGE

	* themes/Default/images/makefile.msc : moved makefile.msc from ..
	and adapted pathes to images

ChangeLog

@@ -1,3 +1,79 @@
+2001-03-28  Hans Breuer  <hans@breuer.org>
+
+	* config.h.win32 : #define GETTEXT_PACKAGE
+
+	* makefile.msc : add theme rule
+
+	* app/makefile.msc : gimp.exe depends on all the libs
+	and general update
+
+	* app/base/makefile.msc : updated
+
+	* app/config/gimpconfig-serialize.c : #include <io.h> for win32
+	* app/config/gimpconfig-types.c : #include <string.h>
+
+	* app/core/gimpcontext.c app/core/gimpcontainer.c
+	  app/core/gimptoolinfo.c : #include <string.h>
+ 
+	* app/core/gimpdocuments.c (gimp_documents_save_func) :
+	need to g_strescape() the filename to not make 
+	backslashes vanish during de-serialization
+
+	* app/core/gimpimagefile.c : #define S_ISREG for G_OS_WIN32
+
+	* app/core/makefile.msc : add -DGIMP_COMPILATION
+	required for cpercep.c build
+
+	* app/display/gimpdisplayshell.c : #include <string.h>
+
+	* app/display/makefile.msc : -FImsvc_recommended_pragmas.h,
+	G_LOG_DOMAIN definition and object file update
+
+	* app/file/makefile.msc : -FImsvc_recommended_pragmas.h,
+	G_LOG_DOMAIN definition
+
+	* app/file/file-open.c (file_open_with_proc_and_display) :
+	use absolute filename for gimp_documents_add()
+
+	* app/gui/channel-commands.c app/gui/colormap-editor-commands.c
+	  app/gui/edit-commands.c app/gui/vectors-commands.c : 
+	#include <string.h>
+
+	* app/gui/makefile.msc : updated
+
+	* app/gui/menus.c : use g_file_test() instead of access()
+	to avoid inclusion <unistd.h>
+
+	* app/paint/makefile.msc : updated
+
+	* app/plug-in/plug-in-params.c : #include <string.h>
+
+	* app/plug-in/makefile.msc : updated
+
+	* app/plug-in/plug-in-def.h : #include <time.h> for time_t
+
+	* app/plug-in/plug-in.c : remove definition of S_IFREG
+
+	* app/plug-in/gap/gap_arr_dialog.c : include <config.h>
+	before including libgimp/libgimp-intl.h
+
+	* app/tools/makefile.msc : updated
+
+	* app/vectors/makefile.msc : new file
+
+	* app/widgets/makefile.msc : updated
+
+	* libgimp/gimp.def : updated externals
+
+	* libgimpwidgets/gimpwidgets.def : updated externals
+
+	* modules/makefile.msc : updated and disabled colorsel_gtk.
+
+	* plug-in/makefile.msc : don't define GETTEXT_PACKAGE
+
+	* themes/Default/images/makefile.msc : moved makefile.msc from ..
+	and adapted pathes to images
+
 2002-03-28  Michael Natterer  <mitch@gimp.org>
 
 	* app/config/Makefile.am

app/actions/channels-commands.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"

app/actions/colormap-commands.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"

app/actions/colormap-editor-commands.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"

app/actions/edit-commands.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpwidgets/gimpwidgets.h"

app/actions/vectors-commands.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpwidgets/gimpwidgets.h"

app/base/makefile.msc

@@ -15,6 +15,7 @@ PKG_LINK = \
 OBJECTS = \
 	base.obj \
 	base-config.obj \
+	base-enums.obj \
 	boundary.obj \
 	brush-scale.obj \
 	gimphistogram.obj \
@@ -31,6 +32,7 @@ OBJECTS = \
 	tile-swap.obj \
 
 INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
 	-I $(PRJ_TOP) \
 	-I $(PRJ_TOP)/app \
 	$(GLIB_CFLAGS) \

app/config/gimpconfig-serialize.c

@@ -29,6 +29,10 @@
 
 #include <glib-object.h>
 
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
+
 #include "gimpconfig.h"
 #include "gimpconfig-serialize.h"
 #include "gimpconfig-types.h"

app/config/gimpconfig-types.c

@@ -23,6 +23,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <glib-object.h>
 

app/config/makefile.msc

@@ -25,10 +25,14 @@ OBJECTS = \
 	gimprc.obj \
 
 INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
 	-I $(PRJ_TOP) \
 	-I $(PRJ_TOP)/app \
 	$(GLIB_CFLAGS) \
 
+DEFINES = \
+	-DG_LOG_DOMAIN=\"Gimp-Config\"
+
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib \

app/core/gimp-documents.c

@@ -144,7 +144,10 @@ static void
 gimp_documents_save_func (GimpImagefile *imagefile,
 			  FILE          *fp)
 {
-  fprintf (fp, "(document \"%s\")\n", GIMP_OBJECT (imagefile)->name);
+  gchar *escaped = g_strescape (GIMP_OBJECT (imagefile)->name, NULL);
+
+  fprintf (fp, "(document \"%s\")\n", escaped);
+  g_free (escaped);
 }
 
 void

app/core/gimpcontainer.c

@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <glib-object.h>
 
 #include "core-types.h"

app/core/gimpcontext.c

@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <glib-object.h>
 
 #include "libgimpcolor/gimpcolor.h"

app/core/gimpdocumentlist.c

@@ -144,7 +144,10 @@ static void
 gimp_documents_save_func (GimpImagefile *imagefile,
 			  FILE          *fp)
 {
-  fprintf (fp, "(document \"%s\")\n", GIMP_OBJECT (imagefile)->name);
+  gchar *escaped = g_strescape (GIMP_OBJECT (imagefile)->name, NULL);
+
+  fprintf (fp, "(document \"%s\")\n", escaped);
+  g_free (escaped);
 }
 
 void

app/core/gimpdocuments.c

@@ -144,7 +144,10 @@ static void
 gimp_documents_save_func (GimpImagefile *imagefile,
 			  FILE          *fp)
 {
-  fprintf (fp, "(document \"%s\")\n", GIMP_OBJECT (imagefile)->name);
+  gchar *escaped = g_strescape (GIMP_OBJECT (imagefile)->name, NULL);
+
+  fprintf (fp, "(document \"%s\")\n", escaped);
+  g_free (escaped);
 }
 
 void

app/core/gimpimagefile.c

@@ -32,6 +32,12 @@
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+#ifdef G_OS_WIN32
+#  ifndef S_ISREG
+#  define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
+#  endif
+#endif
+
 #include "core-types.h"
 
 #include "base/temp-buf.h"

app/core/gimptoolinfo.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <glib-object.h>
 
 #include "core-types.h"

app/core/makefile.msc

@@ -7,14 +7,19 @@ PKG_VER = 1.3
 
 PKG_LINK = \
 	$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \
+	$(LIBART_LIBS) \
 	..\base\appbase-$(PKG_VER).lib \
 	..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \
+	..\vectors\appvectors-$(PKG_VER).lib \
 	..\xcf\xcf.lib \
 	..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
 	..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \
+	..\..\libgimpmath\gimpmath-$(PKG_VER).lib \
 	..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib
 
 OBJECTS = \
+#	..\undo.obj \
+	core-enums.obj \
 	cpercep.obj \
 	gimp.obj \
 	gimpbrush.obj \
@@ -61,13 +66,16 @@ OBJECTS = \
 	gimpimage-scale.obj \
 	gimpimage-undo.obj \
 	gimpimagefile.obj \
+	gimpitem.obj \
 	gimplayer.obj \
+	gimplayer-floating-sel.obj \
 	gimplayermask.obj \
 	gimplist.obj \
 	gimpmarshal.obj \
 	gimpmoduleinfo.obj \
 	gimpmodules.obj \
 	gimpobject.obj \
+	gimppaintinfo.obj \
 	gimppalette.obj \
 	gimppalette-import.obj \
 	gimpparasite.obj \
@@ -94,9 +102,15 @@ OTHER_FILES = \
 
 
 INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
 	-I$(PRJ_TOP) \
 	-I$(PRJ_TOP)/app \
 	$(GTK2_CFLAGS) \
+	$(LIBART_CFLAGS) \
+
+DEFINES = \
+	-DGIMP_COMPILATION \
+	-DG_LOG_DOMAIN=\"Gimp-Core\"
 
 all : \
 	$(PRJ_TOP)\config.h \

app/display/gimpdisplayshell-draw.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"

app/display/gimpdisplayshell.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"

app/display/makefile.msc

@@ -7,10 +7,14 @@ PKG_VER = 1.3
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
 INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
 	-I$(PRJ_TOP) \
 	-I$(PRJ_TOP)/app \
 	$(GTK2_CFLAGS) \
 
+DEFINES = \
+	-DG_LOG_DOMAIN=\"Gimp-Display\"
+
 OBJECTS = \
 	gimpdisplay.obj \
 	gimpdisplay-area.obj \
@@ -19,16 +23,17 @@ OBJECTS = \
 	gimpdisplayshell.obj \
 	gimpdisplayshell-callbacks.obj \
 	gimpdisplayshell-dnd.obj \
-#	gimpdisplayshell-filter.obj \
-#	gimpdisplayshell-filter-dialog.obj \
+	gimpdisplayshell-filter.obj \
+	gimpdisplayshell-filter-dialog.obj \
 	gimpdisplayshell-handlers.obj \
 	gimpdisplayshell-layer-select.obj \
 	gimpdisplayshell-render.obj \
 	gimpdisplayshell-scale.obj \
 	gimpdisplayshell-scroll.obj \
 	gimpdisplayshell-selection.obj \
+	gimpprogress.obj \
 	gimpstatusbar.obj \
-
+	display-enums.obj \
 
 all : \
 	$(PRJ_TOP)\config.h \

app/file/makefile.msc

@@ -11,10 +11,14 @@ OBJECTS = \
 	file-utils.obj \
 
 INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
 	-I$(PRJ_TOP) \
 	-I$(PRJ_TOP)/app \
 	$(GTK2_CFLAGS) \
 
+DEFINES = \
+	-DG_LOG_DOMAIN=\"Gimp-File\"
+
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib

app/gui/channels-commands.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"

app/gui/colormap-editor-commands.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"

app/gui/edit-commands.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpwidgets/gimpwidgets.h"

app/gui/makefile.msc

@@ -20,16 +20,13 @@ PKG_LINK = \
 
 OBJECTS = \
 	about-dialog.obj \
-	brush-editor.obj \
 	brushes-commands.obj \
 	brush-select.obj \
 	buffers-commands.obj \
 	channels-commands.obj \
-	color-area.obj \
-	colormap-dialog.obj \
+	colormap-editor-commands.obj \
 	color-notebook.obj \
 	color-select.obj \
-	commands.obj \
 	convert-dialog.obj \
 	data-commands.obj \
 	device-status-dialog.obj \
@@ -37,6 +34,7 @@ OBJECTS = \
 	dialogs-commands.obj \
 	dialogs-constructors.obj \
 	documents-commands.obj \
+	drawable-commands.obj \
 	edit-commands.obj \
 	error-console-dialog.obj \
 	file-commands.obj \
@@ -44,27 +42,27 @@ OBJECTS = \
 	file-new-dialog.obj \
 	file-open-dialog.obj \
 	file-save-dialog.obj \
-	gradient-editor.obj \
 	gradient-editor-commands.obj \
 	gradients-commands.obj \
 	gradient-select.obj \
 	gui.obj \
+	help-commands.obj \
 	image-commands.obj \
-	indicator-area.obj \
 	info-dialog.obj \
 	info-window.obj \
-	input-dialog.obj \
 	layers-commands.obj \
 	menus.obj \
 	module-browser.obj \
 	offset-dialog.obj \
-	palette-editor.obj \
+	palette-editor-commands.obj \
 	palette-import-dialog.obj \
 	palettes-commands.obj \
 	palette-select.obj \
 	paths-dialog.obj \
 	patterns-commands.obj \
 	pattern-select.obj \
+	plug-in-commands.obj \
+	plug-in-menus.obj \
 	preferences-dialog.obj \
 	qmask-commands.obj \
 	resize-dialog.obj \
@@ -74,18 +72,24 @@ OBJECTS = \
 	splash.obj \
 	test-commands.obj \
 	tips-dialog.obj \
-	toolbox.obj \
+	tips-parser.obj \
 	tool-options-dialog.obj \
 	tools-commands.obj \
 	user-install-dialog.obj \
+	vectors-commands.obj \
 	view-commands.obj \
 
+
 INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/app \
 	$(GTK2_CFLAGS) \
 	-I$(includedir)
 
+DEFINES = \
+	-DG_LOG_DOMAIN=\"Gimp-GUI\"
+
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib \

app/gui/menus.c

@@ -2594,8 +2594,6 @@ menus_filters_subdirs_to_top (GtkMenu *menu)
 
 #ifdef ENABLE_DEBUG_ENTRIES
 
-#include <unistd.h>
-
 static void
 menus_debug_recurse_menu (GtkWidget *menu,
 			  gint       depth,
@@ -2651,7 +2649,7 @@ menus_debug_recurse_menu (GtkWidget *menu,
 	      if ((hash = strchr (help_path, '#')) != NULL)
 		*hash = '\0';
 
-	      if (access (help_path, R_OK))
+	      if (g_file_test (help_path, G_FILE_TEST_EXISTS))
 		{
 		  g_free (help_path);
 		  help_path = g_strconcat ("! ", help_page, NULL);

app/gui/vectors-commands.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpwidgets/gimpwidgets.h"

app/makefile.msc

@@ -11,7 +11,7 @@ top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
 includedir = $(PRJ_TOP)
 LT_RELEASE = $(PKG_VER)
-SUBDIRS = paint-funcs base xcf core file display pdb tools widgets gui
+SUBDIRS = paint-funcs base xcf core file display paint vectors pdb plug-in tools widgets gui
 
 sub-all: 
 	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
@@ -21,6 +21,8 @@ sub-one:
 	nmake -nologo -f makefile.msc
 	cd ..
 
+LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
+
 PKG_LINK = \
 	paint/apppaint.lib \
 	paint-funcs/apppaint-funcs.lib \
@@ -34,6 +36,8 @@ PKG_LINK = \
 	file/appfile.lib \
 	display/appdisplay.lib \
 	xcf/xcf.lib \
+	vectors/appvectors.lib \
+	plug-in/appplug-in.lib \
 	$(PRJ_TOP)/regexrepl/regexrepl.lib \
 	$(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \
 	$(top_builddir)/libgimpmath/gimpmath-$(LT_RELEASE).lib \
@@ -44,7 +48,8 @@ PKG_LINK = \
 	$(GIMP_THREAD_LIBS) \
 	$(GIMP_MP_LIBS) \
 	$(INTL_LIBS) \
-	$(PANGO)\pango\pangoft2-$(PANGO_VER).lib
+	$(PANGO)\pango\pangoft2-$(PANGO_VER).lib \
+	$(LIBART_LIBS)
 
 gimp_LDFLAGS = \
 	-export-dynamic -export-symbols $(srcdir)/gimp.sym
@@ -62,12 +67,10 @@ mmx_sources = \
 	
 
 OBJECTS = \
-	gimpprogress.obj \
 	nav_window.obj \
 	ops_buttons.obj \
 	undo_history.obj \
 	image_map.obj \
-	floating_sel.obj \
 	general.obj \
 	gimprc.obj \
 	path.obj \
@@ -118,7 +121,7 @@ $(PACKAGE).lib : $(OBJECTS)
 $(PACKAGE)-$(PKG_VER).dll : $(PKG_LINK) $(OBJECTS) $(PACKAGE).def
 	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
 
-$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
+$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res $(PKG_LINK)
 	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \
 	user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
 

app/menus/menus.c

@@ -2594,8 +2594,6 @@ menus_filters_subdirs_to_top (GtkMenu *menu)
 
 #ifdef ENABLE_DEBUG_ENTRIES
 
-#include <unistd.h>
-
 static void
 menus_debug_recurse_menu (GtkWidget *menu,
 			  gint       depth,
@@ -2651,7 +2649,7 @@ menus_debug_recurse_menu (GtkWidget *menu,
 	      if ((hash = strchr (help_path, '#')) != NULL)
 		*hash = '\0';
 
-	      if (access (help_path, R_OK))
+	      if (g_file_test (help_path, G_FILE_TEST_EXISTS))
 		{
 		  g_free (help_path);
 		  help_path = g_strconcat ("! ", help_page, NULL);

app/paint/makefile.msc

@@ -23,23 +23,31 @@ PKG_LINK = \
 	..\widgets\appwidgets-$(PKG_VER).lib \
 
 OBJECTS = \
-        gimpairbrush.obj \
-        gimpclone.obj \
-        gimpconvolve.obj \
-        gimpdodgeburn.obj \
-        gimperaser.obj \
-        gimppaintbrush.obj \
-        gimppaintcore.obj \
-        gimppencil.obj \
-        gimpsmudge.obj \
+	gimpairbrush.obj \
+	gimpclone.obj \
+	gimpconvolve.obj \
+	gimpdodgeburn.obj \
+	gimperaser.obj \
+	gimppaintbrush.obj \
+	gimppaintcore.obj \
+	gimppaintcore-stroke.obj \
+	gimppaintoptions.obj \
+	gimppencil.obj \
+	gimpsmudge.obj \
+	paint.obj \
+	paint-enums.obj \
 
 INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/app \
 	$(GTK2_CFLAGS) \
 	-I$(includedir)
 # $(FREETYPE2_CFLAGS) 
-	
+
+DEFINES = \
+	-DG_LOG_DOMAIN=\"Gimp-Paint\"	\
+
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib \

app/pdb/makefile.msc

@@ -49,6 +49,8 @@ OBJECTS = \
 	misc_tools_cmds.obj \
 	paint_tools_cmds.obj \
 	palette_cmds.obj \
+	palette_select_cmds.obj \
+	palettes_cmds.obj \
 	parasite_cmds.obj \
 	paths_cmds.obj \
 	pattern_select_cmds.obj \
@@ -63,6 +65,7 @@ OBJECTS = \
 	unit_cmds.obj \
 
 INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/app \
 	$(GTK2_CFLAGS) \

app/plug-in/gimpplugin-message.c

@@ -47,9 +47,6 @@
 #ifdef G_OS_WIN32
 #include <fcntl.h>
 #include <io.h>
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
-#endif
 #endif
 
 #ifdef G_WITH_CYGWIN

app/plug-in/gimpplugin.c

@@ -47,9 +47,6 @@
 #ifdef G_OS_WIN32
 #include <fcntl.h>
 #include <io.h>
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
-#endif
 #endif
 
 #ifdef G_WITH_CYGWIN

app/plug-in/gimppluginmanager-call.c

@@ -47,9 +47,6 @@
 #ifdef G_OS_WIN32
 #include <fcntl.h>
 #include <io.h>
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
-#endif
 #endif
 
 #ifdef G_WITH_CYGWIN

app/plug-in/gimppluginmanager-run.c

@@ -47,9 +47,6 @@
 #ifdef G_OS_WIN32
 #include <fcntl.h>
 #include <io.h>
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
-#endif
 #endif
 
 #ifdef G_WITH_CYGWIN

app/plug-in/gimppluginshm.c

@@ -47,9 +47,6 @@
 #ifdef G_OS_WIN32
 #include <fcntl.h>
 #include <io.h>
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
-#endif
 #endif
 
 #ifdef G_WITH_CYGWIN

app/plug-in/makefile.msc

@@ -5,20 +5,34 @@ PACKAGE = appplug-in
 PKG_VER = 1.3
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
+PKG_LINK = \
+	$(GLIB_LIBS) \
+	..\base\appbase-$(PKG_VER).lib \
+	..\..\libgimpbase\gimpbase-$(PKG_VER).lib \
+	\
+	..\core\appcore-$(PKG_VER).lib
+
 OBJECTS = \
 	plug-in.obj \
+	plug-in-def.obj \
+	plug-in-params.obj \
 	plug-in-proc.obj \
+	plug-in-progress.obj \
 	plug-in-rc.obj \
+	plug-ins.obj \
 
 INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
 	-I$(PRJ_TOP) \
 	-I$(PRJ_TOP)/app \
 	$(GTK2_CFLAGS) \
 
 all : \
 	$(PRJ_TOP)\config.h \
-	$(PACKAGE).lib
-
+	$(PACKAGE).lib \
+!IFDEF DLL_GIMP
+	$(PACKAGE)-$(PKG_VER).dll
+!ENDIF
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h

app/plug-in/plug-in-def.h

@@ -19,6 +19,7 @@
 #ifndef __PLUG_IN_DEF_H__
 #define __PLUG_IN_DEF_H__
 
+#include <time.h>
 
 struct _PlugInDef
 {

app/plug-in/plug-in-message.c

@@ -47,9 +47,6 @@
 #ifdef G_OS_WIN32
 #include <fcntl.h>
 #include <io.h>
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
-#endif
 #endif
 
 #ifdef G_WITH_CYGWIN

app/plug-in/plug-in-params.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"

app/plug-in/plug-in-run.c

@@ -47,9 +47,6 @@
 #ifdef G_OS_WIN32
 #include <fcntl.h>
 #include <io.h>
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
-#endif
 #endif
 
 #ifdef G_WITH_CYGWIN

app/plug-in/plug-in-shm.c

@@ -47,9 +47,6 @@
 #ifdef G_OS_WIN32
 #include <fcntl.h>
 #include <io.h>
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
-#endif
 #endif
 
 #ifdef G_WITH_CYGWIN

app/plug-in/plug-in.c

@@ -47,9 +47,6 @@
 #ifdef G_OS_WIN32
 #include <fcntl.h>
 #include <io.h>
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
-#endif
 #endif
 
 #ifdef G_WITH_CYGWIN

app/tools/makefile.msc

@@ -72,12 +72,14 @@ OBJECTS = \
 	gimptool.obj \
 	gimptoolmodule.obj \
 	gimptransformtool.obj \
+	gimpvectortool.obj \
 	transform_options.obj \
 	paint_options.obj \
 	selection_options.obj \
 	tool_options.obj \
 	tool_manager.obj \
 	path_tool.obj \
+	tools-enums.obj \
 
 INCLUDES = \
 	-I$(top_srcdir) \

app/widgets/makefile.msc

@@ -16,15 +16,17 @@ PKG_LINK = \
 	$(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \
 	..\base\appbase-$(PKG_VER).lib \
 	..\core\appcore-$(PKG_VER).lib \
-	..\gui\appgui-$(PKG_VER).lib
+#	..\gui\appgui-$(PKG_VER).lib
 
 OBJECTS = \
+	gimpbrusheditor.obj \
 	gimpbrushfactoryview.obj \
 	gimpbrushpreview.obj \
 	gimpbufferpreview.obj \
 	gimpbufferview.obj \
 	gimpchannellistitem.obj \
 	gimpchannellistview.obj \
+	gimpcolormapeditor.obj \
 	gimpcolorpanel.obj \
 	gimpcomponentlistitem.obj \
 	gimpcontainereditor.obj \
@@ -35,6 +37,7 @@ OBJECTS = \
 	gimpcontainerview.obj \
 	gimpcontainerview-utils.obj \
 	gimpcursor.obj \
+	gimpdataeditor.obj \
 	gimpdatafactoryview.obj \
 	gimpdialogfactory.obj \
 	gimpdeviceinfo.obj \
@@ -47,29 +50,41 @@ OBJECTS = \
 	gimpdrawablelistitem.obj \
 	gimpdrawablelistview.obj \
 	gimpdrawablepreview.obj \
+	gimpeditor.obj \
+	gimpenummenu.obj \
 	gimpfontselection.obj \
 	gimpfontselection-dialog.obj \
+	gimpgradienteditor.obj \
 	gimpgradientpreview.obj \
 	gimphistogramview.obj \
 	gimpimagedock.obj \
 	gimpimagefilepreview.obj \
 	gimpimagepreview.obj \
 	gimpitemfactory.obj \
+	gimpitemlistitem.obj \
+	gimpitemlistview.obj \
 	gimplayerlistitem.obj \
 	gimplayerlistview.obj \
 	gimplistitem.obj \
 	gimpmenuitem.obj \
 	gimpnavigationpreview.obj \
+	gimppaletteeditor.obj \
 	gimppalettepreview.obj \
 	gimppatternpreview.obj \
 	gimppreview.obj \
+	gimppreview-utils.obj \
+	gimptoolbox.obj \
+	gimptoolbox-color-area.obj \
+	gimptoolbox-indicator-area.obj \
 	gimptoolinfopreview.obj \
+	gimpvectorslistview.obj \
 	gimpwidgets-constructors.obj \
 	gimpwidgets-utils.obj \
 	gtkwrapbox.obj \
 	gtkhwrapbox.obj \
 	gtkvwrapbox.obj \
-	gimpconstrainedhwrapbox.obj \
+	widgets-enums.obj \
+#	gimpconstrainedhwrapbox.obj \
 
 INCLUDES = \
 	-I$(top_srcdir) \

config.h.win32

@@ -1,4 +1,5 @@
 /* config.h.win32. Hand-generated */
+#define GETTEXT_PACKAGE "gimp14"
 
 /* Define if using alloca.c.  */
 /* #undef C_ALLOCA */

libgimp/gimp.def

@@ -126,12 +126,12 @@ EXPORTS
 	gimp_gimprc_query
 	gimp_gimprc_set
 	gimp_gradients_close_popup
-	gimp_gradients_get_active
+	gimp_gradients_get_gradient
 	gimp_gradients_get_gradient_data
 	gimp_gradients_get_list
 	gimp_gradients_sample_custom
 	gimp_gradients_sample_uniform
-	gimp_gradients_set_active
+	gimp_gradients_set_gradient
 	gimp_gradients_set_popup
 	gimp_help
 	gimp_image_add_channel

libgimpconfig/gimpconfig-serialize.c

@@ -29,6 +29,10 @@
 
 #include <glib-object.h>
 
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
+
 #include "gimpconfig.h"
 #include "gimpconfig-serialize.h"
 #include "gimpconfig-types.h"

libgimpwidgets/gimpwidgets.def

@@ -48,6 +48,7 @@ EXPORTS
 	gimp_option_menu_new
 	gimp_option_menu_new2
 	gimp_option_menu_set_history
+	gimp_option_menu_set_sensitive
 	gimp_palette_get_background
 	gimp_palette_get_foreground
 	gimp_path_editor_get_path

makefile.msc

@@ -2,7 +2,7 @@ TOP = ..
 PRJ_TOP = .
 PACKAGE = gimp
 PKG_VER = 1.3
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE $(TOP)\glib\build\win32\make.msc
 
 # in required build order
 SUBDIRS = libgimpbase libgimpcolor libgimpmath libgimpwidgets libgimp \
@@ -21,8 +21,14 @@ clean :: sub-clean
 sub-clean:
 	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=clean
 
+sub-themes:
+	cd themes\Default\images
+	nmake -nologo -f makefile.msc
+	cd ....
+
 all : \
 	$(PRJ_TOP)\config.h \
+	sub-themes \
 	sub-all
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32

modules/makefile.msc

@@ -12,21 +12,24 @@ TOP = ..\..
 
 # Nothing much configurable below
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE $(TOP)\glib\build\win32\make.msc
 
 GIMP_VER = 1.3
 
-INCLUDES = -I.. 
+INCLUDES = \
+	-FImsvc_recommended_pragmas.h \
+	-I.. 
+
 DEFINES = -DHAVE_CONFIG_H -DMODULE_COMPILATION 
-DEPCFLAGS = $(INTL_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) 
-DEPLIBS = $(INTL_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+DEPCFLAGS = $(INTL_CFLAGS) $(GLIB_CFLAGS) $(GTK2_CFLAGS) 
+DEPLIBS = $(INTL_LIBS) $(GLIB_LIBS) $(GTK2_LIBS)
 
 BIN = $(GIMP)\modules
 
 MODULES = \
-	colorsel_gtk-$(GIMP_VER).dll \
+#	colorsel_gtk-$(GIMP_VER).dll \
 	colorsel_triangle-$(GIMP_VER).dll \
-	colorsel_water-$(GIMP_VER).dll \
+#	colorsel_water-$(GIMP_VER).dll \
 	cdisplay_gamma-$(GIMP_VER).dll \
 	cdisplay_highcontrast-$(GIMP_VER).dll
 
@@ -61,10 +64,14 @@ colorsel_water-$(GIMP_VER).dll : colorsel_water.obj module.def
 
 cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.obj module.def
 	$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_gamma.obj $(LDFLAGS) ..\app\gimp.lib \
+	..\libgimpbase\gimpbase-$(GIMP_VER).lib \
+	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
 	$(DEPLIBS) /def:module.def
 
 cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.obj module.def
 	$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_highcontrast.obj $(LDFLAGS) ..\app\gimp.lib \
+	..\libgimpbase\gimpbase-$(GIMP_VER).lib \
+	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
 	$(DEPLIBS) /def:module.def
 
 # General rule for building 

plug-ins/gap/gap_arr_dialog.c

@@ -57,6 +57,8 @@
  *                                   (re-implementation of gap_sld_dialog.c)
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

plug-ins/makefile.msc

@@ -580,7 +580,7 @@ RTL = -MDd
 CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200
 
 CFLAGS = -DHAVE_CONFIG_H $(EXTRACFLAGS) \
-	-DGETTEXT_PACKAGE=\"libgimp14\" -DLOCALEDIR=\"?\" \
+	-DLOCALEDIR=\"?\" \
 	-I. -I$(GIMPTOP) -I$(PLUGINDIR) $(GTK2_CFLAGS) $(INTL_CFLAGS)
 
 LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)