mirror of https://github.com/GNOME/gimp.git
updated dont include "config/gimpbaseconfig.c", it gives an redefinition
2006-05-13 Hans Breuer <hans@breuer.org> * **/makefile.msc app/gimpcore.def : updated * app/core/gimp-util.c : dont include "config/gimpbaseconfig.c", it gives an redefinition error with msvc. Instead include config/gimpbaseconfig.h and libgimpconfig/gimpconfig-path.h * plug-ins/common/psd_save.c : fix c99isms (declarations only at the start of a block)
This commit is contained in:
Hans Breuer
Hans Breuer
parent
5e24dcf258
commit
429d71e5e2
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2006-05-13 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* **/makefile.msc app/gimpcore.def : updated
|
||||
* app/core/gimp-util.c : dont include "config/gimpbaseconfig.c", it
|
||||
gives an redefinition error with msvc. Instead include
|
||||
config/gimpbaseconfig.h and libgimpconfig/gimpconfig-path.h
|
||||
|
||||
* plug-ins/common/psd_save.c : fix c99isms (declarations only at the
|
||||
start of a block)
|
||||
|
||||
2006-05-12 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/widgets/gimpview.h: save 20 bytes per instance by using
|
||||
|
|
|
|||
|
|
@ -43,10 +43,11 @@
|
|||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
#include "libgimpcolor/gimpcolor.h"
|
||||
#include "libgimpconfig/gimpconfig-path.h"
|
||||
|
||||
#include "core-types.h"
|
||||
|
||||
#include "config/gimpbaseconfig.c"
|
||||
#include "config/gimpbaseconfig.h"
|
||||
|
||||
#include "gimp.h"
|
||||
#include "gimp-utils.h"
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ OBJECTS = \
|
|||
gimpdrawable-preview.obj \
|
||||
gimpdrawable-stroke.obj \
|
||||
gimpdrawable-transform.obj \
|
||||
gimpenvirontable.obj \
|
||||
gimpgradient.obj \
|
||||
gimpgradient-load.obj \
|
||||
gimpgradient-save.obj \
|
||||
|
|
@ -101,7 +100,6 @@ OBJECTS = \
|
|||
gimpimage-undo.obj \
|
||||
gimpimage-undo-push.obj \
|
||||
gimpimagefile.obj \
|
||||
gimpinterpreterdb.obj \
|
||||
gimpitem.obj \
|
||||
gimpitem-align.obj \
|
||||
gimpitem-linked.obj \
|
||||
|
|
@ -111,6 +109,7 @@ OBJECTS = \
|
|||
gimplayer-floating-sel.obj \
|
||||
gimplayermask.obj \
|
||||
gimplist.obj \
|
||||
gimpparamspecs.obj \
|
||||
gimpprojection.obj \
|
||||
gimpprojection-construct.obj \
|
||||
gimpmarshal.obj \
|
||||
|
|
@ -141,6 +140,7 @@ OBJECTS = \
|
|||
# gimpunits.obj \
|
||||
gimpviewable.obj \
|
||||
gimp-utils.obj \
|
||||
gimp-user-install.obj
|
||||
|
||||
OTHER_FILES = \
|
||||
\
|
||||
|
|
@ -163,6 +163,7 @@ INCLUDES = \
|
|||
|
||||
DEFINES = \
|
||||
-DGIMP_COMPILATION \
|
||||
-DGIMP_APP_VERSION=\"2.3\" \
|
||||
-DG_LOG_DOMAIN=\"Gimp-Core\"
|
||||
|
||||
all : \
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ OBJECTS = \
|
|||
image-new-dialog.obj \
|
||||
image-properties-dialog.obj \
|
||||
image-scale-dialog.obj \
|
||||
info-dialog.obj \
|
||||
keyboard-shortcuts-dialog.obj \
|
||||
layer-add-mask-dialog.obj \
|
||||
layer-options-dialog.obj \
|
||||
|
|
|
|||
|
|
@ -196,8 +196,6 @@ EXPORTS
|
|||
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
|
||||
|
|
@ -539,7 +537,6 @@ EXPORTS
|
|||
gimp_selection_get_type
|
||||
gimp_selection_save
|
||||
gimp_set_busy
|
||||
gimp_set_last_plug_in
|
||||
gimp_smudge_options_get_type
|
||||
gimp_stroke_anchor_convert
|
||||
gimp_stroke_anchor_delete
|
||||
|
|
@ -638,22 +635,7 @@ EXPORTS
|
|||
pixel_region_set_row
|
||||
pixel_regions_process
|
||||
pixel_regions_register
|
||||
plug_in_data_free
|
||||
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_lookup
|
||||
procedural_db_run_proc
|
||||
read_pixel_data_1
|
||||
temp_buf_data
|
||||
temp_buf_data_clear
|
||||
|
|
@ -715,7 +697,6 @@ gimp_progress_start
|
|||
gimp_stroke_desc_new
|
||||
gimp_view_size_get_type
|
||||
levels_stretch
|
||||
plug_in_proc_def_get_sensitive
|
||||
file_utils_find_proc_by_extension
|
||||
gimp_templates_migrate
|
||||
file_utils_filename_from_uri
|
||||
|
|
@ -774,4 +755,50 @@ gimp_drawable_foreground_extract_siox
|
|||
gimp_scan_convert_add_polyline
|
||||
gimp_scan_convert_compose
|
||||
gimp_scan_convert_render_value
|
||||
gimp_scan_convert_stroke
|
||||
gimp_scan_convert_stroke
|
||||
|
||||
gimp_array_free
|
||||
gimp_array_new
|
||||
gimp_drawable_get_colormap
|
||||
gimp_drawable_get_tiles
|
||||
gimp_drawable_id_get_type
|
||||
gimp_float_array_get_type
|
||||
gimp_histogram_get_threshold
|
||||
gimp_image_id_get_type
|
||||
gimp_int32_get_type
|
||||
gimp_int8_array_get_type
|
||||
gimp_object_set_static_name
|
||||
gimp_object_take_name
|
||||
gimp_param_drawable_id_get_type
|
||||
gimp_param_image_id_get_type
|
||||
gimp_pdb_execute_procedure_by_name
|
||||
gimp_pdb_execute_procedure_by_name_args
|
||||
gimp_pdb_get_type
|
||||
gimp_pdb_lookup_procedure
|
||||
gimp_pickable_flush
|
||||
gimp_pickable_get_bytes
|
||||
gimp_pickable_get_tiles
|
||||
gimp_plug_in_manager_data_free
|
||||
gimp_plug_in_manager_get_help_domain
|
||||
gimp_plug_in_manager_get_help_domains
|
||||
gimp_plug_in_manager_get_locale_domain
|
||||
gimp_plug_in_manager_set_last_plug_in
|
||||
gimp_plug_in_procedure_get_help_id
|
||||
gimp_plug_in_procedure_get_label
|
||||
gimp_plug_in_procedure_get_pixbuf
|
||||
gimp_plug_in_procedure_get_progname
|
||||
gimp_plug_in_procedure_get_sensitive
|
||||
gimp_plug_in_procedure_get_stock_id
|
||||
gimp_plug_in_procedure_get_type
|
||||
gimp_procedure_execute_async
|
||||
gimp_procedure_get_arguments
|
||||
gimp_procedure_get_type
|
||||
gimp_user_install_free
|
||||
gimp_user_install_is_migration
|
||||
gimp_user_install_new
|
||||
gimp_user_install_run
|
||||
gimp_user_install_set_log_handler
|
||||
gimp_value_array_truncate
|
||||
gimp_value_set_drawable
|
||||
gimp_value_set_image
|
||||
gimp_value_take_stringarray
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ OBJECTS_UI = \
|
|||
OBJECTS = \
|
||||
$(OBJECTS_UI) \
|
||||
internal_procs.obj \
|
||||
procedural_db.obj \
|
||||
brush_cmds.obj \
|
||||
brushes_cmds.obj \
|
||||
buffer_cmds.obj \
|
||||
|
|
@ -70,7 +69,6 @@ OBJECTS = \
|
|||
pattern_cmds.obj \
|
||||
patterns_cmds.obj \
|
||||
plug_in_cmds.obj \
|
||||
procedural-db-query.obj \
|
||||
procedural_db_cmds.obj \
|
||||
progress_cmds.obj \
|
||||
selection_cmds.obj \
|
||||
|
|
@ -80,6 +78,15 @@ OBJECTS = \
|
|||
undo_cmds.obj \
|
||||
unit_cmds.obj \
|
||||
vectors_cmds.obj \
|
||||
\
|
||||
gimppdb.obj \
|
||||
\
|
||||
gimp-pdb.obj \
|
||||
gimp-pdb-compat.obj \
|
||||
gimppdb-query.obj \
|
||||
gimppluginprocedure.obj \
|
||||
gimpprocedure.obj \
|
||||
gimptemporaryprocedure.obj
|
||||
|
||||
INCLUDES = \
|
||||
-FImsvc_recommended_pragmas.h \
|
||||
|
|
|
|||
|
|
@ -17,21 +17,28 @@ PKG_LINK = \
|
|||
..\core\appcore-$(PKG_VER).lib
|
||||
|
||||
OBJECTS = \
|
||||
plug-in.obj \
|
||||
plug-in-context.obj \
|
||||
plug-in-data.obj \
|
||||
plug-in-debug.obj \
|
||||
gimpenvirontable.obj \
|
||||
gimpinterpreterdb.obj \
|
||||
gimpplugin.obj \
|
||||
gimpplugin-context.obj \
|
||||
gimpplugindebug.obj \
|
||||
gimppluginmanager.obj \
|
||||
gimppluginmanager-call.obj \
|
||||
gimppluginmanager-data.obj \
|
||||
gimppluginmanager-file.obj \
|
||||
gimppluginmanager-help-domain.obj \
|
||||
gimppluginmanager-locale-domain.obj \
|
||||
gimppluginmanager-menu-branch.obj \
|
||||
gimppluginmanager-query.obj \
|
||||
gimpplugin-message.obj \
|
||||
gimppluginprocframe.obj \
|
||||
gimpplugin-progress.obj \
|
||||
gimppluginshm.obj \
|
||||
\
|
||||
plug-in-def.obj \
|
||||
plug-in-message.obj \
|
||||
plug-in-enums.obj \
|
||||
plug-in-params.obj \
|
||||
plug-in-proc-def.obj \
|
||||
plug-in-proc-frame.obj \
|
||||
plug-in-progress.obj \
|
||||
plug-ins-query.obj \
|
||||
plug-in-rc.obj \
|
||||
plug-in-run.obj \
|
||||
plug-in-shm.obj \
|
||||
plug-ins.obj \
|
||||
plug-in-rc.obj
|
||||
|
||||
INCLUDES = \
|
||||
-FImsvc_recommended_pragmas.h \
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ DEPLIBS = $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS)
|
|||
|
||||
all : \
|
||||
..\config.h \
|
||||
gimp-wilber-pixbufs.h \
|
||||
gimpwidgetsmarshal.c \
|
||||
gimpwidgets-$(GIMP_VER).dll
|
||||
|
||||
|
|
@ -81,6 +82,22 @@ OBJECTS = \
|
|||
gimpwidgetsmarshal.obj \
|
||||
|
||||
|
||||
# these are duplicated from the $(TOP)/themes/default/images directory - though under a different name
|
||||
WILBER_IMAGES = \
|
||||
wilber-16.png \
|
||||
wilber-32.png \
|
||||
wilber-48.png \
|
||||
wilber-64.png
|
||||
|
||||
WILBER_VARIABLES = \
|
||||
wilber_16 wilber-16.png \
|
||||
wilber_32 wilber-32.png \
|
||||
wilber_48 wilber-48.png \
|
||||
wilber_64 wilber-64.png
|
||||
|
||||
gimp-wilber-pixbufs.h: $(WILBER_IMAGES) makefile.msc
|
||||
gdk-pixbuf-csource --raw --build-list $(WILBER_VARIABLES) > gimp-wilber-pixbufs.h
|
||||
|
||||
gimpwidgetsmarshal.h : gimpwidgetsmarshal.list
|
||||
$(GLIB)\gobject\glib-genmarshal --prefix=_gimp_widgets_marshal gimpwidgetsmarshal.list --header >gimpwidgetsmarshal.h
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,11 @@ MODULES = \
|
|||
colorsel_cmyk-$(GIMP_VER).dll \
|
||||
cdisplay_colorblind-$(GIMP_VER).dll \
|
||||
cdisplay_gamma-$(GIMP_VER).dll \
|
||||
cdisplay_highcontrast-$(GIMP_VER).dll
|
||||
cdisplay_highcontrast-$(GIMP_VER).dll \
|
||||
!IFDEF LCMS_CFLAGS
|
||||
cdisplay_lcms-$(GIMP_VER).dll \
|
||||
cdisplay_proof-$(GIMP_VER).dll \
|
||||
!ENDIF
|
||||
|
||||
|
||||
all : \
|
||||
|
|
@ -76,9 +80,23 @@ cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.obj
|
|||
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
|
||||
$(DEPLIBS)
|
||||
|
||||
cdisplay_lcms-$(GIMP_VER).dll : cdisplay_lcms.obj
|
||||
$(CC) $(CFLAGS) $(LCMS_CFLAGS) -LD -Fe$@ cdisplay_lcms.obj $(LDFLAGS) \
|
||||
..\libgimpbase\gimpbase-$(GIMP_VER).lib \
|
||||
..\libgimpconfig\gimpconfig-$(GIMP_VER).lib \
|
||||
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
|
||||
$(DEPLIBS) $(LCMS_LIBS)
|
||||
|
||||
cdisplay_proof-$(GIMP_VER).dll : cdisplay_proof.obj
|
||||
$(CC) $(CFLAGS) $(LCMS_CFLAGS) -LD -Fe$@ cdisplay_proof.obj $(LDFLAGS) \
|
||||
..\libgimpbase\gimpbase-$(GIMP_VER).lib \
|
||||
..\libgimpconfig\gimpconfig-$(GIMP_VER).lib \
|
||||
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
|
||||
$(DEPLIBS) $(LCMS_LIBS)
|
||||
|
||||
# General rule for building
|
||||
.c.obj:
|
||||
$(CC) $(CFLAGS) -GD -c $<
|
||||
$(CC) $(CFLAGS) $(LCMS_CFLAGS) -GD -c $<
|
||||
|
||||
clean::
|
||||
del *.dll
|
||||
|
|
|
|||
|
|
@ -1115,9 +1115,6 @@ write_pixel_data (FILE *fd, gint32 drawableID, gint32 *ChanLenPosition,
|
|||
GimpPixelRgn region; /* Image region */
|
||||
guchar *data; /* Temporary copy of pixel data */
|
||||
|
||||
IFDBG printf (" Function: write_pixel_data, drw %d, lto %d\n",
|
||||
drawableID, ltable_offset);
|
||||
|
||||
gint32 tile_height = gimp_tile_height();
|
||||
|
||||
GimpDrawable *drawable = gimp_drawable_get (drawableID);
|
||||
|
|
@ -1135,6 +1132,9 @@ write_pixel_data (FILE *fd, gint32 drawableID, gint32 *ChanLenPosition,
|
|||
gint32 length_table_pos; /* position in file of the length table */
|
||||
int i, j;
|
||||
|
||||
IFDBG printf (" Function: write_pixel_data, drw %d, lto %d\n",
|
||||
drawableID, ltable_offset);
|
||||
|
||||
if ( gimp_drawable_has_alpha (drawableID) &&
|
||||
!gimp_drawable_is_indexed (drawableID))
|
||||
colors -= 1;
|
||||
|
|
@ -1219,8 +1219,8 @@ write_pixel_data (FILE *fd, gint32 drawableID, gint32 *ChanLenPosition,
|
|||
|
||||
/* Write layer mask, as last channel, id -2 */
|
||||
if (maskID != -1) {
|
||||
len = 0;
|
||||
GimpDrawable *mdrawable = gimp_drawable_get(maskID);
|
||||
len = 0;
|
||||
|
||||
gimp_pixel_rgn_init (®ion, mdrawable, 0, 0,
|
||||
width, height, FALSE, FALSE);
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@ 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
|
||||
COMMON0 = plugin_browser procedure_browser #gnomeprint
|
||||
COMMON1 = 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 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 gifload gih glasstile glob gqbist gradmap grid gtm guillotine header hot illusion iwarp jigsaw laplace 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 psd_save psp randomize raw retinex ripple rotate
|
||||
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 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 tga threshold_alpha tiff tile tileit tiler uniteditor unsharp video vinvert vpropagate
|
||||
COMMON6 = warp waves webbrowser whirlpinch winclipboard wind winprint wiredebug xbm xwd zealouscrop
|
||||
|
||||
|
|
@ -445,8 +445,14 @@ OPTIMIZE =
|
|||
!ENDIF
|
||||
|
||||
!IFDEF EXTRA_jpeg
|
||||
EXTRACFLAGS = -I$(JPEG)
|
||||
EXTRALIBS = $(JPEG)\libjpeg.lib
|
||||
EXTRACFLAGS = -I$(JPEG) \
|
||||
!IFDEF EXIF_CFLAGS
|
||||
$(EXIF_CFLAGS) -DHAVE_EXIF -DHAVE_EXIF_0_6
|
||||
!ENDIF
|
||||
|
||||
EXTRALIBS = \
|
||||
$(JPEG)\libjpeg.lib $(EXIF_LIBS)
|
||||
|
||||
OBJECTS = \
|
||||
gimpexif.obj \
|
||||
jpeg.obj \
|
||||
|
|
|
|||
Loading…
Reference in New Issue