updated include <string.h> for memcmp() include <string.h> for strcmp()

2008-10-03 Hans Breuer <hans@breuer.org> * **/makefie.msc gimpdefs.msc app/gimpcore.def : updated * app/core/gimpcurve.c : include <string.h> for memcmp() * app/gegl/gimpcurvesconfig.c : include <string.h> for strcmp() svn path=/trunk/; revision=27118
2008-10-03 19:27:54 +00:00 · 2008-10-03 19:27:54 +00:00 · d94419a9fd
parent 632b8d3fba
commit d94419a9fd
27 changed files with 397 additions and 258 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+2008-10-03  Hans Breuer  <hans@breuer.org>
+
+	* **/makefie.msc gimpdefs.msc app/gimpcore.def : updated
+	* app/core/gimpcurve.c : include <string.h> for memcmp()
+	* app/gegl/gimpcurvesconfig.c : include <string.h> for strcmp()
+
 2008-10-03  Sven Neumann  <sven@gimp.org>

 	* app/display/gimpdisplayshell-scale.c
--- a/app/actions/makefile.msc
+++ b/app/actions/makefile.msc
@ -11,6 +11,7 @@ INCLUDES = \
 	-I$(PRJ_TOP) \
 	-I$(PRJ_TOP)/app \
 	$(GTK2_CFLAGS) \
+	$(GEGL_CFLAGS)

 DEFINES = \
 	-DGIMP_COMPILATION \
@ -35,6 +36,8 @@ OBJECTS = \
 	context-commands.obj \
 	colormap-actions.obj \
 	colormap-commands.obj \
+	config-actions.obj \
+	config-commands.obj \
 	cursor-info-actions.obj \
 	cursor-info-commands.obj \
 	data-commands.obj \
@ -98,6 +101,8 @@ OBJECTS = \
 	view-commands.obj \
 	window-actions.obj \
 	window-commands.obj \
+	windows-actions.obj \
+	windows-commands.obj \


 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
--- a/app/base/makefile.msc
+++ b/app/base/makefile.msc
@ -25,6 +25,7 @@ OBJECTS = \
 	colorize.obj \
 	cpercep.obj \
 	curves.obj \
+	desaturate.obj \
 	gimphistogram.obj \
 	gimplut.obj \
 	hue-saturation.obj \
--- a/app/config/makefile.msc
+++ b/app/config/makefile.msc
@ -49,7 +49,8 @@ INCLUDES = \
 #	-DG_DISABLE_CAST_CHECKS

 DEFINES = \
-	-DG_LOG_DOMAIN=\"Gimp-Config\"
+	-DG_LOG_DOMAIN=\"Gimp-Config\" \
+	$(GIMP_VERSION_DEFINES)

 all : \
 	$(PRJ_TOP)\config.h \
--- a/app/core/gimpcurve.c
+++ b/app/core/gimpcurve.c
@ -19,6 +19,7 @@
 #include "config.h"

 #include <stdlib.h>
+#include <string.h> /* memcmp */

 #include <glib-object.h>

--- a/app/core/makefile.msc
+++ b/app/core/makefile.msc
@ -33,7 +33,7 @@ PKG_LINK = \
 OBJECTS = \
 	core-enums.obj \
 	gimp-contexts.obj \
-	gimp-documents.obj \
+#	gimp-documents.obj \
 	gimp-edit.obj \
 	gimp-gradients.obj \
 	gimp-gui.obj \
@ -174,6 +174,18 @@ OBJECTS = \
 	gimpundostack.obj \
 	gimpunit.obj \
 	gimpviewable.obj \
+	gimpcurve-map.obj \
+	gimpdrawable-brightness-contrast.obj \
+	gimpdrawable-color-balance.obj \
+	gimpdrawable-colorize.obj \
+	gimpdrawable-curves.obj \
+	gimpdrawable-hue-saturation.obj \
+	gimpdrawable-posterize.obj \
+	gimpdrawable-process.obj \
+	gimpdrawable-shadow.obj \
+	gimpdrawable-threshold.obj \
+	gimpimagemapconfig.obj \
+	gimptagged.obj \

 OTHER_FILES = \
 	\
@ -197,8 +209,8 @@ INCLUDES = \

 DEFINES = \
 	-DGIMP_COMPILATION \
-	-DGIMP_APP_VERSION=\"2.4\" \
-	-DG_LOG_DOMAIN=\"Gimp-Core\"
+	-DG_LOG_DOMAIN=\"Gimp-Core\" \
+	$(GIMP_VERSION_DEFINES)

 all : \
 	$(PRJ_TOP)\config.h \
--- a/app/dialogs/makefile.msc
+++ b/app/dialogs/makefile.msc
@ -27,7 +27,6 @@ OBJECTS = \
 	about-dialog.obj \
 	channel-options-dialog.obj \
 	convert-dialog.obj \
-	desaturate-dialog.obj \
 	dialogs-constructors.obj \
 	dialogs.obj \
 	fade-dialog.obj \
--- a/app/display/makefile.msc
+++ b/app/display/makefile.msc
@ -13,7 +13,8 @@ INCLUDES = \
 	-FImsvc_recommended_pragmas.h \
 	-I$(PRJ_TOP) \
 	-I$(PRJ_TOP)/app \
-	$(GTK2_CFLAGS)
+	$(GTK2_CFLAGS) \
+	$(GEGL_CFLAGS)

 DEFINES = \
 	-DG_LOG_DOMAIN=\"Gimp-Display\"
@ -52,6 +53,8 @@ OBJECTS = \
 	gimpnavigationeditor.obj \
 	gimpscalecombobox.obj \
 	gimpstatusbar.obj \
+	gimpdisplayshell-icon.obj \
+	gimpdisplayshell-scale-dialog.obj \
 #	display-enums.obj \

 all : \
--- a/app/gegl/gimpcurvesconfig.c
+++ b/app/gegl/gimpcurvesconfig.c
@ -21,6 +21,8 @@

 #include "config.h"

+#include <string.h>
+
 #include <gegl.h>
 #include <glib/gstdio.h>

--- a/app/gegl/makefile.msc
+++ b/app/gegl/makefile.msc
@ -27,7 +27,21 @@ OBJECTS = \
 	gimpoperationposterize.obj \
 	gimpoperationthreshold.obj \
 	gimpoperationtilesink.obj \
