From 3b3039148c71d00305ec117374f431abb92e55ce Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sun, 1 Aug 2004 20:51:12 +0000 Subject: [PATCH] build but *dont link* display-enums.obj, widget-enums.obj and 2004-07-31 Hans Breuer * app/display/makefile.msc app/widgets/makefile.msc : build but *dont link* display-enums.obj, widget-enums.obj and gimpdisplayoptions.obj. They must be in the dll * app/makefile.msc : build gimp.exe and gimp-console.exe both using the same gimp-core.dll * app/gimpcore.def : new file, exports for gimp-core.dll * app/Makefile.am : added to EXTRA_DIST * cursors/makefile.msc : new file to create gimp-tool-cursors.h * cursors/Makefile.am : added to EXTRA_DIST * **/makefile.msc : updated * app/main.c app/app_procs.c : moved code to close the console from the former to the later. It only is to be used if The Gimp is not build as console app. * plug-ins/gfig/gfig.c : dont gimp_drawable_detach() the same drawable twice * plug-ins/gfig-dialog.c() : added a g_return_if_fail() to avoid crashing on File/Import --- app/actions/makefile.msc | 4 - app/app_procs.c | 10 + app/core/makefile.msc | 8 +- app/display/makefile.msc | 8 +- app/gimpcore.def | 715 +++++++++++++++++++++++++++++ app/main.c | 10 - app/makefile.msc | 59 ++- app/menus/makefile.msc | 3 - app/widgets/makefile.msc | 8 +- cursors/Makefile.am | 2 + cursors/makefile.msc | 54 +++ libgimp/makefile.msc | 2 + libgimpbase/makefile.msc | 10 +- libgimpcolor/makefile.msc | 3 +- libgimpwidgets/makefile.msc | 4 + modules/makefile.msc | 17 +- plug-ins/gfig/gfig-dialog.c | 3 + plug-ins/gfig/gfig.c | 2 +- plug-ins/makefile.msc | 38 +- themes/Default/images/makefile.msc | 3 + 20 files changed, 894 insertions(+), 69 deletions(-) create mode 100644 app/gimpcore.def create mode 100644 cursors/makefile.msc diff --git a/app/actions/makefile.msc b/app/actions/makefile.msc index d1bb9fea59..fe932ef1b9 100644 --- a/app/actions/makefile.msc +++ b/app/actions/makefile.msc @@ -51,10 +51,6 @@ OBJECTS = \ error-console-commands.obj \ file-actions.obj \ file-commands.obj \ - file-dialog-actions.obj \ - file-dialog-commands.obj \ - file-open-actions.obj \ - file-save-actions.obj \ fonts-actions.obj \ fonts-commands.obj \ gradient-editor-actions.obj \ diff --git a/app/app_procs.c b/app/app_procs.c index fa1ef7c553..62c34892be 100644 --- a/app/app_procs.c +++ b/app/app_procs.c @@ -248,6 +248,16 @@ app_run (const gchar *full_prog_name, #endif } +#if defined G_OS_WIN32 && !defined GIMP_CONSOLE_COMPILATION + /* Common windoze apps don't have a console at all. So does Gimp + * - if appropiate. This allows to compile as console application + * with all it's benefits (like inheriting the console) but hide + * it, if the user doesn't want it. + */ + if (!no_interface && !be_verbose && !console_messages) + FreeConsole (); +#endif + gimp_load_config (gimp, alternate_system_gimprc, alternate_gimprc); /* initialize lowlevel stuff */ diff --git a/app/core/makefile.msc b/app/core/makefile.msc index f03d69009c..63b3e52626 100644 --- a/app/core/makefile.msc +++ b/app/core/makefile.msc @@ -36,7 +36,9 @@ OBJECTS = \ cpercep.obj \ gimp.obj \ gimp-edit.obj \ + gimp-gui.obj \ gimp-units.obj \ + gimparea.obj \ gimpbrush.obj \ gimpbrushgenerated.obj \ gimpbrushpipe.obj \ @@ -66,6 +68,8 @@ OBJECTS = \ gimpdrawable-transform.obj \ gimpenvirontable.obj \ gimpgradient.obj \ + gimpgradient-load.obj \ + gimpgradient-save.obj \ gimpgrid.obj \ gimp-gradients.obj \ gimpimage.obj \ @@ -83,7 +87,6 @@ OBJECTS = \ gimpimage-new.obj \ gimpimage-pick-color.obj \ gimpimage-preview.obj \ - gimpimage-projection.obj \ gimpimage-qmask.obj \ gimpimage-resize.obj \ gimpimage-rotate.obj \ @@ -100,6 +103,8 @@ OBJECTS = \ gimplayer-floating-sel.obj \ gimplayermask.obj \ gimplist.obj \ + gimpprojection.obj \ + gimpprojection-construct.obj \ gimpmarshal.obj \ gimp-modules.obj \ gimpobject.obj \ @@ -109,6 +114,7 @@ OBJECTS = \ gimp-parasites.obj \ gimpparasitelist.obj \ gimppattern.obj \ + gimppickable.obj \ gimppreviewcache.obj \ gimpscanconvert.obj \ gimpselection.obj \ diff --git a/app/display/makefile.msc b/app/display/makefile.msc index d6e3663ecb..41da332e07 100644 --- a/app/display/makefile.msc +++ b/app/display/makefile.msc @@ -26,13 +26,13 @@ PKG_LINK = \ OBJECTS = \ gimpcanvas.obj \ gimpdisplay.obj \ - gimpdisplay-area.obj \ gimpdisplay-foreach.obj \ gimpdisplay-handlers.obj \ - gimpdisplayoptions.obj \ +# gimpdisplayoptions.obj \ gimpdisplayshell.obj \ gimpdisplayshell-appearance.obj \ gimpdisplayshell-callbacks.obj \ + gimpdisplayshell-close.obj \ gimpdisplayshell-cursor.obj \ gimpdisplayshell-dnd.obj \ gimpdisplayshell-draw.obj \ @@ -51,7 +51,7 @@ OBJECTS = \ gimpprogress.obj \ gimpscalecombobox.obj \ gimpstatusbar.obj \ - display-enums.obj \ +# display-enums.obj \ all : \ $(PRJ_TOP)\config.h \ @@ -68,7 +68,7 @@ RESOURCE = $(PACKAGE).res $(PACKAGE).lib : $(OBJECTS) lib /out:$(PACKAGE).lib $(OBJECTS) -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def +$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) display-enums.obj $(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 diff --git a/app/gimpcore.def b/app/gimpcore.def new file mode 100644 index 0000000000..5e231f2020 --- /dev/null +++ b/app/gimpcore.def @@ -0,0 +1,715 @@ +EXPORTS + _gimp_unit_get_abbreviation + _gimp_unit_get_deletion_flag + _gimp_unit_get_digits + _gimp_unit_get_factor + _gimp_unit_get_identifier + _gimp_unit_get_number_of_units + _gimp_unit_get_plural + _gimp_unit_get_singular + _gimp_unit_get_symbol + _gimp_unit_new + _gimp_unit_set_deletion_flag + base_exit + base_init + blob_diamond + blob_ellipse + blob_square + brightness_contrast_lut_setup + color_balance + color_balance_create_lookup_tables + color_balance_init + color_balance_range_reset + colorize + colorize_calculate + colorize_init + convolve_region + curves_calculate_curve + curves_channel_reset + curves_init + curves_lut_func + file_open_image + file_open_layer + file_open_with_display + file_open_with_proc_and_display + file_save + file_save_as + file_utils_filename_to_uri + file_utils_uri_to_utf8_basename + file_utils_uri_to_utf8_filename + find_mask_boundary + floating_sel_anchor + floating_sel_remove + floating_sel_to_layer + gimp_add_mask_type_get_type + gimp_airbrush_options_get_type + gimp_area_list_free + gimp_area_list_process + gimp_area_new + gimp_base_config_get_type + gimp_bezier_stroke_extend + gimp_bezier_stroke_new + gimp_boolean_handled_accum + gimp_brush_core_get_type + gimp_brush_core_set_brush + gimp_brush_generated_get_angle + gimp_brush_generated_get_aspect_ratio + gimp_brush_generated_get_hardness + gimp_brush_generated_get_radius + gimp_brush_generated_get_shape + gimp_brush_generated_get_type + gimp_brush_generated_set_angle + gimp_brush_generated_set_aspect_ratio + gimp_brush_generated_set_hardness + gimp_brush_generated_set_radius + gimp_brush_generated_set_shape + gimp_brush_generated_shape_get_type + gimp_brush_get_mask + gimp_brush_get_spacing + gimp_brush_get_standard + gimp_brush_get_type + gimp_brush_pipe_get_type + gimp_brush_set_spacing + gimp_bucket_fill_mode_get_type + gimp_buffer_get_height + gimp_buffer_get_type + gimp_buffer_get_width + gimp_buffer_new + gimp_channel_all + gimp_channel_border + gimp_channel_boundary + gimp_channel_bounds + gimp_channel_clear + gimp_channel_feather + gimp_channel_get_type + gimp_channel_grow + gimp_channel_invert + gimp_channel_is_empty + gimp_channel_new + gimp_channel_new_from_component + gimp_channel_new_mask + gimp_channel_ops_get_type + gimp_channel_push_undo + gimp_channel_select_alpha + gimp_channel_select_by_color + gimp_channel_select_channel + gimp_channel_select_component + gimp_channel_select_ellipse + gimp_channel_select_polygon + gimp_channel_select_rectangle + gimp_channel_select_vectors + gimp_channel_set_color + gimp_channel_sharpen + gimp_channel_shrink + gimp_channel_type_get_type + gimp_channel_value + gimp_clone_get_type + gimp_clone_options_get_type + gimp_config_connect + gimp_config_deserialize_file + gimp_config_diff + gimp_config_dump + gimp_config_duplicate + gimp_config_file_backup_on_error + gimp_config_file_copy + gimp_config_interface_get_type + gimp_config_is_equal_to + gimp_config_path_expand + gimp_config_reset + gimp_config_serialize_to_file + gimp_config_serialize_value + gimp_config_sync + gimp_config_writer_close + gimp_config_writer_finish + gimp_config_writer_linefeed + gimp_config_writer_new_file + gimp_config_writer_open + gimp_config_writer_print + gimp_config_writer_printf + gimp_config_writer_string + gimp_container_add + gimp_container_add_handler + gimp_container_foreach + gimp_container_freeze + gimp_container_frozen + gimp_container_get_child_by_index + gimp_container_get_child_by_name + gimp_container_get_child_index + gimp_container_get_type + gimp_container_have + gimp_container_insert + gimp_container_num_children + gimp_container_remove + gimp_container_remove_handler + gimp_container_reorder + gimp_container_thaw + gimp_context_copy_properties + gimp_context_copy_property + gimp_context_define_properties + gimp_context_define_property + gimp_context_get_background + gimp_context_get_brush + gimp_context_get_buffer + gimp_context_get_by_type + gimp_context_get_display + gimp_context_get_font + gimp_context_get_font_name + gimp_context_get_foreground + gimp_context_get_gradient + gimp_context_get_image + gimp_context_get_imagefile + gimp_context_get_opacity + gimp_context_get_paint_mode + gimp_context_get_palette + gimp_context_get_pattern + gimp_context_get_template + gimp_context_get_tool + gimp_context_get_type + gimp_context_new + gimp_context_set_background + gimp_context_set_brush + gimp_context_set_by_type + gimp_context_set_default_colors + gimp_context_set_display + gimp_context_set_font_name + gimp_context_set_foreground + gimp_context_set_gradient + gimp_context_set_image + gimp_context_set_opacity + gimp_context_set_paint_mode + gimp_context_set_parent + gimp_context_set_pattern + gimp_context_set_serialize_properties + gimp_context_set_template + gimp_context_set_tool + gimp_context_swap_colors + gimp_context_tool_changed + gimp_context_type_to_prop_name + gimp_context_type_to_signal_name + gimp_convert_dither_type_get_type + gimp_convolve_options_get_type + gimp_core_config_get_type + gimp_create_display + gimp_create_image + gimp_curve_type_get_type + gimp_dash_preset_get_type + gimp_data_dirty + gimp_data_factory_data_delete + gimp_data_factory_data_duplicate + gimp_data_factory_data_init + gimp_data_factory_data_new + gimp_data_factory_data_save + gimp_data_factory_data_save_single + gimp_data_factory_get_type + gimp_data_freeze + gimp_data_get_type + gimp_data_thaw + gimp_debug_memsize + gimp_display_config_get_type + gimp_dodge_burn_options_get_type + gimp_drawable_blend + gimp_drawable_bucket_fill + gimp_drawable_bucket_fill_full + gimp_drawable_bytes + gimp_drawable_calculate_histogram + gimp_drawable_cmap + gimp_drawable_data + gimp_drawable_desaturate + gimp_drawable_equalize + gimp_drawable_fill_by_type + gimp_drawable_get_type + gimp_drawable_has_alpha + gimp_drawable_invert + gimp_drawable_is_indexed + gimp_drawable_is_rgb + gimp_drawable_is_text_layer + gimp_drawable_mask_bounds + gimp_drawable_offset + gimp_drawable_set_tiles + gimp_drawable_transform_cut + gimp_drawable_transform_paste + gimp_drawable_transform_tiles_affine + gimp_drawable_transform_tiles_flip + gimp_drawable_type + gimp_edit_clear + gimp_edit_copy + gimp_edit_cut + gimp_edit_fill + gimp_edit_paste + gimp_edit_paste_as_new + gimp_environ_table_add + gimp_eraser_options_get_type + gimp_exit + gimp_fill_type_get_type + gimp_font_get_standard + gimp_font_get_type + gimp_fonts_load + gimp_get_default_language + gimp_get_type + gimp_get_user_context + gimp_gradient_get_color_at + gimp_gradient_get_segment_at + gimp_gradient_get_standard + gimp_gradient_get_type + gimp_gradient_save_as_pov + gimp_gradient_segment_get_first + gimp_gradient_segment_get_last + gimp_gradient_segment_get_left_color + gimp_gradient_segment_get_right_color + gimp_gradient_segment_new + gimp_gradient_segment_range_blend + gimp_gradient_segment_range_compress + gimp_gradient_segment_range_delete + gimp_gradient_segment_range_flip + gimp_gradient_segment_range_move + gimp_gradient_segment_range_recenter_handles + gimp_gradient_segment_range_redistribute_handles + gimp_gradient_segment_range_replicate + gimp_gradient_segment_range_set_blending_function + gimp_gradient_segment_range_set_coloring_type + gimp_gradient_segment_range_split_midpoint + gimp_gradient_segment_range_split_uniform + gimp_gradient_segment_set_left_pos + gimp_gradient_segment_set_middle_pos + gimp_gradient_segments_free + gimp_gradient_type_get_type + gimp_grid_get_type + gimp_gui_config_get_type + 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 + gimp_histogram_get_median + gimp_histogram_get_std_dev + gimp_histogram_get_value + gimp_histogram_n_channels + gimp_histogram_new + gimp_image_active_drawable + gimp_image_add_channel + gimp_image_add_colormap_entry + gimp_image_add_hguide + gimp_image_add_layer + gimp_image_add_vectors + gimp_image_add_vguide + gimp_image_base_type + gimp_image_base_type_with_alpha + gimp_image_contiguous_region_by_seed + gimp_image_convert + gimp_image_coords_in_active_drawable + gimp_image_crop + gimp_image_crop_auto_shrink + gimp_image_duplicate + gimp_image_find_guide + gimp_image_flatten + gimp_image_flip + gimp_image_floating_sel + gimp_image_flush + gimp_image_get_active_channel + gimp_image_get_active_layer + gimp_image_get_active_vectors + gimp_image_get_by_ID + gimp_image_get_channels + gimp_image_get_colormap + gimp_image_get_colormap_entry + gimp_image_get_colormap_size + gimp_image_get_component_active + gimp_image_get_component_index + gimp_image_get_component_visible + gimp_image_get_filename + gimp_image_get_grid + gimp_image_get_height + gimp_image_get_ID + gimp_image_get_layer_index + gimp_image_get_layers + gimp_image_get_mask + gimp_image_get_qmask_color + gimp_image_get_qmask_state + gimp_image_get_type + gimp_image_get_uri + gimp_image_get_vectors + gimp_image_get_vectors_index + gimp_image_get_width + gimp_image_has_alpha + gimp_image_is_empty + gimp_image_layer_boundary + gimp_image_lower_channel + gimp_image_lower_channel_to_bottom + gimp_image_lower_layer + gimp_image_lower_layer_to_bottom + gimp_image_lower_vectors + gimp_image_lower_vectors_to_bottom + gimp_image_map_abort + gimp_image_map_apply + gimp_image_map_clear + gimp_image_map_commit + gimp_image_map_new + gimp_image_merge_down + gimp_image_merge_visible_layers + gimp_image_merge_visible_vectors + gimp_image_move_guide + gimp_image_new_get_last_template + gimp_image_new_set_last_template + gimp_image_pick_color + gimp_image_pick_correlate_layer + gimp_image_position_channel + gimp_image_position_layer + gimp_image_position_vectors + gimp_image_qmask_invert + gimp_image_raise_channel + gimp_image_raise_channel_to_top + gimp_image_raise_layer + gimp_image_raise_layer_to_top + gimp_image_raise_vectors + gimp_image_raise_vectors_to_top + gimp_image_redo + gimp_image_remove_channel + gimp_image_remove_guide + gimp_image_remove_layer + gimp_image_remove_vectors + gimp_image_resize + gimp_image_rotate + gimp_image_scale + gimp_image_scale_check + gimp_image_selection_control + gimp_image_set_active_channel + gimp_image_set_active_layer + gimp_image_set_active_vectors + gimp_image_set_colormap + gimp_image_set_colormap_entry + gimp_image_set_component_active + gimp_image_set_component_visible + gimp_image_set_grid + gimp_image_set_qmask_color + gimp_image_set_qmask_state + gimp_image_set_resolution + gimp_image_set_unit + gimp_image_snap_point + gimp_image_snap_rectangle + gimp_image_undo + gimp_image_undo_disable + gimp_image_undo_enable + gimp_image_undo_event + gimp_image_undo_group_end + gimp_image_undo_group_start + gimp_image_undo_is_enabled + gimp_image_undo_push + gimp_image_undo_push_drawable_mod + gimp_image_undo_push_image_grid + gimp_image_undo_push_item_linked + gimp_image_undo_push_item_visibility + gimp_image_undo_push_text_layer + gimp_image_undo_push_text_layer_modified + gimp_image_undo_push_vectors_mod + gimp_image_update_guide + gimp_imagefile_create_thumbnail + gimp_imagefile_get_desc_string + gimp_imagefile_get_type + gimp_imagefile_new + gimp_imagefile_update + gimp_initialize + gimp_ink_options_get_type + gimp_interpolation_type_get_type + gimp_item_convert + gimp_item_duplicate + gimp_item_flip + gimp_item_get_by_ID + gimp_item_get_ID + gimp_item_get_image + gimp_item_get_linked + gimp_item_get_type + gimp_item_get_visible + gimp_item_height + gimp_item_linked_flip + gimp_item_linked_get_list + gimp_item_linked_rotate + gimp_item_linked_transform + gimp_item_linked_translate + gimp_item_offsets + gimp_item_rename + gimp_item_resize + gimp_item_rotate + gimp_item_scale_by_origin + gimp_item_set_linked + gimp_item_set_visible + gimp_item_stroke + gimp_item_transform + gimp_item_translate + gimp_item_undo_get_type + gimp_item_width + gimp_layer_add_alpha + gimp_layer_add_mask + gimp_layer_apply_mask + gimp_layer_create_mask + gimp_layer_get_mask + gimp_layer_get_mode + gimp_layer_get_opacity + gimp_layer_get_preserve_trans + gimp_layer_get_type + gimp_layer_is_floating_sel + gimp_layer_mask_get_apply + gimp_layer_mask_get_edit + gimp_layer_mask_get_layer + gimp_layer_mask_get_show + gimp_layer_mask_get_type + gimp_layer_mask_set_apply + gimp_layer_mask_set_edit + gimp_layer_mask_set_show + gimp_layer_mode_effects_get_type + gimp_layer_new + gimp_layer_resize_to_image + gimp_layer_set_mode + gimp_layer_set_opacity + gimp_layer_set_preserve_trans + gimp_list_get_type + gimp_list_new + gimp_list_new_weak + gimp_list_reverse + gimp_load_config + gimp_lut_free + gimp_lut_new + gimp_lut_process_2 + gimp_lut_setup + gimp_marshal_BOOLEAN__ENUM_INT + gimp_marshal_BOOLEAN__OBJECT_POINTER + gimp_marshal_BOOLEAN__OBJECT_POINTER_STRING + gimp_marshal_VOID__DOUBLE_DOUBLE + gimp_marshal_VOID__ENUM + gimp_marshal_VOID__ENUM_ENUM_BOXED_INT + gimp_marshal_VOID__FLAGS + gimp_marshal_VOID__INT + gimp_marshal_VOID__INT_INT + gimp_marshal_VOID__OBJECT + gimp_marshal_VOID__OBJECT_POINTER + gimp_marshal_VOID__POINTER + gimp_marshal_VOID__STRING + gimp_marshal_VOID__STRING_BOOLEAN_UINT_FLAGS + gimp_marshal_VOID__STRING_FLAGS + gimp_marshal_VOID__VOID + gimp_message + gimp_modules_refresh + gimp_new + gimp_object_get_memsize + gimp_object_get_name + gimp_object_get_type + gimp_object_set_name + gimp_orientation_type_get_type + gimp_paint_core_cancel + gimp_paint_core_cleanup + gimp_paint_core_constrain + gimp_paint_core_finish + gimp_paint_core_interpolate + gimp_paint_core_paint + gimp_paint_core_start + gimp_paint_info_get_type + gimp_paint_options_get_brush_mode + gimp_paint_options_get_type + gimp_palette_add_entry + gimp_palette_delete_entry + gimp_palette_get_standard + gimp_palette_get_type + gimp_palette_import_from_file + gimp_palette_import_from_gradient + gimp_palette_import_from_image + gimp_palette_import_from_indexed_image + gimp_palette_set_n_columns + gimp_param_memsize_get_type + gimp_param_path_get_type + gimp_param_rgb_get_type + gimp_param_spec_rgb + gimp_param_spec_unit + gimp_param_unit_get_type + gimp_parameters_append + gimp_parameters_append_valist + gimp_parameters_free + gimp_pattern_get_standard + gimp_pattern_get_type + gimp_pencil_options_get_type + gimp_pickable_get_color_at + gimp_pickable_get_image_type + gimp_pickable_interface_get_type + gimp_pickable_pick_color + gimp_preview_size_get_type + gimp_projection_flush + gimp_projection_flush_now + gimp_projection_get_bytes + gimp_projection_get_image_type + gimp_projection_get_opacity + gimp_projection_get_tiles + gimp_rc_get_type + gimp_rc_new + gimp_rc_save + gimp_rc_set_autosave + 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 + gimp_scanner_destroy + gimp_scanner_new_file + gimp_scanner_parse_color + gimp_scanner_parse_int + gimp_scanner_parse_string + gimp_selection_float + gimp_selection_get_type + gimp_selection_save + gimp_set_busy + gimp_smudge_options_get_type + gimp_stroke_anchor_convert + gimp_stroke_anchor_delete + gimp_stroke_anchor_insert + gimp_stroke_anchor_is_insertable + gimp_stroke_anchor_move_absolute + gimp_stroke_anchor_move_relative + gimp_stroke_connect_stroke + gimp_stroke_get_draw_anchors + gimp_stroke_get_draw_controls + gimp_stroke_get_draw_lines + gimp_stroke_interpolate + gimp_stroke_is_empty + gimp_stroke_is_extendable + gimp_stroke_nearest_point_get + gimp_stroke_open + gimp_stroke_options_get_type + gimp_stroke_options_set_dash_preset + gimp_stroke_point_is_movable + gimp_stroke_point_move_absolute + gimp_stroke_translate + gimp_template_create_image + gimp_template_get_type + gimp_template_new + gimp_template_set_from_image + gimp_text_direction_get_type + gimp_text_get_type + gimp_text_justification_get_type + gimp_text_layer_discard + gimp_text_layer_get_text + gimp_text_layer_get_type + gimp_text_layer_new + gimp_text_layer_set + gimp_text_undo_get_type + gimp_text_vectors_new + gimp_threads_enter + gimp_threads_leave + gimp_tool_info_get_standard + gimp_tool_info_get_type + gimp_tool_info_new + gimp_tool_info_set_standard + gimp_tool_options_build_filename + gimp_tool_options_deserialize + gimp_tool_options_get_type + gimp_tool_options_reset + gimp_tool_options_serialize + gimp_transfer_mode_get_type + gimp_transform_direction_get_type + gimp_transform_matrix_perspective + gimp_transform_matrix_rotate_center + gimp_transform_matrix_scale + gimp_transform_matrix_shear + gimp_undo_create_preview + gimp_undo_free + gimp_undo_get_type + gimp_undo_refresh_preview + gimp_undo_stack_get_type + gimp_undo_stack_peek + gimp_undo_stack_pop_undo + gimp_unset_busy + gimp_vectors_anchor_select + gimp_vectors_bounds + gimp_vectors_export_file + gimp_vectors_export_string + gimp_vectors_freeze + gimp_vectors_get_type + gimp_vectors_import_buffer + gimp_vectors_import_file + gimp_vectors_new + gimp_vectors_stroke_add + gimp_vectors_stroke_get_next + gimp_vectors_stroke_remove + gimp_vectors_thaw + gimp_viewable_calc_preview_size + gimp_viewable_get_description + gimp_viewable_get_new_preview + gimp_viewable_get_pixbuf + gimp_viewable_get_popup_size + gimp_viewable_get_preview + gimp_viewable_get_preview_size + gimp_viewable_get_stock_id + gimp_viewable_get_type + gimp_viewable_invalidate_preview + gimp_xml_parser_free + gimp_xml_parser_new + gimp_xml_parser_parse_file + hue_saturation + hue_saturation_calculate_transfers + hue_saturation_init + hue_saturation_partition_reset + levels_adjust_by_colors + levels_auto + levels_calculate_transfers + levels_channel_reset + levels_init + levels_lut_func + pixel_region_init + pixel_region_set_row + pixel_regions_process + pixel_regions_register + plug_in_proc_def_get_help_id + plug_in_proc_def_get_label + plug_in_proc_def_get_pixbuf + plug_in_proc_def_get_progname + plug_in_proc_def_get_stock_id + plug_in_repeat + plug_in_run + plug_ins_help_domain + plug_ins_help_domains + plug_ins_locale_domain + posterize_lut_setup + procedural_db_destroy_args + procedural_db_execute + procedural_db_free_data + procedural_db_lookup + procedural_db_run_proc + read_pixel_data_1 + temp_buf_data + temp_buf_data_clear + temp_buf_free + temp_buf_new + temp_buf_resize + temp_buf_scale + threshold + tile_data_pointer + tile_eheight + tile_ewidth + tile_manager_bpp + tile_manager_get_offsets + tile_manager_get_tile + tile_manager_get_tile_coordinates + tile_manager_get_user_data + tile_manager_height + tile_manager_new + tile_manager_ref + tile_manager_set_offsets + tile_manager_set_user_data + tile_manager_set_validate_proc + tile_manager_unref + tile_manager_width + tile_release +; widget-enums.obj, display-enums.obj + gimp_active_color_get_type + gimp_aspect_type_get_type + gimp_canvas_padding_mode_get_type + gimp_color_frame_mode_get_type + gimp_color_pick_state_get_type + gimp_histogram_scale_get_type + gimp_tab_style_get_type + gimp_view_type_get_type + gimp_zoom_type_get_type +; gimpdisplayoptions.obj + gimp_display_options_fullscreen_get_type + gimp_display_options_get_type + diff --git a/app/main.c b/app/main.c index 7c2abba71f..71e700ab7d 100644 --- a/app/main.c +++ b/app/main.c @@ -409,16 +409,6 @@ main (int argc, } } -#ifdef G_OS_WIN32 - /* Common windoze apps don't have a console at all. So does Gimp - * - if appropiate. This allows to compile as console application - * with all it's benefits (like inheriting the console) but hide - * it, if the user doesn't want it. - */ - if (!show_help && !be_verbose && !console_messages) - FreeConsole (); -#endif - if (show_help) { gimp_show_help (full_prog_name); diff --git a/app/makefile.msc b/app/makefile.msc index 8f4180fe17..1afc5fe3a2 100644 --- a/app/makefile.msc +++ b/app/makefile.msc @@ -28,26 +28,33 @@ sub-one: LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG) -PKG_LINK = \ - actions/appactions.lib \ - config/appconfig.lib \ + +GIMP_CORE_OBJECTS = \ + widgets/widgets-enums.obj \ + display/display-enums.obj \ + display/gimpdisplayoptions.obj \ + \ + base/appbase.lib \ composite/appcomposite.lib \ - menus/appmenus.lib \ + config/appconfig.lib \ + core/appcore.lib \ + file/appfile.lib \ paint/apppaint.lib \ paint-funcs/apppaint-funcs.lib \ - plug-in/appplug-in.lib \ pdb/apppdb.lib \ - tools/apptools.lib \ + plug-in/appplug-in.lib \ text/apptext.lib \ - gui/appgui.lib \ - widgets/appwidgets.lib \ - core/appcore.lib \ - base/appbase.lib \ - file/appfile.lib \ - display/appdisplay.lib \ - xcf/xcf.lib \ vectors/appvectors.lib \ plug-in/appplug-in.lib \ + xcf/xcf.lib \ + +PKG_LINK = \ + actions/appactions.lib \ + menus/appmenus.lib \ + tools/apptools.lib \ + gui/appgui.lib \ + widgets/appwidgets.lib \ + display/appdisplay.lib \ $(PRJ_TOP)/regexrepl/regexrepl.lib \ \ $(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \ @@ -84,20 +91,15 @@ INCLUDES = \ !ENDIF -I$(includedir) -regex_sources = \ - regexrepl.c regexrepl.h - -mmx_sources = \ - - OBJECTS = \ - app_procs.obj \ main.obj \ batch.obj \ errors.obj \ sanity.obj \ units.obj \ +app_procs_console.obj : app_procs.c + $(CC) $(CFLAGS) -DGIMP_CONSOLE_COMPILATION -GD -c $(PKG_CFLAGS) -Foapp_procs_console.obj app_procs.c EXTRA_DIST = \ makefile.mingw \ @@ -118,7 +120,9 @@ scriptdata = \ all : \ $(PRJ_TOP)\config.h \ sub-all \ - $(PACKAGE).exe + gimp-core-$(PKG_VER).dll \ + $(PACKAGE).exe \ + gimp-console.exe $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 @@ -129,12 +133,21 @@ RESOURCE = $(PACKAGE).res $(PACKAGE).lib : $(OBJECTS) lib /out:$(PACKAGE).lib $(OBJECTS) +gimp-core-$(PKG_VER).dll : $(GIMP_CORE_OBJECTS) gimpcore.def + $(CC) $(CFLAGS) -LD -Fegimp-core-$(PKG_VER).dll $(GIMP_CORE_OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def + $(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 $(PKG_LINK) - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ +gimp-console.exe : $(OBJECTS) app_procs_console.obj $(PACKAGE).def $(PACKAGE).res $(PKG_LINK) + $(CC) $(CFLAGS) -Fegimp-console.exe $(PACKAGE).res app_procs_console.obj $(OBJECTS) $(PKG_LINK) \ + gimp-core-$(PKG_VER).lib \ user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def +$(PACKAGE).exe : $(OBJECTS) app_procs.obj $(PACKAGE).def $(PACKAGE).res $(PKG_LINK) + $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res app_procs.obj $(OBJECTS) \ + gimp-core-$(PKG_VER).lib \ + $(PKG_LINK) user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def + .c.obj : $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $< diff --git a/app/menus/makefile.msc b/app/menus/makefile.msc index 8b49d97140..ad31ee5b76 100644 --- a/app/menus/makefile.msc +++ b/app/menus/makefile.msc @@ -24,10 +24,7 @@ all : \ !ENDIF OBJECTS = \ - file-dialog-menu.obj \ file-menu.obj \ - file-open-menu.obj \ - file-save-menu.obj \ image-menu.obj \ menus.obj \ plug-in-menus.obj \ diff --git a/app/widgets/makefile.msc b/app/widgets/makefile.msc index ece73026d5..7ae04a0afb 100644 --- a/app/widgets/makefile.msc +++ b/app/widgets/makefile.msc @@ -29,11 +29,12 @@ OBJECTS = \ gimpaction.obj \ gimpactionfactory.obj \ gimpactiongroup.obj \ + gimpactionview.obj \ gimpbrusheditor.obj \ gimpbrushfactoryview.obj \ gimpbrushselect.obj \ gimpbufferview.obj \ - gimpcellrenderertoggle.obj \ + gimpcellrendereraccel.obj \ gimpcellrendererviewable.obj \ gimpchanneltreeview.obj \ gimpclipboard.obj \ @@ -82,6 +83,7 @@ OBJECTS = \ gimperrorconsole.obj \ gimpfgbgeditor.obj \ gimpfiledialog.obj \ + gimpfileprocview.obj \ gimpfontview.obj \ gimpfontselect.obj \ gimpgradienteditor.obj \ @@ -146,7 +148,7 @@ OBJECTS = \ gtkhwrapbox.obj \ gtkvwrapbox.obj \ gtkwrapbox.obj \ - widgets-enums.obj \ +# widgets-enums.obj \ INCLUDES = \ -FImsvc_recommended_pragmas.h \ @@ -175,7 +177,7 @@ RESOURCE = $(PACKAGE).res $(PACKAGE).lib : $(OBJECTS) lib /out:$(PACKAGE).lib $(OBJECTS) -$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def +$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) widgets-enums.obj $(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 diff --git a/cursors/Makefile.am b/cursors/Makefile.am index a9ebbc1d26..5a5d780b1b 100644 --- a/cursors/Makefile.am +++ b/cursors/Makefile.am @@ -56,6 +56,8 @@ EXTRA_DIST = \ $(CURSOR_IMAGES) \ gimp-tool-cursors.xcf \ \ + makefile.msc \ + \ xbm/cursor-none.xbm \ xbm/cursor-mouse.xbm \ xbm/cursor-mouse-mask.xbm \ diff --git a/cursors/makefile.msc b/cursors/makefile.msc new file mode 100644 index 0000000000..b5db3ee98c --- /dev/null +++ b/cursors/makefile.msc @@ -0,0 +1,54 @@ +CURSOR_LIST = \ + cursor_bad cursor-bad.png \ + cursor_color_picker cursor-color-picker.png \ + cursor_crosshair cursor-crosshair.png \ + cursor_crosshair_small cursor-crosshair-small.png \ + cursor_mouse cursor-mouse.png \ + cursor_none cursor-none.png \ + cursor_zoom cursor-zoom.png \ + \ + modifier_anchor modifier-anchor.png \ + modifier_background modifier-background.png \ + modifier_control modifier-control.png \ + modifier_foreground modifier-foreground.png \ + modifier_intersect modifier-intersect.png \ + modifier_minus modifier-minus.png \ + modifier_move modifier-move.png \ + modifier_pattern modifier-pattern.png \ + modifier_plus modifier-plus.png \ + modifier_resize modifier-resize.png \ + \ + tool_airbrush tool-airbrush.png \ + tool_blend tool-blend.png \ + tool_blur tool-blur.png \ + tool_bucket_fill tool-bucket-fill.png \ + tool_burn tool-burn.png \ + tool_clone tool-clone.png \ + tool_color_picker tool-color-picker.png \ + tool_crop tool-crop.png \ + tool_dodge tool-dodge.png \ + tool_ellipse_select tool-ellipse-select.png \ + tool_eraser tool-eraser.png \ + tool_flip_horizontal tool-flip-horizontal.png \ + tool_flip_vertical tool-flip-vertical.png \ + tool_free_select tool-free-select.png \ + tool_fuzzy_select tool-fuzzy-select.png \ + tool_hand tool-hand.png \ + tool_ink tool-ink.png \ + tool_iscissors tool-iscissors.png \ + tool_measure tool-measure.png \ + tool_move tool-move.png \ + tool_paintbrush tool-paintbrush.png \ + tool_paths tool-paths.png \ + tool_pencil tool-pencil.png \ + tool_perspective tool-perspective.png \ + tool_rect_select tool-rect-select.png \ + tool_resize tool-resize.png \ + tool_rotate tool-rotate.png \ + tool_shear tool-shear.png \ + tool_smudge tool-smudge.png \ + tool_text tool-text.png \ + tool_zoom tool-zoom.png + +gimp-tool-cursors.h : makefile.msc + gdk-pixbuf-csource --raw --build-list $(CURSOR_LIST) > gimp-tool-cursors.h diff --git a/libgimp/makefile.msc b/libgimp/makefile.msc index 14e2ef43c9..a0108d7854 100644 --- a/libgimp/makefile.msc +++ b/libgimp/makefile.msc @@ -99,6 +99,7 @@ gimp_OBJECTS = \ # gimphelp.obj \ gimpimage.obj \ gimplayer.obj \ + gimppaletteselect.obj \ gimppatternselect.obj \ gimppixelfetcher.obj \ gimppixelrgn.obj \ @@ -132,6 +133,7 @@ gimpui_OBJECTS = \ gimpmenu.obj \ gimpimagecombobox.obj \ gimppatternmenu.obj \ + gimppalettemenu.obj \ gimppixbuf.obj \ gimpexport.obj \ # gimppatheditor.obj \ diff --git a/libgimpbase/makefile.msc b/libgimpbase/makefile.msc index 0f6929cae7..a833008ed5 100644 --- a/libgimpbase/makefile.msc +++ b/libgimpbase/makefile.msc @@ -27,17 +27,21 @@ PKG_LINK = \ $(GLIB_LIBS) $(INTL_LIBS) OBJECTS = \ + gimpbaseenums.obj \ gimpbase-private.obj \ - gimpenv.obj \ + gimpbasetypes.obj \ gimpdatafiles.obj \ - gimpsignal.obj \ + gimpenv.obj \ + gimpmemsize.obj \ gimpparasite.obj \ gimpparasiteio.obj \ gimpprotocol.obj \ + gimpsignal.obj \ gimpunit.obj \ gimputils.obj \ gimpwire.obj \ + EXTRA_DIST = \ makefile.mingw \ makefile.mingw.in \ @@ -70,7 +74,7 @@ $(PACKAGE).lib : $(OBJECTS) lib /out:$(PACKAGE).lib $(OBJECTS) $(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def - $(CC) $(CFLAGS) -LD -Felib$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(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 $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ diff --git a/libgimpcolor/makefile.msc b/libgimpcolor/makefile.msc index 5dc06fcb4f..15ae37ebfe 100644 --- a/libgimpcolor/makefile.msc +++ b/libgimpcolor/makefile.msc @@ -36,7 +36,8 @@ OBJECTS = \ gimpcmyk.obj \ gimpcolorspace.obj \ gimphsv.obj \ - gimprgb.obj + gimprgb.obj \ + gimprgb-parse.obj \ gimpcolor-$(GIMP_VER).dll : $(OBJECTS) gimpcolor.def $(CC) $(CFLAGS) -LD -Fegimpcolor-$(GIMP_VER).dll $(OBJECTS) $(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpcolor.def diff --git a/libgimpwidgets/makefile.msc b/libgimpwidgets/makefile.msc index e6b1a29fae..814b683079 100644 --- a/libgimpwidgets/makefile.msc +++ b/libgimpwidgets/makefile.msc @@ -32,10 +32,13 @@ install : all OBJECTS = \ gimpbutton.obj \ + gimpcellrenderercolor.obj \ + gimpcellrenderertoggle.obj \ gimpchainbutton.obj \ gimpcolorarea.obj \ gimpcolorbutton.obj \ gimpcolordisplay.obj \ + gimpcolorhexentry.obj \ gimpcolornotebook.obj \ gimpcolorscale.obj \ gimpcolorscales.obj \ @@ -56,6 +59,7 @@ OBJECTS = \ gimppatheditor.obj \ gimppickbutton.obj \ gimppixmap.obj \ + gimppreviewarea.obj \ gimpquerybox.obj \ gimpsizeentry.obj \ gimpstock.obj \ diff --git a/modules/makefile.msc b/modules/makefile.msc index e0e526d2b1..5803cfc362 100644 --- a/modules/makefile.msc +++ b/modules/makefile.msc @@ -21,7 +21,6 @@ DEPLIBS = $(INTL_LIBS) $(GLIB_LIBS) $(GTK2_LIBS) BIN = $(GIMP)\modules MODULES = \ -# colorsel_gtk-$(GIMP_VER).dll \ colorsel_triangle-$(GIMP_VER).dll \ colorsel_water-$(GIMP_VER).dll \ colorsel_cmyk-$(GIMP_VER).dll \ @@ -39,15 +38,8 @@ install : all ..\config.h : ..\config.h.win32 copy ..\config.h.win32 ..\config.h -colorsel_gtk-$(GIMP_VER).dll : colorsel_gtk.obj - $(CC) $(CFLAGS) -LD -Fe$@ colorsel_gtk.obj $(LDFLAGS) \ - ..\app\gimp.lib \ - ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ - $(DEPLIBS) - colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.obj $(CC) $(CFLAGS) -LD -Fe$@ colorsel_triangle.obj $(LDFLAGS) \ - ..\app\gimp.lib \ ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ ..\libgimpmodule\gimpmodule-$(GIMP_VER).lib \ @@ -55,32 +47,31 @@ colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.obj colorsel_water-$(GIMP_VER).dll : colorsel_water.obj $(CC) $(CFLAGS) -LD -Fe$@ colorsel_water.obj $(LDFLAGS) \ - ..\app\gimp.lib \ ..\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) \ - ..\app\gimp.lib \ ..\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) ..\app\gimp.lib \ + $(CC) $(CFLAGS) -LD -Fe$@ cdisplay_colorblind.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) ..\app\gimp.lib \ + $(CC) $(CFLAGS) -LD -Fe$@ cdisplay_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) ..\app\gimp.lib \ + $(CC) $(CFLAGS) -LD -Fe$@ cdisplay_highcontrast.obj $(LDFLAGS) \ ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ $(DEPLIBS) diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c index 9d2677aee0..5f078eb59c 100644 --- a/plug-ins/gfig/gfig-dialog.c +++ b/plug-ins/gfig/gfig-dialog.c @@ -677,6 +677,9 @@ merge_button_callback (GtkWidget *widget, /* Get the list and which item is selected */ /* Only allow single selections */ + /* apparently this function (call) is all broken at the moment */ + g_return_if_fail (list != NULL); + sellist = GTK_LIST (list)->selection; sel_obj = (GFigObj *) g_object_get_data (G_OBJECT (sellist->data), diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c index 479c9e7fdd..d99a715a5b 100644 --- a/plug-ins/gfig/gfig.c +++ b/plug-ins/gfig/gfig.c @@ -254,7 +254,7 @@ run (const gchar *name, values[0].data.d_status = status; - gimp_drawable_detach (drawable); + /* gimp_drawable_detach (drawable) already done above, don't do it twice */ } /* diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc index c15df28510..29b3118dc1 100644 --- a/plug-ins/makefile.msc +++ b/plug-ins/makefile.msc @@ -34,7 +34,7 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below # The COMMON* ones are in the common subdirectory COMMON1 = AlienMap2 ccanalyze CEL channel_mixer CML_explorer align_layers animationplay animoptimize apply_lens autocrop autostretch_hsv blinds blur borderaverage bumpmap c_astretch checkerboard color_enhance colorify colortoalpha compose convmatrix csource cubism curve_bend COMMON2 = decompose deinterlace depthmerge despeckle destripe dicom diffraction displace edge emboss engrave exchange film flarefx fractaltrace -COMMON3 = gauss gbr gee gee_zoom gif gifload gih glasstile gqbist gradmap grid gtm guillotine gz header hot hrz illusion iwarp jigsaw jpeg laplace lic +COMMON3 = gauss gbr gee gee_zoom gif gifload gih glasstile gqbist gradmap grid gtm guillotine gz header hot illusion iwarp jigsaw jpeg laplace lic COMMON4 = mapcolor max_rgb mblur mosaic newsprint nlfilt noisify normalize nova oilify papertile pat pcx pix pixelize plasma plugindetails png pnm polar postscript psd psd_save psp randomize ripple rotate COMMON5 = sample_colorize scatter_hsv screenshot sel_gauss semiflatten sharpen shift sinus smooth_palette snoise sobel sparkle spheredesigner spread struc sunras svg tga threshold_alpha tiff tile tileit tiler uniteditor unsharp video vinvert vpropagate COMMON6 = warp waves webbrowser whirlpinch winclipboard wind winprint wiredebug xbm xwd zealouscrop @@ -172,12 +172,42 @@ OBJECTS = \ !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 \ + stock_intensity_diffuse_high images/stock-intensity-diffuse-high.png \ + stock_intensity_diffuse_low images/stock-intensity-diffuse-low.png \ + stock_reflectivity_diffuse_high images/stock-reflectivity-diffuse-high.png \ + stock_reflectivity_diffuse_low images/stock-reflectivity-diffuse-low.png \ + stock_reflectivity_specular_high images/stock-reflectivity-specular-high.png \ + stock_reflectivity_specular_low images/stock-reflectivity-specular-low.png \ + stock_reflectivity_highlight_high images/stock-reflectivity-highlight-high.png \ + stock_reflectivity_highlight_low images/stock-reflectivity-highlight-low.png + +STOCK_IMAGES = \ + images/stock-intensity-ambient-high.png \ + images/stock-intensity-ambient-low.png \ + images/stock-intensity-diffuse-high.png \ + images/stock-intensity-diffuse-low.png \ + images/stock-reflectivity-diffuse-high.png \ + images/stock-reflectivity-diffuse-low.png \ + images/stock-reflectivity-specular-high.png \ + images/stock-reflectivity-specular-low.png \ + images/stock-reflectivity-highlight-high.png \ + images/stock-reflectivity-highlight-low.png + +images/stock-pixbufs.h: $(STOCK_IMAGES) + gdk-pixbuf-csource --rle --build-list $(STOCK_VARS) > images/stock-pixbufs.h + +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 !ENDIF @@ -480,6 +510,7 @@ OBJECTS = \ general.obj \ gimp.obj \ gimpressionist.obj \ + globals.obj \ orientation.obj \ orientmap.obj \ paper.obj \ @@ -490,8 +521,8 @@ OBJECTS = \ preview.obj \ repaint.obj \ size.obj \ - sizemap.obj - + sizemap.obj \ + utils.obj !ENDIF !IFDEF EXTRA_helpbrowser @@ -545,6 +576,7 @@ OBJECTS = \ !IFDEF DEBUG tw_dump.obj \ !ENDIF + tw_win.obj \ twain.obj EXTRALIBS = user32.lib !ENDIF diff --git a/themes/Default/images/makefile.msc b/themes/Default/images/makefile.msc index 4c180dfa28..8b0ffd5bb0 100644 --- a/themes/Default/images/makefile.msc +++ b/themes/Default/images/makefile.msc @@ -3,6 +3,9 @@ STOCK_VARIABLES = \ stock_anchor_16 stock-anchor-16.png \ + stock_brush_generated_circle_16 stock-brush-generated-circle-16.png \ + stock_brush_generated_diamond_16 stock-brush-generated-diamond-16.png \ + stock_brush_generated_square_16 stock-brush-generated-square-16.png \ stock_cap_butt_16 stock-cap-butt-16.png \ stock_cap_round_16 stock-cap-round-16.png \ stock_cap_square_16 stock-cap-square-16.png \