2007-03-04  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc app/gimpcore.def : updated


svn path=/trunk/; revision=22041
This commit is contained in:
Hans Breuer 2007-03-04 19:04:42 +00:00 committed by Hans Breuer
parent f1692ea6fc
commit f8b13080e4
11 changed files with 61 additions and 24 deletions

View File

@ -1,3 +1,7 @@
2007-03-04 Hans Breuer <hans@breuer.org>
* **/makefile.msc app/gimpcore.def : updated
2007-03-04 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell.[ch]

View File

@ -41,6 +41,7 @@ OBJECTS = \
gimp-parasites.obj \
gimp-templates.obj \
gimp-transform-region.obj \
gimp-transform-resize.obj \
gimp-transform-utils.obj \
gimp-units.obj \
gimp-user-install.obj \
@ -59,6 +60,8 @@ OBJECTS = \
gimpchannel-combine.obj \
gimpchannel-select.obj \
gimpchannel.obj \
gimpchannelpropundo.obj \
gimpchannelundo.obj \
gimpcontainer-filter.obj \
gimpcontainer.obj \
gimpcontext.obj \
@ -82,12 +85,15 @@ OBJECTS = \
gimpdrawable-stroke.obj \
gimpdrawable-transform.obj \
gimpdrawable.obj \
gimpdrawablemodundo.obj \
gimpdrawableundo.obj \
gimpfloatingselundo.obj \
gimpgradient-load.obj \
gimpgradient-save.obj \
gimpgradient.obj \
gimpgrid.obj \
gimpguide.obj \
gimpguideundo.obj \
gimpimage-arrange.obj \
gimpimage-colorhash.obj \
gimpimage-colormap.obj \
@ -114,15 +120,22 @@ OBJECTS = \
gimpimage.obj \
gimpimagefile.obj \
gimpimagemap.obj \
gimpimageundo.obj \
gimpitem-linked.obj \
gimpitem-preview.obj \
gimpitem.obj \
gimpitempropundo.obj \
gimpitemundo.obj \
gimplayer-floating-sel.obj \
gimplayer.obj \
gimplayermask.obj \
gimplayermaskpropundo.obj \
gimplayermaskundo.obj \
gimplayerpropundo.obj \
gimplayerundo.obj \
gimplist.obj \
gimpmarshal.obj \
gimpmaskundo.obj \
gimpobject.obj \
gimppaintinfo.obj \
gimppalette-import.obj \
@ -141,15 +154,17 @@ OBJECTS = \
gimpprogress.obj \
gimpprojection-construct.obj \
gimpprojection.obj \
gimpsamplepoint.obj \
gimpsamplepointundo.obj \
gimpscanconvert.obj \
gimpselection.obj \
gimpstrokedesc.obj \
gimpstrokeoptions.obj \
gimpsubprogress.obj \
gimptemplate.obj \
gimptoolinfo.obj \
gimptooloptions.obj \
gimptoolpresets.obj \
gimp-transform-resize.obj \
gimpundo.obj \
gimpundostack.obj \
gimpunit.obj \

View File

@ -62,6 +62,7 @@ OBJECTS = \
all : \
$(PRJ_TOP)\config.h \
authors.h \
$(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll
@ -70,6 +71,9 @@ all : \
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
authors.h : authors.xsl ..\..\authors.xml
xsltproc authors.xsl ..\..\authors.xml > authors.h
RESOURCE = $(PACKAGE).res
$(PACKAGE).lib : $(OBJECTS)

View File

@ -47,7 +47,6 @@ EXPORTS
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
@ -707,8 +706,6 @@ gimp_progress_pulse
gimp_image_find_sample_point
gimp_image_move_sample_point
gimp_image_remove_sample_point
gimp_image_sample_point_ref
gimp_image_sample_point_unref
gimp_image_add_sample_point_at_pos
gimp_gradient_segment_split_midpoint
gimp_image_resize_with_layers
@ -867,9 +864,11 @@ gimp_pattern_load_pixbuf
gimp_get_tool_info
gimp_gradient_save_pov
gimp_message_valist
gimp_plug_in_manager_get_label
gimp_viewable_set_stock_id
gimp_plug_in_procedure_get_blurb
gimp_plug_in_procedure_get_locale_domain
gimp_channel_select_round_rect
gimp_drawable_undo_get_type
gimp_edit_fade
@ -894,3 +893,8 @@ plug_in_icc_profile_file_info
gimp_dash_pattern_get_type
gimp_dash_pattern_fill_segments
file_open_from_command_line
gimp_color_pick_mode_get_type
gimp_undo_get_age
gimp_undo_reset_age

View File

@ -106,8 +106,8 @@ OBJECTS = \
widgets/appwidgets.lib \
display/appdisplay.lib \
app_procs_console.obj : app_procs.c
$(CC) $(CFLAGS) -DGIMP_CONSOLE_COMPILATION -GD -c $(PKG_CFLAGS) -Foapp_procs_console.obj app_procs.c
app_console.obj : app.c
$(CC) $(CFLAGS) -DGIMP_CONSOLE_COMPILATION -GD -c $(PKG_CFLAGS) -Foapp_console.obj app.c
EXTRA_DIST = \
makefile.mingw \
@ -148,13 +148,13 @@ gimp-core-$(PKG_VER).dll : $(GIMP_CORE_OBJECTS) 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
gimp-console.exe : $(OBJECTS) app_procs_console.obj $(PACKAGE).res $(PKG_LINK)
$(CC) $(CFLAGS) -Fegimp-console.exe $(PACKAGE).res app_procs_console.obj $(OBJECTS) $(PKG_LINK) \
gimp-console.exe : $(OBJECTS) app_console.obj $(PACKAGE).res $(PKG_LINK)
$(CC) $(CFLAGS) -Fegimp-console.exe $(PACKAGE).res app_console.obj $(OBJECTS) $(PKG_LINK) \
gimp-core-$(PKG_VER).lib \
user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS)
$(PACKAGE).exe : $(OBJECTS) app_procs.obj $(PACKAGE).res $(PKG_LINK)
$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res app_procs.obj $(OBJECTS) \
$(PACKAGE).exe : $(OBJECTS) app.obj $(PACKAGE).res $(PKG_LINK)
$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res app.obj $(OBJECTS) \
gimp-core-$(PKG_VER).lib \
$(PKG_LINK) user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS)