-	gimpoperationtilesource.obj
+	gimpoperationtilesource.obj \
+	gimpbrightnesscontrastconfig.obj \
+	gimpcolorbalanceconfig.obj \
+	gimpcolorizeconfig.obj \
+	gimpcurvesconfig.obj \
+	gimpdesaturateconfig.obj \
+	gimphuesaturationconfig.obj \
+	gimplevelsconfig.obj \
+	gimpoperationcolorbalance.obj \
+	gimpoperationcurves.obj \
+	gimpoperationhuesaturation.obj \
+	gimpoperationlevels.obj \
+	gimpoperationpointfilter.obj \
+	gimpposterizeconfig.obj \
+	gimpthresholdconfig.obj \

 INCLUDES = \
 	-FImsvc_recommended_pragmas.h \
@ -38,8 +52,8 @@ INCLUDES = \

 DEFINES = \
 	-DGIMP_COMPILATION \
-	-DGIMP_APP_VERSION=\"2.4\" \
-	-DG_LOG_DOMAIN=\"Gimp-Gegl\"
+	-DG_LOG_DOMAIN=\"Gimp-Gegl\" \
+	$(GIMP_VERSION_DEFINES)

 all : \
 	$(PRJ_TOP)\config.h \
--- a/app/gimpcore.def
+++ b/app/gimpcore.def
@ -19,7 +19,6 @@ EXPORTS
 	color_balance
 	color_balance_create_lookup_tables
 	color_balance_init
-	color_balance_range_reset
 	colorize
 	colorize_calculate
 	colorize_init
@ -257,7 +256,6 @@ EXPORTS
 	gimp_help
 	gimp_histogram_calculate
 	gimp_histogram_channel_get_type
-	gimp_histogram_free
 	gimp_histogram_get_count
 	gimp_histogram_get_maximum
 	gimp_histogram_get_mean
@ -520,7 +518,6 @@ EXPORTS
 	gimp_rectangle_intersect
 	gimp_repeat_mode_get_type
 	gimp_restore
-	gimp_scan_convert_add_points
 	gimp_scan_convert_free
 	gimp_scan_convert_new
 	gimp_scan_convert_render
@ -616,10 +613,6 @@ EXPORTS
 	hue_saturation
 	hue_saturation_calculate_transfers
 	hue_saturation_init
-	hue_saturation_partition_reset
-	levels_adjust_by_colors
-	levels_calculate_transfers
-	levels_channel_reset
 	levels_init
 	levels_lut_func
 	pixel_region_init
@ -685,7 +678,6 @@ gimp_progress_set_value
 gimp_progress_start
 gimp_stroke_desc_new
 gimp_view_size_get_type
-levels_stretch
 gimp_templates_migrate
 file_utils_filename_from_uri
 gimp_drawable_get_sub_preview
@ -710,13 +702,11 @@ gimp_data_factory_data_refresh
 gimp_layer_new_from_pixbuf
 gimp_viewable_get_new_pixbuf
 gimp_viewable_get_size
-gimp_documents_save
 gimp_container_clear
 gimp_dash_pattern_free
 gimp_dash_pattern_new_from_preset
 gimp_dash_pattern_copy
 gimp_dash_pattern_new_from_segments
-gimp_stroke_options_set_dash_pattern
 boundary_find
 boundary_sort
 gimp_contexts_clear
@ -930,3 +920,65 @@ gimp_gegl_init
 gimp_image_get_guides
 gimp_image_get_sample_points
 gimp_plug_in_manager_get_menu_branches
+desaturate_region
+file_utils_filename_is_uri
+get_pid
+gimp_brightness_contrast_config_get_type
+gimp_brightness_contrast_config_set_node
+gimp_brightness_contrast_config_to_levels_config
+gimp_buffer_get_tiles
+gimp_color_balance_config_get_type
+gimp_color_balance_config_reset_range
+gimp_color_balance_config_to_cruft
+gimp_colorize_config_get_type
+gimp_colorize_config_to_cruft
+gimp_container_get_first_child
+gimp_context_display_changed
+gimp_curve_get_curve_type
+gimp_curve_get_n_points
+gimp_curve_get_n_samples
+gimp_curve_get_point
+gimp_curve_map_value
+gimp_curves_config_get_type
+gimp_curves_config_load_cruft
+gimp_curves_config_save_cruft
+gimp_curves_config_to_cruft
+gimp_desaturate_config_get_type
+gimp_display_options_no_image_get_type
+gimp_histogram_duplicate
+gimp_histogram_ref
+gimp_histogram_unref
+gimp_hue_saturation_config_get_type
+gimp_hue_saturation_config_reset_range
+gimp_hue_saturation_config_to_cruft
+gimp_image_get_projection
+gimp_image_map_config_compare
+gimp_image_map_config_get_type
+gimp_imagefile_set_mime_type
+gimp_is_restored
+gimp_item_is_attached
+gimp_layer_new_from_tiles
+gimp_levels_config_adjust_by_colors
+gimp_levels_config_get_type
+gimp_levels_config_load_cruft
+gimp_levels_config_reset_channel
+gimp_levels_config_save_cruft
+gimp_levels_config_stretch
+gimp_levels_config_to_cruft
+gimp_levels_config_to_curves_config
+gimp_list_set_sort_func
+gimp_marshal_BOOLEAN__STRING
+gimp_marshal_VOID__DOUBLE
+gimp_marshal_VOID__DOUBLE_DOUBLE_DOUBLE_DOUBLE
+gimp_operation_hue_saturation_map
+gimp_operation_levels_map_input
+gimp_perspective_clone_set_transform
+gimp_posterize_config_get_type
+gimp_recent_list_load
+gimp_scan_convert_compose_value
+gimp_stroke_options_take_dash_pattern
+gimp_threshold_config_get_type
+gimp_threshold_config_to_cruft
+gimp_tool_info_build_options_filename
+gimp_use_gegl
+gimp_vectors_make_bezier
--- a/app/gui/makefile.msc
+++ b/app/gui/makefile.msc
@ -35,6 +35,8 @@ OBJECTS = \
 	session.obj \
 	splash.obj \
 	themes.obj \
+	gimpdbusservice.obj \
+	gui-unique.obj \

 INCLUDES = \
 	-FImsvc_recommended_pragmas.h \
--- a/app/makefile.msc
+++ b/app/makefile.msc
@ -16,7 +16,7 @@ LT_RELEASE = $(PKG_VER)

 SUBDIRS = composite paint-funcs base config xcf core file text \
 	dialogs display paint vectors pdb plug-in tools widgets gui \
-	actions menus
+	actions menus gegl

 sub-all: 
 	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
@ -101,7 +101,9 @@ OBJECTS = \
 	batch.obj \
 	errors.obj \
 	sanity.obj \
+	unique.obj \
 	units.obj \
