updated win32 (msvc) build

2003-05-24  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc **/*.def : updated win32 (msvc) build

	* plug-ins/twain/twain.c plug-ins/winsnap/winsnap.c :
	add the extra parameter to gimp_main() calls
This commit is contained in:
Hans Breuer 2003-05-24 17:00:03 +00:00 committed by Hans Breuer
parent 70a8645fe0
commit 89bfbdf66d
25 changed files with 210 additions and 68 deletions

View File

@ -1,3 +1,10 @@
2003-05-24 Hans Breuer <hans@breuer.org>
* **/makefile.msc **/*.def : updated win32 (msvc) build
* plug-ins/twain/twain.c plug-ins/winsnap/winsnap.c :
add the extra parameter to gimp_main() calls
2003-05-23 Manish Singh <yosh@gimp.org>
* libgimp/gimp.[ch]: gimp_main now takes a GimpPlugInInfo *,

View File

@ -19,6 +19,7 @@ OBJECTS = \
boundary.obj \
brush-scale.obj \
color-balance.obj \
colorize.obj \
curves.obj \
gimphistogram.obj \
gimplut.obj \

View File

@ -24,6 +24,7 @@ OBJECTS = \
gimpconfig-serialize.obj \
gimpconfig-types.obj \
gimpconfig-utils.obj \
gimpconfigwriter.obj \
gimpcoreconfig.obj \
gimpdisplayconfig.obj \
gimpguiconfig.obj \

View File

@ -62,24 +62,30 @@ OBJECTS = \
gimpimage.obj \
gimpimagemap.obj \
gimpimage-colorhash.obj \
gimpimage-colormap.obj \
gimpimage-contiguous-region.obj \
gimpimage-convert.obj \
gimpimage-crop.obj \
gimpimage-duplicate.obj \
gimpimage-flip.obj \
gimpimage-guides.obj \
gimpimage-mask.obj \
gimpimage-mask-select.obj \
gimpimage-merge.obj \
gimpimage-new.obj \
gimpimage-pick-color.obj \
gimpimage-preview.obj \
gimpimage-projection.obj \
gimpimage-qmask.obj \
gimpimage-resize.obj \
gimpimage-rotate.obj \
gimpimage-scale.obj \
gimpimage-undo.obj \
gimpimage-undo-push.obj \
gimpimagefile.obj \
gimpitem.obj \
gimpitem-linked.obj \
gimpitemundo.obj \
gimplayer.obj \
gimplayer-floating-sel.obj \
gimplayermask.obj \
@ -95,12 +101,15 @@ OBJECTS = \
gimppattern.obj \
gimppreviewcache.obj \
gimpscanconvert.obj \
gimptemplate.obj \
gimp-templates.obj \
gimptoolinfo.obj \
gimpundo.obj \
gimpundostack.obj \
gimpunit.obj \
gimpunits.obj \
gimpviewable.obj \
gimp-utils.obj \
OTHER_FILES = \
\

View File

@ -26,6 +26,7 @@ OBJECTS = \
gimpdisplay-foreach.obj \
gimpdisplay-handlers.obj \
gimpdisplayshell.obj \
gimpdisplayshell-appearance.obj \
gimpdisplayshell-callbacks.obj \
gimpdisplayshell-cursor.obj \
gimpdisplayshell-dnd.obj \

View File

@ -56,6 +56,7 @@ OBJECTS = \
file-open-menu.obj \
file-save-dialog.obj \
file-save-menu.obj \
font-select.obj \
gradient-editor-commands.obj \
gradient-editor-menu.obj \
gradients-commands.obj \
@ -80,7 +81,6 @@ OBJECTS = \
palettes-commands.obj \
palettes-menu.obj \
palette-select.obj \
paths-dialog.obj \
patterns-menu.obj \
pattern-select.obj \
plug-in-commands.obj \
@ -93,7 +93,8 @@ OBJECTS = \
select-commands.obj \
session.obj \
splash.obj \
test-commands.obj \
templates-commands.obj \
templates-menu.obj \
tips-dialog.obj \
tips-parser.obj \
tool-options-dialog.obj \

View File

@ -43,8 +43,6 @@ PKG_LINK = \
plug-in/appplug-in.lib \
$(PRJ_TOP)/regexrepl/regexrepl.lib \
\
$(top_builddir)/libgimptool/gimptool.lib \
\
$(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \
$(top_builddir)/libgimpmath/gimpmath-$(LT_RELEASE).lib \
$(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \
@ -56,13 +54,13 @@ PKG_LINK = \
$(GIMP_MP_LIBS) \
$(INTL_LIBS) \
$(PANGO)\pango\pangoft2-$(PANGO_VER).lib \
$(LIBART_LIBS)
$(LIBART_LIBS) \
\
$(PANGO)\fontconfig\fcwin32.lib
gimp_LDFLAGS = \
-export-dynamic -export-symbols $(srcdir)/gimp.sym
INCLUDES = \
-DGIMP_APP_GLUE_COMPILATION \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK2_CFLAGS) \
@ -75,8 +73,6 @@ mmx_sources = \
OBJECTS = \
ops_buttons.obj \
path.obj \
app_procs.obj \
main.obj \
batch.obj \

View File

@ -43,6 +43,7 @@ OBJECTS = \
edit_cmds.obj \
fileops_cmds.obj \
floating_sel_cmds.obj \
font_select_cmds.obj \
gimprc_cmds.obj \
gradients_cmds.obj \
guides_cmds.obj \

View File

@ -14,6 +14,8 @@ PKG_LINK = \
..\core\appcore-$(PKG_VER).lib
OBJECTS = \
gimpfont.obj \
gimpfontlist.obj \
gimptext.obj \
gimptext-compat.obj \
gimptextlayer.obj \

View File

@ -26,7 +26,7 @@ OBJECTS = \
# tools-enums.obj \
tools.obj \
gimpairbrushtool.obj \
gimpbezierselecttool.obj \
# gimpbezierselecttool.obj \
gimpblendoptions.obj \
gimpblendtool.obj \
gimpbrightnesscontrasttool.obj \
@ -35,6 +35,7 @@ OBJECTS = \
gimpbycolorselecttool.obj \
gimpclonetool.obj \
gimpcolorbalancetool.obj \
gimpcolorizetool.obj \
gimpcolorpickeroptions.obj \
gimpcolorpickertool.obj \
gimpconvolvetool.obj \
@ -81,7 +82,6 @@ OBJECTS = \
gimpthresholdtool.obj \
gimptool.obj \
gimptoolcontrol.obj \
gimptoolmodule.obj \
gimptransformoptions.obj \
gimptransformtool.obj \
gimptransformtool-undo.obj \
@ -90,6 +90,7 @@ OBJECTS = \
paint_options.obj \
tool_options.obj \
tool_manager.obj \
tools-enums.obj \
INCLUDES = \
-FImsvc_recommended_pragmas.h \

View File

@ -26,6 +26,7 @@ OBJECTS = \
gimpbezierstroke.obj \
gimpstroke.obj \
gimpvectors.obj \
gimpvectors-compat.obj \
gimpvectors-preview.obj \
all : \

View File

@ -26,19 +26,20 @@ OBJECTS = \
gimpbrusheditor.obj \
gimpbrushfactoryview.obj \
gimpbufferview.obj \
gimpcellrenderertoggle.obj \
gimpcellrendererviewable.obj \
gimpchannellistitem.obj \
gimpchannellistview.obj \
gimpchanneltreeview.obj \
gimpcoloreditor.obj \
gimpcolormapeditor.obj \
gimpcolorpanel.obj \
gimpcomponentlistitem.obj \
gimpcomponenteditor.obj \
gimpcontainereditor.obj \
gimpcontainergridview.obj \
gimpcontainerlistview.obj \
gimpcontainermenu.obj \
gimpcontainermenuimpl.obj \
gimpcontainerpopup.obj \
gimpcontainertreeview.obj \
gimpcontainertreeview-dnd.obj \
gimpcontainerview.obj \
gimpcontainerview-utils.obj \
gimpcursor.obj \
@ -52,8 +53,7 @@ OBJECTS = \
gimpdockable.obj \
gimpdockbook.obj \
gimpdocumentview.obj \
gimpdrawablelistitem.obj \
gimpdrawablelistview.obj \
gimpdrawabletreeview.obj \
gimpeditor.obj \
gimpenummenu.obj \
gimpfontselection.obj \
@ -66,11 +66,8 @@ OBJECTS = \
gimpimageeditor.obj \
gimpimageview.obj \
gimpitemfactory.obj \
gimpitemlistitem.obj \
gimpitemlistview.obj \
gimplayerlistitem.obj \
gimplayerlistview.obj \
gimplistitem.obj \
gimpitemtreeview.obj \
gimplayertreeview.obj \
gimpmenufactory.obj \
gimpmenuitem.obj \
gimpnavigationpreview.obj \
@ -80,16 +77,21 @@ OBJECTS = \
gimppreviewrenderer.obj \
gimppreviewrendererbrush.obj \
gimppreviewrendererdrawable.obj \
gimppreviewrenderergradient.obj \
gimppreviewrendererimage.obj \
gimppreviewrenderertextlayer.obj \
gimppreviewrenderer-utils.obj \
gimppropwidgets.obj \
gimpselectioneditor.obj \
gimptemplateeditor.obj \
gimptemplateview.obj \
gimptexteditor.obj \
gimptoolbox.obj \
gimptoolbox-color-area.obj \
gimptoolbox-indicator-area.obj \
gimpundoeditor.obj \
gimpvectorslistview.obj \
gimpvectorstreeview.obj \
gimpviewablebutton.obj \
gimpviewabledialog.obj \
gimpwidgets-constructors.obj \
gimpwidgets-utils.obj \

View File

@ -97,6 +97,9 @@ EXPORTS
gimp_floating_sel_remove
gimp_floating_sel_rigor
gimp_floating_sel_to_layer
gimp_fonts_close_popup
gimp_fonts_popup
gimp_fonts_set_popup
gimp_free_select
gimp_fuzzy_select
gimp_gamma
@ -350,7 +353,6 @@ EXPORTS
gimp_unit_new
gimp_unit_set_deletion_flag
gimp_version
set_gimp_PLUG_IN_INFO_PTR

View File

@ -14,7 +14,10 @@ EXPORTS
gimp_fixme_preview_new
gimp_fixme_preview_new2
gimp_fixme_preview_put_pixel
gimp_fixme_preview_update
gimp_fixme_preview_update
gimp_font_select_widget
gimp_font_select_widget_close_popup
gimp_font_select_widget_set_popup
gimp_gradient_select_widget
gimp_gradient_select_widget_close_popup
gimp_gradient_select_widget_set_popup

View File

@ -50,6 +50,7 @@ PDB_WRAPPERS_O = \
gimpedit_pdb.obj \
gimpfileops_pdb.obj \
gimpfloatingsel_pdb.obj \
gimpfontselect_pdb.obj \
gimpgimprc_pdb.obj \
gimpgradients_pdb.obj \
gimpgradientselect_pdb.obj \
@ -120,6 +121,7 @@ gimp.obj : gimp.c
gimpui_OBJECTS = \
gimpui.obj \
gimpbrushmenu.obj \
gimpfontmenu.obj \
gimpgradientmenu.obj \
gimpmenu.obj \
gimppatternmenu.obj \

View File

@ -6,6 +6,7 @@ EXPORTS
gimp_directory
gimp_gtkrc
gimp_locale_directory
gimp_memsize_to_string
gimp_parasite_compare
gimp_parasite_copy
gimp_parasite_data

View File

@ -25,7 +25,7 @@ INCLUDES = \
-I$(includedir) \
PKG_LINK = \
$(GLIB_LIBS)
$(GLIB_LIBS) $(INTL_LIBS)
OBJECTS = \
gimpenv.obj \

View File

@ -13,7 +13,6 @@ EXPORTS
gimp_hsv_set
gimp_hsv_to_rgb
gimp_hsv_to_rgb4
gimp_hsv_to_rgb_double
gimp_hsv_to_rgb_int
gimp_hsv_to_rgb_int
gimp_hsv_to_rgb4
@ -44,9 +43,7 @@ EXPORTS
gimp_rgb_to_hsl
gimp_rgb_to_hsv
gimp_rgb_to_hsv
gimp_rgb_to_hsv_double
gimp_rgb_to_hsv4
gimp_rgb_to_hsv_double
gimp_rgb_to_hsv_int
gimp_rgb_to_hsv_int
gimp_rgb_to_hsv4

View File

@ -11,6 +11,7 @@ EXPORTS
gimp_color_area_has_alpha
gimp_color_area_new
gimp_color_area_set_color
gimp_color_area_set_draw_border
gimp_color_area_set_type
gimp_color_button_get_color
gimp_color_button_get_type
@ -76,8 +77,8 @@ EXPORTS
gimp_option_menu_new2
gimp_option_menu_set_history
gimp_option_menu_set_sensitive
gimp_palette_get_background
gimp_palette_get_foreground
; gimp_palette_get_background
; gimp_palette_get_foreground
gimp_path_editor_get_path
gimp_path_editor_get_type
gimp_path_editor_new
@ -117,20 +118,12 @@ EXPORTS
gimp_size_entry_set_value
gimp_size_entry_set_value_boundaries
gimp_spin_button_new
gimp_standard_help_func
; gimp_standard_help_func
gimp_stock_init
gimp_table_attach_aligned
gimp_toggle_button_sensitive_update
gimp_toggle_button_update
gimp_uint_adjustment_update
gimp_unit_get_abbreviation
gimp_unit_get_digits
gimp_unit_get_factor
gimp_unit_get_number_of_built_in_units
gimp_unit_get_number_of_units
gimp_unit_get_plural
gimp_unit_get_singular
gimp_unit_get_symbol
gimp_unit_menu_get_type
gimp_unit_menu_get_unit
gimp_unit_menu_new

View File

@ -60,8 +60,8 @@ OBJECTS = \
gimpstock.obj \
gimpunitmenu.obj \
gimpwidgets.obj \
gimpwidgets-private.obj \
gimpwidgetsmarshal.obj \
libgimp-glue.obj
gimpwidgetsmarshal.h : gimpwidgetsmarshal.list

View File

@ -12,7 +12,7 @@ SUBDIRS = \
libgimpmath \
libgimpwidgets \
libgimp \
libgimptool \
# libgimptool \
libgimpmodule \
regexrepl \
app \

View File

@ -123,6 +123,8 @@ sub-separate-plugins :
@cd script-fu
@nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=script-fu EXTRA_script_fu=1 $(TARGET)
@cd ..
not-any-more :
# Also GAP is special
@cd gap
@nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=gap_filter EXTRA_gap_filter=1 $(TARGET)
@ -580,7 +582,9 @@ OBJECTS = \
OBJECTS = \
tw_func.obj \
tw_util.obj \
!IFDEF DEBUG
tw_dump.obj \
!ENDIF
twain.obj
EXTRALIBS = user32.lib
!ENDIF

View File

@ -247,8 +247,7 @@ WinMain(HINSTANCE hInstance,
* Now, call gimp_main... This is what the MAIN() macro
* would usually do.
*/
set_gimp_PLUG_IN_INFO_PTR(&PLUG_IN_INFO);
return gimp_main(__argc, __argv);
return gimp_main(&PLUG_IN_INFO, __argc, __argv);
}
/*
@ -269,8 +268,7 @@ int main (int argc, char *argv[])
* Now, call gimp_main... This is what the MAIN() macro
* would usually do.
*/
set_gimp_PLUG_IN_INFO_PTR(&PLUG_IN_INFO);
return gimp_main(__argc, __argv);
return gimp_main(&PLUG_IN_INFO, __argc, __argv);
}
/*

View File

@ -629,10 +629,10 @@ WinMain(HINSTANCE hInstance,
hInst = hInstance;
/*
* Now, call win32_gimp_main... This is what the normal WinMain()
* Now, call gimp_main... This is what the normal WinMain()
* would do.
*/
return win32_gimp_main(__argc, __argv);
return gimp_main(&PLUG_IN_INFO, __argc, __argv);
}
/*

View File

@ -6,7 +6,7 @@ STOCK_VARIABLES = \
gimp_dialog_info gimp-dialog-info.png \
gimp_dialog_question gimp-dialog-question.png \
gimp_dialog_warning gimp-dialog-warning.png \
stock_all_16 stock-all-16.png \
stock_all_16 stock-all-16.png \
stock_anchor_16 stock-anchor-16.png \
stock_button_anchor stock-button-anchor.png \
stock_button_delete stock-button-delete.png \
@ -36,39 +36,98 @@ STOCK_VARIABLES = \
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_char_picker_22 stock-char-picker-22.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 \
stock_color_triangle_16 stock-color-triangle-16.png \
stock_channel_16 stock-channel-16.png \
stock_channel_24 stock-channel-24.png \
stock_channel_32 stock-channel-32.png \
stock_channel_48 stock-channel-48.png \
stock_channel_alpha_16 stock-channel-alpha-16.png \
stock_channel_alpha_24 stock-channel-alpha-24.png \
stock_channel_alpha_32 stock-channel-alpha-32.png \
stock_channel_alpha_48 stock-channel-alpha-48.png \
stock_channel_blue_16 stock-channel-blue-16.png \
stock_channel_blue_24 stock-channel-blue-24.png \
stock_channel_blue_32 stock-channel-blue-32.png \
stock_channel_blue_48 stock-channel-blue-48.png \
stock_channel_gray_16 stock-channel-gray-16.png \
stock_channel_gray_24 stock-channel-gray-24.png \
stock_channel_gray_32 stock-channel-gray-32.png \
stock_channel_gray_48 stock-channel-gray-48.png \
stock_channel_green_16 stock-channel-green-16.png \
stock_channel_green_24 stock-channel-green-24.png \
stock_channel_green_32 stock-channel-green-32.png \
stock_channel_green_48 stock-channel-green-48.png \
stock_channel_red_16 stock-channel-red-16.png \
stock_channel_red_24 stock-channel-red-24.png \
stock_channel_red_32 stock-channel-red-32.png \
stock_channel_red_48 stock-channel-red-48.png \
stock_channels_16 stock-channels-16.png \
stock_channels_24 stock-channels-24.png \
stock_char_picker_22 stock-char-picker-22.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 \
stock_color_triangle_16 stock-color-triangle-16.png \
stock_convert_grayscale_16 stock-convert-grayscale-16.png \
stock_convert_indexed_16 stock-convert-indexed-16.png \
stock_convert_rgb_16 stock-convert-rgb-16.png \
stock_curve_free_16 stock-curve-free-16.png \
stock_curve_smooth_16 stock-curve-smooth-16.png \
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_duplicate_16 stock-duplicate-16.png \
stock_edit_16 stock-edit-16.png \
stock_error_64 stock-error-64.png \
stock_eye_12 stock-eye-12.png \
stock_eye_20 stock-eye-20.png \
stock_gravity_east_24 stock-gravity-east-24.png \
stock_gravity_north_24 stock-gravity-north-24.png \
stock_gravity_north_east_24 stock-gravity-north-east-24.png \
stock_gravity_north_west_24 stock-gravity-north-west-24.png \
stock_gravity_south_24 stock-gravity-south-24.png \
stock_gravity_south_east_24 stock-gravity-south-east-24.png \
stock_gravity_south_west_24 stock-gravity-south-west-24.png \
stock_gravity_west_24 stock-gravity-west-24.png \
stock_grow_16 stock-grow-16.png \
stock_flip_horizontal_16 stock-flip-horizontal-16.png \
stock_flip_vertical_16 stock-flip-vertical-16.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 \
stock_gradient_linear_16 stock-gradient-linear-16.png \
stock_gradient_radial_16 stock-gradient-radial-16.png \
stock_gradient_shapeburst_angular_16 stock-gradient-shapeburst-angular-16.png \
stock_gradient_shapeburst_dimpled_16 stock-gradient-shapeburst-dimpled-16.png \
stock_gradient_shapeburst_spherical_16 stock-gradient-shapeburst-spherical-16.png \
stock_gradient_spiral_anticlockwise_16 stock-gradient-spiral-anticlockwise-16.png \
stock_gradient_spiral_clockwise_16 stock-gradient-spiral-clockwise-16.png \
stock_gradient_square_16 stock-gradient-square-16.png \
stock_gravity_east_24 stock-gravity-east-24.png \
stock_gravity_north_24 stock-gravity-north-24.png \
stock_gravity_north_east_24 stock-gravity-north-east-24.png \
stock_gravity_north_west_24 stock-gravity-north-west-24.png \
stock_gravity_south_24 stock-gravity-south-24.png \
stock_gravity_south_east_24 stock-gravity-south-east-24.png \
stock_gravity_south_west_24 stock-gravity-south-west-24.png \
stock_gravity_west_24 stock-gravity-west-24.png \
stock_grid_16 stock-grid-16.png \
stock_grow_16 stock-grow-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 \
stock_image_24 stock-image-24.png \
stock_image_32 stock-image-32.png \
stock_image_48 stock-image-48.png \
stock_images_16 stock-images-16.png \
stock_images_24 stock-images-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_landscape_16 stock-landscape-16.png \
stock_layer_16 stock-layer-16.png \
stock_layer_24 stock-layer-24.png \
stock_layer_32 stock-layer-32.png \
stock_layer_48 stock-layer-48.png \
stock_layer_to_imagesize_16 stock-layer-to-imagesize-16.png \
stock_layers_16 stock-layers-16.png \
stock_layers_24 stock-layers-24.png \
stock_letter_spacing_22 stock-letter-spacing-22.png \
stock_line_spacing_22 stock-line-spacing-22.png \
stock_line_spacing_22 stock-line-spacing-22.png \
stock_linked_12 stock-linked-12.png \
stock_linked_20 stock-linked-20.png \
stock_list_16 stock-list-16.png \
stock_lower_16 stock-lower-16.png \
stock_menu_convert_grayscale stock-menu-convert-grayscale.png \
stock_menu_convert_indexed stock-menu-convert-indexed.png \
@ -87,12 +146,15 @@ STOCK_VARIABLES = \
stock_merge_down_16 stock-merge-down-16.png \
stock_navigation_16 stock-navigation-16.png \
stock_new_16 stock-new-16.png \
stock_none_16 stock-none-16.png \
stock_none_16 stock-none-16.png \
stock_paste_16 stock-paste-16.png \
stock_paste_as_new_16 stock-paste-as-new-16.png \
stock_paste_into_16 stock-paste-into-16.png \
stock_path_stroke_16 stock-path-stroke-16.png \
stock_paths_16 stock-paths-16.png \
stock_paths_22 stock-paths-22.png \
stock_plugin_16 stock-plugin-16.png \
stock_portrait_16 stock-portrait-16.png \
stock_qmask_off_16 stock-qmask-off-16.png \
stock_qmask_on_16 stock-qmask-on-16.png \
stock_question_64 stock-question-64.png \
@ -116,24 +178,47 @@ STOCK_VARIABLES = \
stock_selection_subtract_16 stock-selection-subtract-16.png \
stock_selection_to_channel_16 stock-selection-to-channel-16.png \
stock_selection_to_path_16 stock-selection-to-path-16.png \
stock_shrink_16 stock-shrink-16.png \
stock_shrink_16 stock-shrink-16.png \
stock_swap_colors_12 stock-swap-colors-12.png \
stock_template_16 stock-template-16.png \
stock_template_24 stock-template-24.png \
stock_text_dir_ltr_24 stock-text-dir-ltr-24.png \
stock_text_dir_rtl_24 stock-text-dir-rtl-24.png \
stock_text_layer_16 stock-text-layer-16.png \
stock_text_layer_24 stock-text-layer-24.png \
stock_text_layer_32 stock-text-layer-32.png \
stock_text_layer_48 stock-text-layer-48.png \
stock_texture_64 stock-texture-64.png \
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_vchain_24 stock-vchain-24.png \
stock_vchain_broken_24 stock-vchain-broken-24.png \
stock_video_16 stock-video-16.png \
stock_video_24 stock-video-24.png \
stock_warning_16 stock-warning-16.png \
stock_warning_24 stock-warning-24.png \
stock_warning_64 stock-warning-64.png \
stock_wilber_eek_64 stock-wilber-eek-64.png \
stock_wilber_64 stock-wilber-64.png \
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_wilber_eek stock-wilber-eek.png \
STOCK_TOOL_VARIABLES = \
stock_tool_airbrush_16 tools/stock-tool-airbrush-16.png \
stock_tool_airbrush_22 tools/stock-tool-airbrush-22.png \
stock_tool_bezier_select_16 tools/stock-tool-bezier-select-16.png \
stock_tool_bezier_select_22 tools/stock-tool-bezier-select-22.png \
stock_tool_blend_16 tools/stock-tool-blend-16.png \
stock_tool_blend_22 tools/stock-tool-blend-22.png \
stock_tool_blur_16 tools/stock-tool-blur-16.png \
stock_tool_blur_22 tools/stock-tool-blur-22.png \
stock_tool_brightness_contrast_16 tools/stock-tool-brightness-contrast-16.png \
stock_tool_brightness_contrast_22 tools/stock-tool-brightness-contrast-22.png \
stock_tool_bucket_fill_16 tools/stock-tool-bucket-fill-16.png \
stock_tool_bucket_fill_22 tools/stock-tool-bucket-fill-22.png \
stock_tool_button_airbrush tools/stock-tool-button-airbrush.png \
stock_tool_button_bezier_select tools/stock-tool-button-bezier-select.png \
@ -173,37 +258,71 @@ STOCK_TOOL_VARIABLES = \
stock_tool_button_text tools/stock-tool-button-text.png \
stock_tool_button_threshold tools/stock-tool-button-threshold.png \
stock_tool_button_zoom tools/stock-tool-button-zoom.png \
stock_tool_by_color_select_16 tools/stock-tool-by-color-select-16.png \
stock_tool_by_color_select_22 tools/stock-tool-by-color-select-22.png \
stock_tool_clone_16 tools/stock-tool-clone-16.png \
stock_tool_clone_22 tools/stock-tool-clone-22.png \
stock_tool_color_balance_16 tools/stock-tool-color-balance-16.png \
stock_tool_color_balance_22 tools/stock-tool-color-balance-22.png \
stock_tool_color_picker_16 tools/stock-tool-color-picker-16.png \
stock_tool_color_picker_22 tools/stock-tool-color-picker-22.png \
stock_tool_colorize_16 tools/stock-tool-colorize-16.png \
stock_tool_colorize_22 tools/stock-tool-colorize-22.png \
stock_tool_crop_16 tools/stock-tool-crop-16.png \
stock_tool_crop_22 tools/stock-tool-crop-22.png \
stock_tool_curves_16 tools/stock-tool-curves-16.png \
stock_tool_curves_22 tools/stock-tool-curves-22.png \
stock_tool_dodge_16 tools/stock-tool-dodge-16.png \
stock_tool_dodge_22 tools/stock-tool-dodge-22.png \
stock_tool_ellipse_select_16 tools/stock-tool-ellipse-select-16.png \
stock_tool_ellipse_select_22 tools/stock-tool-ellipse-select-22.png \
stock_tool_eraser_16 tools/stock-tool-eraser-16.png \
stock_tool_eraser_22 tools/stock-tool-eraser-22.png \
stock_tool_flip_16 tools/stock-tool-flip-16.png \
stock_tool_flip_22 tools/stock-tool-flip-22.png \
stock_tool_free_select_16 tools/stock-tool-free-select-16.png \
stock_tool_free_select_22 tools/stock-tool-free-select-22.png \
stock_tool_fuzzy_select_16 tools/stock-tool-fuzzy-select-16.png \
stock_tool_fuzzy_select_22 tools/stock-tool-fuzzy-select-22.png \
stock_tool_histogram_16 tools/stock-tool-histogram-16.png \
stock_tool_histogram_22 tools/stock-tool-histogram-22.png \
stock_tool_hue_saturation_16 tools/stock-tool-hue-saturation-16.png \
stock_tool_hue_saturation_22 tools/stock-tool-hue-saturation-22.png \
stock_tool_ink_16 tools/stock-tool-ink-16.png \
stock_tool_ink_22 tools/stock-tool-ink-22.png \
stock_tool_iscissors_16 tools/stock-tool-iscissors-16.png \
stock_tool_iscissors_22 tools/stock-tool-iscissors-22.png \
stock_tool_levels_16 tools/stock-tool-levels-16.png \
stock_tool_levels_22 tools/stock-tool-levels-22.png \
stock_tool_measure_16 tools/stock-tool-measure-16.png \
stock_tool_measure_22 tools/stock-tool-measure-22.png \
stock_tool_move_16 tools/stock-tool-move-16.png \
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_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 \
stock_tool_perspective_16 tools/stock-tool-perspective-16.png \
stock_tool_perspective_22 tools/stock-tool-perspective-22.png \
stock_tool_posterize_16 tools/stock-tool-posterize-16.png \
stock_tool_posterize_22 tools/stock-tool-posterize-22.png \
stock_tool_rect_select_16 tools/stock-tool-rect-select-16.png \
stock_tool_rect_select_22 tools/stock-tool-rect-select-22.png \
stock_tool_rotate_16 tools/stock-tool-rotate-16.png \
stock_tool_rotate_22 tools/stock-tool-rotate-22.png \
stock_tool_scale_16 tools/stock-tool-scale-16.png \
stock_tool_scale_22 tools/stock-tool-scale-22.png \
stock_tool_shear_16 tools/stock-tool-shear-16.png \
stock_tool_shear_22 tools/stock-tool-shear-22.png \
stock_tool_smudge_16 tools/stock-tool-smudge-16.png \
stock_tool_smudge_22 tools/stock-tool-smudge-22.png \
stock_tool_text_16 tools/stock-tool-text-16.png \
stock_tool_text_22 tools/stock-tool-text-22.png \
stock_tool_threshold_16 tools/stock-tool-threshold-16.png \
stock_tool_threshold_22 tools/stock-tool-threshold-22.png \
stock_tool_zoom_16 tools/stock-tool-zoom-16.png \
stock_tool_zoom_22 tools/stock-tool-zoom-22.png \
WILBER_VARIABLES = \