View File

@ -40,13 +40,13 @@ OBJECTS = \
gimperaseroptions.obj \
gimpink.obj \
gimpink-blob.obj \
gimpink-undo.obj \
gimpinkundo.obj \
gimpinkoptions.obj \
gimpheal.obj \
gimppaintbrush.obj \
gimppaintcore.obj \
gimppaintcore-stroke.obj \
gimppaintcore-undo.obj \
gimppaintcoreundo.obj \
gimppaintoptions.obj \
gimppencil.obj \
gimppenciloptions.obj \

View File

@ -23,6 +23,7 @@ OBJECTS = \
gimpplugin-cleanup.obj \
gimpplugin-context.obj \
gimpplugindebug.obj \
gimpplugindef.obj \
gimppluginmanager.obj \
gimppluginmanager-call.obj \
gimppluginmanager-data.obj \
@ -39,7 +40,6 @@ OBJECTS = \
gimppluginshm.obj \
gimptemporaryprocedure.obj \
\
plug-in-def.obj \
plug-in-enums.obj \
plug-in-icc-profile.obj \
plug-in-params.obj \

View File

@ -56,7 +56,7 @@ OBJECTS = \
gimpfliptool.obj \
gimpforegroundselectoptions.obj \
gimpforegroundselecttool.obj \
gimpforegroundselecttool-undo.obj \
gimpforegroundselecttoolundo.obj \
gimpfreeselecttool.obj \
gimpfuzzyselecttool.obj \
gimphealtool.obj \
@ -101,7 +101,7 @@ OBJECTS = \
gimptooloptions-gui.obj \
gimptransformoptions.obj \
gimptransformtool.obj \
gimptransformtool-undo.obj \
gimptransformtoolundo.obj \
gimpvectoroptions.obj \
gimpvectortool.obj \
tool_manager.obj \

View File

@ -27,15 +27,18 @@ INCLUDES = \
OBJECTS = \
gimpanchor.obj \
gimpstroke.obj \
gimpvectors-export.obj \
gimpvectors-import.obj \
gimpbezierstroke.obj \
gimpstroke-new.obj \
gimpvectors.obj \
gimpstroke.obj \
gimpvectors-compat.obj \
gimpvectors-export.obj \
gimpvectors-import.obj \
gimpvectors-preview.obj \
gimpvectors-warp.obj \
gimpvectors.obj \
gimpvectorsmodundo.obj \
gimpvectorspropundo.obj \
gimpvectorsundo.obj \
all : \
$(PRJ_TOP)\config.h \

View File

@ -72,6 +72,7 @@ OBJECTS = \
gimppropwidgets.obj \
gimpratioentry.obj \
gimpscrolledpreview.obj \
gimpstringcombobox.obj \
gimpquerybox.obj \
gimpresolutionentry.obj \
gimpsizeentry.obj \

View File

@ -454,20 +454,26 @@ OPTIMIZE =
!IFDEF EXTRA_jpeg
EXTRACFLAGS = -I$(JPEG) \
!IFDEF EXIF_CFLAGS
!IFDEF EXIF
$(EXIF_CFLAGS) -DHAVE_EXIF -DHAVE_EXIF_0_6
!ENDIF
EXTRALIBS = \
$(JPEG)\libjpeg.lib $(EXIF_LIBS)
$(JPEG)\libjpeg.lib \
!IFDEF EXIF
$(EXIF_LIBS)
!ENDIF
OBJECTS = \
gimpexif.obj \
jpeg.obj \
jpeg-exif.obj \
jpeg-icc.obj \
jpeg-load.obj \
jpeg-save.obj
jpeg-save.obj \
!IFDEF EXIF
gimpexif.obj
!ENDIF
!ENDIF
!IFDEF EXTRA_lcms