+	version.obj \
 	\
 	actions/appactions.lib \
 	menus/appmenus.lib \
--- a/app/menus/makefile.msc
+++ b/app/menus/makefile.msc
@ -29,9 +29,10 @@ OBJECTS = \
 	image-menu.obj \
 	menus.obj \
 	plug-in-menus.obj \
-	toolbox-menu.obj \
+#	toolbox-menu.obj \
 	tool-options-menu.obj \
 	window-menu.obj \
+	windows-menu.obj \

 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
--- a/app/pdb/makefile.msc
+++ b/app/pdb/makefile.msc
@ -28,56 +28,57 @@ PKG_LINK = \
 	

 OBJECTS_UI = \
-	brush_select_cmds.obj \
-	gradient_select_cmds.obj \
-	palette_select_cmds.obj \
-	pattern_select_cmds.obj \
+	brush-select-cmds.obj \
+	gradient-select-cmds.obj \
+	palette-select-cmds.obj \
+	pattern-select-cmds.obj \

 OBJECTS = \
 	$(OBJECTS_UI) \
-	internal_procs.obj \
-	brush_cmds.obj \
-	brushes_cmds.obj \
-	buffer_cmds.obj \
-	channel_cmds.obj \
-	color_cmds.obj \
-	context_cmds.obj \
-	convert_cmds.obj \
-	display_cmds.obj \
-	drawable_cmds.obj \
-	drawable_transform_cmds.obj \
-	edit_cmds.obj \
-	fileops_cmds.obj \
-	floating_sel_cmds.obj \
-	fonts_cmds.obj \
-	font_select_cmds.obj \
-	gimprc_cmds.obj \
-	gradient_cmds.obj \
-	gradients_cmds.obj \
-	grid_cmds.obj \
-	guides_cmds.obj \
-	help_cmds.obj \
-	image_cmds.obj \
-	layer_cmds.obj \
-	message_cmds.obj \
-	misc_cmds.obj \
-	paint_tools_cmds.obj \
-	palette_cmds.obj \
-	palettes_cmds.obj \
-	parasite_cmds.obj \
-	paths_cmds.obj \
-	pattern_cmds.obj \
-	patterns_cmds.obj \
-	plug_in_cmds.obj \
-	procedural_db_cmds.obj \
-	progress_cmds.obj \
-	selection_cmds.obj \
-	selection_tools_cmds.obj \
-	text_tool_cmds.obj \
-	transform_tools_cmds.obj \
-	undo_cmds.obj \
-	unit_cmds.obj \
-	vectors_cmds.obj \
+	internal-procs.obj \
+	brush-cmds.obj \
+	brushes-cmds.obj \
+	buffer-cmds.obj \
+	channel-cmds.obj \
+	color-cmds.obj \
+	context-cmds.obj \
+	convert-cmds.obj \
+	display-cmds.obj \
+	drawable-cmds.obj \
+	drawable-transform-cmds.obj \
+	edit-cmds.obj \
+	fileops-cmds.obj \
+	floating-sel-cmds.obj \
+	fonts-cmds.obj \
+	font-select-cmds.obj \
+	gimprc-cmds.obj \
+	gradient-cmds.obj \
+	gradients-cmds.obj \
+	grid-cmds.obj \
+	guides-cmds.obj \
+	help-cmds.obj \
+	image-cmds.obj \
+	layer-cmds.obj \
+	message-cmds.obj \
+	misc-cmds.obj \
+	paint-tools-cmds.obj \
+	palette-cmds.obj \
+	palettes-cmds.obj \
+	parasite-cmds.obj \
+	paths-cmds.obj \
+	pattern-cmds.obj \
+	patterns-cmds.obj \
+	plug-in-cmds.obj \
+	procedural-db-cmds.obj \
+	progress-cmds.obj \
+	selection-cmds.obj \
+	selection-tools-cmds.obj \
+	text-layer-cmds.obj \
+	text-tool-cmds.obj \
+	transform-tools-cmds.obj \
+	undo-cmds.obj \
+	unit-cmds.obj \
+	vectors-cmds.obj \
 	\
 	gimppdb.obj \
 	gimppdb-utils.obj \
--- a/app/tools/makefile.msc
+++ b/app/tools/makefile.msc
@ -108,6 +108,11 @@ OBJECTS = \
 	gimp-tools.obj \
 	tools-enums.obj \
 	tools-utils.obj \
+	gimpdesaturatetool.obj \
+	gimpgegltool.obj \
+	gimpimagemaptool-settings.obj \
+	gimpiscissorsoptions.obj \
+	gimpregionselectoptions.obj \

 INCLUDES = \
 	-FImsvc_recommended_pragmas.h \
--- a/app/widgets/makefile.msc
+++ b/app/widgets/makefile.msc
@ -178,12 +178,24 @@ OBJECTS = \
 	gtkhwrapbox.obj \
 	gtkvwrapbox.obj \
 	gtkwrapbox.obj \
+	gimpactioneditor.obj \
+	gimpcairo-wilber.obj \
+	gimplanguageentry.obj \
+	gimplanguagestore-parser.obj \
+	gimplanguagestore.obj \
+	gimpradioaction.obj \
+	gimpscalebutton.obj \
+	gimpsettingsbox.obj \
+	gimpsettingseditor.obj \
+	gimptoggleaction.obj \
+	gimpwindow.obj \
+	gtkscalebutton.obj \
 #	widgets-enums.obj \

 INCLUDES = \
 	-FImsvc_recommended_pragmas.h \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/app \
+	-I $(PRJ_TOP) \
+	-I $(PRJ_TOP)/app \
 	$(GTK2_CFLAGS) \
 	-I$(includedir)

--- a/cursors/makefile.msc
+++ b/cursors/makefile.msc
@ -60,6 +60,7 @@ CURSOR_LIST = \
 	tool_paths_segment	tool-paths-segment.png \
 	tool_pencil		tool-pencil.png \
 	tool_perspective		tool-perspective.png \
+	tool_polygon_select	tool-polygon-select.png \
 	tool_rect_select		tool-rect-select.png \
 	tool_resize		tool-resize.png \
 	tool_rotate		tool-rotate.png \
--- a/gimpdefs.msc
+++ b/gimpdefs.msc
@ -9,6 +9,14 @@ GIMPDIR = _gimp$(GIMP_VER)
 # don't interfer with stable version
 GIMPDIR = _gimp-2.5

+GIMP_VERSION_DEFINES = \
+	-DGIMP_PACKAGE=\"gimp-2.6\" \
+	-DGIMP_DATA_VERSION=\"2.6\" \
+	-DGIMP_PLUGIN_VERSION=\"2.6\" \
+	-DGIMP_SYSCONF_VERSION=\"2.6\" \
+	-DGIMP_APP_VERSION=\"2.6\" \
+	-DGIMP_APP_VERSION_STRING=\"2.6\"
+
 # Build app/* as DLLs; don't define this, it doesn't work yet.
 #DLLGIMP = 1 

--- a/libgimp/makefile.msc
+++ b/libgimp/makefile.msc
@ -77,6 +77,7 @@ PDB_WRAPPERS_O = \
 	gimpprogress_pdb.obj \
 	gimpselection_pdb.obj \
 	gimpselectiontools_pdb.obj \
+	gimptextlayer_pdb.obj \
 	gimptexttool_pdb.obj \
 	gimptransformtools_pdb.obj \
 	gimpundo_pdb.obj \
--- a/libgimpbase/makefile.msc
+++ b/libgimpbase/makefile.msc
@ -10,10 +10,7 @@ PKG_VER = $(GIMP_VER)

 DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DDATADIR=\"\" -DSYSCONFDIR=\"\" \
 	-DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\" \
-	-DGIMP_PACKAGE=\"gimp-2.4\" \
-	-DGIMP_DATA_VERSION=\"2.4\" \
-	-DGIMP_PLUGIN_VERSION=\"2.4\" \
-	-DGIMP_SYSCONF_VERSION=\"2.4\" \
+	$(GIMP_VERSION_DEFINES)

 top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
--- a/libgimpwidgets/makefile.msc
+++ b/libgimpwidgets/makefile.msc
@ -77,6 +77,8 @@ OBJECTS = \
 	gimpscrolledpreview.obj \
 	gimpstringcombobox.obj \
 	gimpquerybox.obj \
+	gimpruler.obj \
+	gimpscaleentry.obj \
 	gimpsizeentry.obj \
 	gimpstock.obj \
 	gimpunitmenu.obj \
--- a/makefile.msc
+++ b/makefile.msc
@ -16,12 +16,12 @@ SUBDIRS = \
 	libgimpthumb \
 	libgimpwidgets \
 	libgimp \
-#	libgimptool \
 	libgimpmodule \
 	cursors \
 	app \
 #	plug-ins \
-	modules
+	modules \
+	menus

 sub-all: 
 	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
--- a/menus/makefile.msc
+++ b/menus/makefile.msc
@ -4,12 +4,11 @@ XSLTPROC = xsltproc

 menudata_in_files = \
 	dockable-menu.xml.in	\
-	image-menu.xml.in	\
-	toolbox-menu.xml.in
+	image-menu.xml.in

 menudata_built_files = $(menudata_in_files:.xml.in=.xml)

-MENUS = dockable image toolbox
+MENUS = dockable image

 _MENUS = \
 	brushes buffers channels colormap-editor documents \
--- a/modules/makefile.msc
+++ b/modules/makefile.msc
@ -21,15 +21,15 @@ DEPLIBS = $(INTL_LIBS) $(GLIB_LIBS) $(GTK2_LIBS)
 BIN = $(GIMP)\modules

 MODULES = \
-	colorsel_triangle-$(GIMP_VER).dll \
-	colorsel_water-$(GIMP_VER).dll \
-	colorsel_cmyk-$(GIMP_VER).dll \
-	cdisplay_colorblind-$(GIMP_VER).dll \
-	cdisplay_gamma-$(GIMP_VER).dll \
-	cdisplay_highcontrast-$(GIMP_VER).dll \
+	color-selector-water-$(GIMP_VER).dll \
+	color-selector-wheel-$(GIMP_VER).dll \
+	color-selector-cmyk-$(GIMP_VER).dll \
+	display-filter-color-blind-$(GIMP_VER).dll \
+	display-filter-gamma-$(GIMP_VER).dll \
+	display-filter-high-contrast-$(GIMP_VER).dll \
 !IFDEF LCMS_CFLAGS
-	cdisplay_lcms-$(GIMP_VER).dll \
-	cdisplay_proof-$(GIMP_VER).dll \
+	display-filter-lcms-$(GIMP_VER).dll \
+	display-filter-proof-$(GIMP_VER).dll \
 !ENDIF


@ -42,54 +42,60 @@ install : all
 ..\config.h : ..\config.h.win32
 	copy ..\config.h.win32 ..\config.h

-colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.obj
-	$(CC) $(CFLAGS) -LD -Fe$@ colorsel_triangle.obj $(LDFLAGS) \
+color-selector-triangle-$(GIMP_VER).dll : color-selector-triangle.obj
+	$(CC) $(CFLAGS) -LD -Fe$@ color-selector-triangle.obj $(LDFLAGS) \
 	..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
 	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
 	..\libgimpmodule\gimpmodule-$(GIMP_VER).lib \
 	$(DEPLIBS)

-colorsel_water-$(GIMP_VER).dll : colorsel_water.obj
-	$(CC) $(CFLAGS) -LD -Fe$@ colorsel_water.obj $(LDFLAGS) \
+color-selector-water-$(GIMP_VER).dll : color-selector-water.obj
+	$(CC) $(CFLAGS) -LD -Fe$@ color-selector-water.obj $(LDFLAGS) \
 	..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
 	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
 	$(DEPLIBS)

-colorsel_cmyk-$(GIMP_VER).dll : colorsel_cmyk.obj
-	$(CC) $(CFLAGS) -LD -Fe$@ colorsel_cmyk.obj $(LDFLAGS) \
+color-selector-wheel-$(GIMP_VER).dll : color-selector-wheel.obj
+	$(CC) $(CFLAGS) -LD -Fe$@ color-selector-wheel.obj $(LDFLAGS) \
 	..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
 	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
 	$(DEPLIBS)

-cdisplay_colorblind-$(GIMP_VER).dll : cdisplay_colorblind.obj
-	$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_colorblind.obj $(LDFLAGS) \
+color-selector-cmyk-$(GIMP_VER).dll : color-selector-cmyk.obj
+	$(CC) $(CFLAGS) -LD -Fe$@ color-selector-cmyk.obj $(LDFLAGS) \
+	..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
+	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
+	$(DEPLIBS)
+
+display-filter-color-blind-$(GIMP_VER).dll : display-filter-color-blind.obj
+	$(CC) $(CFLAGS) -LD -Fe$@ display-filter-color-blind.obj $(LDFLAGS) \
 	..\libgimpbase\gimpbase-$(GIMP_VER).lib \
 	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
 	..\libgimpmodule\gimpmodule-$(GIMP_VER).lib \
 	$(DEPLIBS)

-cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.obj
-	$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_gamma.obj $(LDFLAGS) \
+display-filter-gamma-$(GIMP_VER).dll : display-filter-gamma.obj
+	$(CC) $(CFLAGS) -LD -Fe$@ display-filter-gamma.obj $(LDFLAGS) \
 	..\libgimpbase\gimpbase-$(GIMP_VER).lib \
 	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
 	$(DEPLIBS)

-cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.obj
-	$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_highcontrast.obj $(LDFLAGS) \
+display-filter-high-contrast-$(GIMP_VER).dll : display-filter-high-contrast.obj
+	$(CC) $(CFLAGS) -LD -Fe$@ display-filter-high-contrast.obj $(LDFLAGS) \
 	..\libgimpbase\gimpbase-$(GIMP_VER).lib \
 	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
 	$(DEPLIBS)

-cdisplay_lcms-$(GIMP_VER).dll : cdisplay_lcms.obj
-	$(CC) $(CFLAGS) $(LCMS_CFLAGS) -LD -Fe$@ cdisplay_lcms.obj $(LDFLAGS) \
+display-filter-lcms-$(GIMP_VER).dll : display-filter-lcms.obj
+	$(CC) $(CFLAGS) $(LCMS_CFLAGS) -LD -Fe$@ display-filter-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) user32.lib gdi32.lib

-cdisplay_proof-$(GIMP_VER).dll : cdisplay_proof.obj
-	$(CC) $(CFLAGS) $(LCMS_CFLAGS) -LD -Fe$@ cdisplay_proof.obj $(LDFLAGS) \
+display-filter-proof-$(GIMP_VER).dll : display-filter-proof.obj
+	$(CC) $(CFLAGS) $(LCMS_CFLAGS) -LD -Fe$@ display-filter-proof.obj $(LDFLAGS) \
 	..\libgimpbase\gimpbase-$(GIMP_VER).lib \
 	..\libgimpconfig\gimpconfig-$(GIMP_VER).lib \
 	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
--- a/plug-ins/makefile.msc
+++ b/plug-ins/makefile.msc
@ -32,24 +32,25 @@ 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
-COMMON0 = plugin_browser procedure_browser #gnomeprint
-COMMON1 = antialias AlienMap2 ccanalyze CEL channel_mixer CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch cartoon checkerboard color_enhance colorify colormap_remap colortoalpha compose compressor convmatrix csource cubism curve_bend
-COMMON2 = decompose deinterlace depthmerge despeckle destripe dicom diffraction displace dog edge emboss engrave exchange film flarefx fp fractaltrace
-COMMON3 = gauss gbr gee gee_zoom gif_load gif_save gih glasstile glob gqbist gradmap grid gtm guillotine header hot illusion iwarp jigsaw laplace lcms lens lic
-COMMON4 = mapcolor max_rgb mblur mosaic neon newsprint nlfilt noisify normalize nova oilify papertile pat pcx photocopy pix pixelize plasma png pnm polar postscript psd_load psd_save psp randomize raw redeye retinex ripple rotate
-COMMON5 = sample_colorize scatter_hsv screenshot sel_gauss semiflatten sharpen shift sinus smooth_palette snoise sobel softglow sparkle spheredesigner spread struc sunras svg tga threshold_alpha 
-COMMON6 = tiff_load tiff_save tile tileit tiler uniteditor unsharp video vinvert vpropagate warp waves webbrowser whirlpinch wind xbm xwd zealouscrop
-COMMON7 = winprint winclipboard wiredebug 
-
-NOTNOW = wmf 
+COMMON0 = alien-map align-layers animation-optimize animation-play antialias apply-canvas 
+COMMON1 = blinds blur-gauss-selective blur-gauss blur-motion blur border-average bump-map 
+COMMON2 = cartoon channel-mixer checkerboard cml-explorer color-cube-analyze color-enhance color-exchange color-to-alpha colorify colormap-remap compose contrast-normalize contrast-retinex contrast-stretch-hsv contrast-stretch convolution-matrix crop-auto crop-zealous cubism curve-bend 
+COMMON3 = decompose deinterlace depth-merge despeckle destripe diffraction displace edge-dog edge-laplace edge-neon edge-sobel edge emboss engrave 
+## file-aa file-mng file-pdf file-wmf file-xpm 
+COMMON4 = file-cel file-compressor file-csource file-desktop-link file-dicom file-gbr file-gif-load file-gif-save file-gih file-glob file-header file-html-table file-pat file-pcx file-pix file-png file-pnm file-ps file-psp file-raw file-sunras file-svg file-tga file-tiff-load file-tiff-save file-xbm file-xwd film filter-pack fractal-trace 
+## mail 
+COMMON5 = gee-zoom gee gradient-map grid guillotine hot illusion iwarp jigsaw lcms lens-apply lens-distortion lens-flare max-rgb mosaic newsprint nl-filter noise-hsv noise-randomize noise-rgb noise-solid noise-spread nova oilify photocopy pixelize plasma plugin-browser polar-coords procedure-browser qbist red-eye-removal ripple rotate 
+COMMON6 = sample-colorize screenshot semi-flatten sharpen shift sinus smooth-palette softglow sparkle sphere-designer 
+COMMON7 = threshold-alpha tile-glass tile-paper tile-seamless tile-small tile unit-editor unsharp-mask value-invert value-propagate van-gogh-lic video warp waves web-browser whirl-pinch wind 

 # These have own subdirectories each
-SEPARATE = FractalExplorer Lighting MapObject bmp faxg3 fits flame gfig gflare gfli gimpressionist ifscompose imagemap jpeg maze metadata pagecurl rcm sel2path sgi twain winicon winsnap xjt print help helpbrowser
+SEPARATE = lighting gfig gimpressionist imagemap maze metadata pagecurl twain print help
+## help-browser 
+SEPARATE_DASH = color-rotate file-bmp file-faxg3 file-fits file-fli file-ico file-jpeg file-psd file-sgi file-uri file-xjt fractal-explorer gradient-flare ifs-compose map-object selection-to-path win-snap

 # These are unofficial, ie not in the CVS. To build these, you should
 # get tml's source snapshot and copy this makefile to the
-# ..\unofficial-plug-ins directory, go there, and do "nmake -f
-# makefile.msc unofficial".
+# ..\unofficial-plug-ins directory, go there, and do "nmake -f makefile.msc unofficial".

 UNOFFICIAL = Anamorphose DigitalSignature RGB_Displace gimp_ace guash sel_gauss magiceye user_filter

@ -81,11 +82,6 @@ sub-libs:
 	nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. EXTRACFLAGS="-DWIN32 -DUSE_MATH -DUSE_INTERFACE -DSTANDALONE=0" \
 		MODULE=tinyscheme OBJECTS="dynload.obj scheme.obj" $(TARGET)
 	cd ..\..
-	cd script-fu\re
-	nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. EXTRACFLAGS="-DWIN32 -I.. -DUSE_INTERFACE" \
-		MODULE=re OBJECTS="debug.obj regcomp.obj regerror.obj regexec.obj re.obj regfree.obj" \
-		$(TARGET)
-	cd ..\..
 	cd script-fu\ftx
 	nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. EXTRACFLAGS="-DWIN32 -I.. -DUSE_INTERFACE" \
 		MODULE=ftx OBJECTS="ftx.obj" EXTRA_EXPORT=/export:init_ftx $(TARGET)
@ -110,11 +106,11 @@ sub-common-plugins :
 	for %d in ($(COMMON4)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
 	for %d in ($(COMMON5)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
 	for %d in ($(COMMON6)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
-#	for %d in ($(COMMON7)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
+	for %d in ($(COMMON7)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)

 sub-one-common :
 	@cd common
-	@nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=$(DIR) EXTRA_$(DIR)=1 $(TARGET)
+	@nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=$(DIR) $(TARGET)



@ -130,17 +126,17 @@ separate-plugins-clean :


 sub-separate-plugins :
-# We must handle script-fu separately because of the dash, sigh
-	@cd script-fu
-	@nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=script-fu EXTRA_script_fu=1 $(TARGET)
-	@cd ..
 	for %d in ($(SEPARATE)) do nmake -nologo -f makefile.msc sub-one-separate DIR=%d TARGET=$(TARGET)
+	for %d in ($(SEPARATE_DASH)) do nmake -nologo -f makefile.msc sub-one-separate-dash DIR=%d TARGET=$(TARGET)


 sub-one-separate :
 	cd $(DIR)
 	nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=$(DIR) EXTRA_$(DIR)=1 $(TARGET)

+sub-one-separate-dash :
+	cd $(DIR)
+	nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=$(DIR) $(TARGET)

 data-install : gimpressionist-data-install guash-data-install
 	-md $(GIMP)\scripts
@ -175,13 +171,41 @@ guash-data-install :
 # If a plug-in has several object files, or needs extra libraries or
 # compiler flags, these are in an EXTRA_xxx part.

-!IFDEF EXTRA_FractalExplorer
+!IF "$(DIR)"=="color-rotate"
+STOCK_IMAGES = \
+	images/color-rotate-360.png \
+	images/color-rotate-a-b.png \
+	images/color-rotate-ccw.png \
+	images/color-rotate-cw.png \
+
+STOCK_VARS = \
+	color_rotate_360 images/color-rotate-360.png \
+	color_rotate_a_b images/color-rotate-a-b.png \
+	color_rotate_ccw images/color-rotate-ccw.png \
+	color_rotate_cw images/color-rotate-cw.png \
+
+images/color-rotate-stock-pixbufs.h: $(STOCK_IMAGES)
+	gdk-pixbuf-csource --rle --build-list $(STOCK_VARS) > images/color-rotate-stock-pixbufs.h
+
+EXTRA_DEPS = images/color-rotate-stock-pixbufs.h
+
 OBJECTS = \
-	Dialogs.obj \
-	FractalExplorer.obj
+	color-rotate-callbacks.obj \
+	color-rotate-dialog.obj \
+	color-rotate-draw.obj \
+	color-rotate-stock.obj \
+	color-rotate-utils.obj \
+	color-rotate.obj \
+
 !ENDIF

-!IFDEF EXTRA_Lighting
+!IF "$(DIR)"=="fractal-explorer"
+OBJECTS = \
+	fractal-explorer-dialogs.obj \
+	fractal-explorer.obj
+!ENDIF
+
+!IFDEF EXTRA_lighting
 STOCK_VARS = \
 	stock_intensity_ambient_high images/stock-intensity-ambient-high.png	\
 	stock_intensity_ambient_low images/stock-intensity-ambient-low.png		\
@ -212,47 +236,32 @@ images/stock-pixbufs.h: $(STOCK_IMAGES)
 EXTRA_DEPS = images/stock-pixbufs.h

 OBJECTS = \
-	lighting_apply.obj \
-	lighting_image.obj \
-	lighting_main.obj \
-	lighting_preview.obj \
-	lighting_shade.obj \
-	lighting_stock.obj \
-	lighting_ui.obj
+	lighting-apply.obj \
+	lighting-image.obj \
+	lighting-main.obj \
+	lighting-preview.obj \
+	lighting-shade.obj \
+	lighting-stock.obj \
+	lighting-ui.obj
 !ENDIF

-!IFDEF EXTRA_MapObject
+!IF "$(DIR)"=="map-object"
 OBJECTS = \
 	arcball.obj \
-	mapobject_apply.obj \
-	mapobject_image.obj \
-	mapobject_main.obj \
-	mapobject_preview.obj \
-	mapobject_shade.obj \
-	mapobject_ui.obj
+	map-object-apply.obj \
+	map-object-image.obj \
+	map-object-main.obj \
+	map-object-preview.obj \
+	map-object-shade.obj \
+	map-object-ui.obj
 OPTIMIZE =
 !ENDIF

-!IFDEF EXTRA_bmp
+!IF "$(DIR)"=="file-bmp"
 OBJECTS = \
 	bmp.obj \
-	bmpread.obj \
-	bmpwrite.obj
-!ENDIF
-
-!IFDEF EXTRA_colormap_remap 
-OBJECTS = \
-	colormap-remap.obj
-!ENDIF
-
-!IFDEF EXTRA_plugin_browser
-OBJECTS = \
-	plugin-browser.obj
-!ENDIF
-
-!IFDEF EXTRA_procedure_browser
-OBJECTS = \
-	procedure-browser.obj
+	bmp-read.obj \
+	bmp-write.obj
 !ENDIF

 !IFDEF EXTRA_plugindetails
@ -263,16 +272,16 @@ OBJECTS = \
 	plugin-browser.obj
 !ENDIF

-!IFDEF EXTRA_faxg3
+!IF "$(DIR)"=="file-faxg3"
 OBJECTS = \
 	faxg3.obj \
 	g3.obj
 !ENDIF

-!IFDEF EXTRA_fits
+!IF "$(DIR)"=="file-fits"
 OBJECTS = \
 	fits.obj \
-	fitsrw.obj
+	fits-io.obj
 !ENDIF

 !IFDEF EXTRA_flame
@ -283,10 +292,10 @@ OBJECTS = \
 	rect.obj
 !ENDIF

-!IFDEF EXTRA_gfli
+!IF "$(DIR)"=="file-fli"
 OBJECTS = \
 	fli.obj \
-	gfli.obj
+	fli-gimp.obj
 !ENDIF

 !IFDEF EXTRA_gfig
@ -346,19 +355,11 @@ OBJECTS = \
 	gfig-stock.obj
 !ENDIF

-!IFDEF EXTRA_gif_load
-OBJECTS = gif-load.obj
-!ENDIF
-
-!IFDEF EXTRA_gif_save
-OBJECTS = gif-save.obj
-!ENDIF
-
-!IFDEF EXTRA_ifscompose
+!IF "$(DIR)"=="ifs-compose"
 OBJECTS = \
-	ifscompose.obj \
-	ifscompose_storage.obj \
-	ifscompose_utils.obj
+	ifs-compose.obj \
+	ifs-compose-storage.obj \
+	ifs-compose-utils.obj
 !ENDIF

 !IFDEF EXTRA_imagemap
@ -460,7 +461,17 @@ EXTRACFLAGS = -FIstring.h -FIstdlib.h -DYY_NO_UNISTD_H
 OPTIMIZE =
 !ENDIF

-!IFDEF EXTRA_jpeg
+!IF "$(DIR)"=="file-ico"
+EXTRACFLAGS = $(PNG_CFLAGS)
+EXTRALIBS = $(PNG_LIBS)
+OBJECTS = \
+	ico-dialog.obj \
+	ico-load.obj \
+	ico-save.obj \
+	ico.obj
+!ENDIF
+
+!IF "$(DIR)"=="file-jpeg"
 EXTRACFLAGS = -I$(JPEG) \
 !IFDEF EXIF
 	$(EXIF_CFLAGS) -DHAVE_EXIF -DHAVE_EXIF_0_6
@ -486,17 +497,28 @@ OBJECTS = \

 !ENDIF

-!IFDEF EXTRA_lcms 
+!IF "$(DIR)"=="file-uri"
+OBJECTS = \
+	gimpmountoperation.obj \
+#	uri-backend-gnomevfs.obj \
+	uri-backend-gvfs.obj \
+#	uri-backend-libcurl.obj \
+#	uri-backend-wget.obj \
+	uri.obj
+!ENDIF
+
+!IF "$(DIR)"=="lcms"
 EXTRACFLAGS = $(LCMS_CFLAGS)
 EXTRALIBS = $(LCMS_LIBS)
 !ENDIF

 !IFDEF EXTRA_maze
 OBJECTS = \
-	algorithms.obj \
-	handy.obj \
+	maze-algorithms.obj \
+	maze-dialog.obj \
+	maze-utils.obj \
 	maze.obj \
-	maze_face.obj
+
 !ENDIF

 !IFDEF EXTRA_mpeg
@ -543,68 +565,47 @@ EXTRA_DEPS = pagecurl-icons.h

 !ENDIF

-!IFDEF EXTRA_png
+!IF "$(DIR)"=="file-png"
 EXTRACFLAGS = $(PNG_CFLAGS)
 EXTRALIBS = $(PNG_LIBS)
 !ENDIF

-!IFDEF EXTRA_psd_load
-OBJECTS = psd-load.obj
-!ENDIF
-
-!IFDEF EXTRA_psd_save
-OBJECTS = psd-save.obj
-!ENDIF
-
 !IFDEF EXTRA_print
 OBJECTS = \
 	print.obj \
 	print-draw-page.obj \
 	print-page-layout.obj \
 	print-preview.obj \
-	print-settings.obj
+	print-settings.obj \
+	print-page-setup.obj \
+	print-utils.obj \
+
 EXTRALIBS = $(CAIRO_LIBS) $(GTHREAD_LIBS)
 !ENDIF

-!IFDEF EXTRA_gnomeprint
-EXTRACFLAGS = $(GNOMEPRINT_CFLAGS) $(LIBART_CFLAGS) $(GNOMECANVAS_CFLAGS) $(GNOMEPRINTUI_CFLAGS)
-EXTRALIBS = $(GNOMEPRINT_LIBS) $(GNOMEPRINTUI_LIBS)
-!ENDIF
-
-!IFDEF EXTRA_psp
+!IF "$(DIR)"=="file-psp"
 EXTRACFLAGS = $(ZLIB_CFLAGS)
 EXTRALIBS = $(ZLIB_LIBS)
 !ENDIF

-!IFDEF EXTRA_rcm
-STOCK_VARS = \
-        rcm_360         images/rcm-360.png     \
-        rcm_a_b         images/rcm-a-b.png     \
-        rcm_ccw         images/rcm-ccw.png     \
-        rcm_cw          images/rcm-cw.png      \
-
-STOCK_IMAGES = \
-        images/rcm-360.png     \
-        images/rcm-a-b.png     \
-        images/rcm-ccw.png     \
-        images/rcm-cw.png      \
-
-images/rcm-stock-pixbufs.h: $(STOCK_IMAGES)
-	gdk-pixbuf-csource --rle --build-list $(STOCK_VARS) > images/rcm-stock-pixbufs.h
-
-EXTRA_DEPS = images/rcm-stock-pixbufs.h
-
+!IF "$(DIR)"=="file-psd"
+EXTRACFLAGS = $(TIFF_CFLAGS) $(JPEG_CFLAGS)
+EXTRALIBS = $(TIFF_LIBS) $(JPEG)\libjpeg.lib $(ZLIB_LIBS) user32.lib
 OBJECTS = \
-	rcm.obj \
-	rcm_callback.obj \
-	rcm_dialog.obj \
-	rcm_gdk.obj \
-	rcm_misc.obj \
-	rcm_stock.obj
-OPTIMIZE = 
+	psd-image-res-load.obj \
+	psd-layer-res-load.obj \
+	psd-load.obj \
+#2nd!	psd-save.obj \
+	psd-thumb-load.obj \
+	psd-util.obj \
+	psd.obj
 !ENDIF

-!IFDEF EXTRA_script_fu
+!IF "$(DIR)"=="screenshot"
+EXTRALIBS = user32.lib
+!ENDIF
+
+!IF "$(DIR)"=="script-fu"
 OBJECTS = \
 	scheme-wrapper.obj \
 	script-fu.obj \
@ -612,48 +613,44 @@ OBJECTS = \
 	script-fu-scripts.obj \
 	script-fu-text-console.obj \
 	script-fu-interface.obj \
-	script-fu-server.obj
+	script-fu-server.obj \
+	script-fu-eval.obj \
+	script-fu-regex.obj \
+	script-fu-script.obj \
+	script-fu-utils.obj \

-EXTRALIBS = tinyscheme\tinyscheme.lib re\re.lib ftx\ftx.lib kernel32.lib wsock32.lib
+EXTRALIBS = tinyscheme\tinyscheme.lib ftx\ftx.lib kernel32.lib wsock32.lib
 EXTRACFLAGS = -DREGEX_MALLOC -DUSE_INTERFACE -DSTANDALONE=0
 #HAVE_RESOURCE = YES
 !ENDIF

-!IFDEF EXTRA_sel2path
+!IF "$(DIR)"=="selection-to-path"
 OBJECTS = \
 	curve.obj \
 	edge.obj \
 	fit.obj \
 	math.obj \
 	pxl-outline.obj \
-	sel2path.obj \
-	sel2path_adv_dialog.obj \
 	spline.obj \
-	vector.obj
+	selection-to-path-dialog.obj \
+	selection-to-path.obj \
+	spline.obj \
+	vector.obj \
+
 !ENDIF

-!IFDEF EXTRA_sgi
+!IF "$(DIR)"=="file-sgi"
 OBJECTS = \
 	sgi.obj \
-	sgilib.obj
+	sgi-lib.obj
 !ENDIF

-!IFDEF EXTRA_svg
+!IF "$(DIR)"=="file-svg"
 EXTRACFLAGS = $(RSVG_CFLAGS)
 EXTRALIBS = $(RSVG_LIBS)
 !ENDIF

-!IFDEF EXTRA_tiff_load
-OBJECTS = tiff-load.obj
-EXTRA_tiff=1
-!ENDIF
-
-!IFDEF EXTRA_tiff_save
-OBJECTS = tiff-save.obj
-EXTRA_tiff=1
-!ENDIF
-
-!IFDEF EXTRA_tiff
+!IF "$(DIR)"=="file-tiff-load" || "$(DIR)"=="file-tiff-save"
 EXTRACFLAGS = $(TIFF_CFLAGS)
 EXTRALIBS = $(TIFF_LIBS) $(JPEG)\libjpeg.lib $(ZLIB_LIBS) user32.lib
 !ENDIF
@ -697,7 +694,9 @@ OBJECTS = \
 	gimphelpdomain.obj \
 	gimphelpitem.obj \
 	gimphelplocale.obj \
-	help.obj
+	gimphelpprogress.obj \
+	help.obj \
+
 TEST_OBJECTS = \
 	gimp-help-lookup.obj
 !ENDIF
@ -767,7 +766,7 @@ OBJECTS = \
 EXTRALIBS = user32.lib
 !ENDIF

-!IFDEF EXTRA_webbrowser
+!IF "$(DIR)"=="web-browser"
 EXTRALIBS = shell32.lib user32.lib
 !ENDIF

@ -789,12 +788,14 @@ OBJECTS = \
 	main.obj
 !ENDIF

-!IFDEF EXTRA_winsnap
-HAVE_RESOURCE = YES
+!IF "$(DIR)"=="win-snap"
+OBJECTS = winsnap.obj
+#HAVE_RESOURCE = YES
+RESOURCE = winsnap.res
 EXTRALIBS = user32.lib gdi32.lib
 !ENDIF

-!IFDEF EXTRA_xjt
+!IF "$(DIR)"=="file-xjt"
 OBJECTS = \
 	xjt.obj \
 	xjpeg.obj
--- a/themes/Default/images/makefile.msc
+++ b/themes/Default/images/makefile.msc
@ -91,6 +91,8 @@ STOCK_VARIABLES = \
 	stock_floating_selection_32	stock-floating-selection-32.png \
 	stock_floating_selection_48	stock-floating-selection-48.png \
 	stock_frame_64		stock-frame-64.png \
+	stock_gegl_16	stock-gegl-16.png \
+	stock_gegl_22	stock-gegl-22.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	\
@ -213,6 +215,9 @@ STOCK_VARIABLES = \
 	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_user_manual_16	stock-user-manual-16.png \
+	stock_user_manual_32	stock-user-manual-32.png \
+	stock_user_manual_64	stock-user-manual-64.png \
 	stock_vcenter_24	stock-vcenter-24.png	\
 	stock_vchain_24		stock-vchain-24.png	\
 	stock_vchain_broken_24		stock-vchain-broken-24.png	\
@ -224,10 +229,6 @@ STOCK_VARIABLES = \
 	stock_web_16		stock-web-16.png	\
 	stock_web_24		stock-web-24.png	\
 	\
-	stock_wilber_16		stock-wilber-16.png	\
-	stock_wilber_64		stock-wilber-64.png	\
-	stock_wilber_eek_64		stock-wilber-eek-64.png	\
-	\
 	stock_zoom_follow_window_12	stock-zoom-follow-window-12.png

 STOCK_TOOL_VARIABLES = \
@ -316,8 +317,10 @@ STOCK_TOOL_VARIABLES = \

 WILBER_VARIABLES = \
 	stock_wilber_16		stock-wilber-16.png	\
-	stock_wilber_48		stock-wilber-48.png	\
+	stock_wilber_22		stock-wilber-22.png	\
+#	stock_wilber_48		stock-wilber-48.png	\
 	stock_wilber_64		stock-wilber-64.png	\
+	stock_wilber_eek_64		stock-wilber-eek-64.png	\

 CORE_VARIABLES = \
 	stock_question_64 stock-question-64.png
@ -332,7 +335,9 @@ gimp-core-pixbufs.h : $(CORE_IMAGES) makefile.msc
 	gdk-pixbuf-csource --raw --build-list $(CORE_VARIABLES) > gimp-core-pixbufs.h

 gimp-stock-pixbufs.h: $(STOCK_IMAGES) makefile.msc
-	gdk-pixbuf-csource --raw --build-list $(STOCK_VARIABLES) $(STOCK_TOOL_VARIABLES) > gimp-stock-pixbufs.h
+	gdk-pixbuf-csource --raw --build-list $(STOCK_VARIABLES) > gimp-stock-pixbufs.h
+	gdk-pixbuf-csource --raw --build-list $(STOCK_TOOL_VARIABLES) >> gimp-stock-pixbufs.h
+	gdk-pixbuf-csource --raw --build-list $(WILBER_VARIABLES) >> gimp-stock-pixbufs.h

 gimp-wilber-pixbufs.h: $(WILBER_IMAGES) makefile.msc
 	gdk-pixbuf-csource --raw --build-list $(WILBER_VARIABLES) > gimp-wilber-pixbufs.h