updated msvc build

2007-08-05  Hans Breuer  <hans@breuer.org>

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


svn path=/trunk/; revision=23118
This commit is contained in:
Hans Breuer 2007-08-05 15:16:02 +00:00 committed by Hans Breuer
parent 9a350d71e3
commit 024ef60a49
15 changed files with 81 additions and 19 deletions

View File

@ -1,3 +1,7 @@
2007-08-05 Hans Breuer <hans@breuer.org>
* **/makefile.msc app/gimpcore.def : updated msvc build
2007-08-05 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimprectangletool.c (gimp_rectangle_tool_motion): When

View File

@ -20,7 +20,6 @@ OBJECTS = \
base.obj \
base-enums.obj \
boundary.obj \
brush-scale.obj \
color-balance.obj \
colorize.obj \
cpercep.obj \
@ -40,6 +39,8 @@ OBJECTS = \
tile-cache.obj \
tile-manager.obj \
tile-manager-crop.obj \
tile-manager-preview.obj \
tile-pyramid.obj \
tile-swap.obj \
INCLUDES = \

View File

@ -50,6 +50,7 @@ OBJECTS = \
gimparea.obj \
gimpbrush-load.obj \
gimpbrush.obj \
gimpbrush-scale.obj \
gimpbrushclipboard.obj \
gimpbrushgenerated-load.obj \
gimpbrushgenerated-save.obj \

View File

@ -10,6 +10,7 @@ PKG_VER = $(GIMP_VER)
OBJECTS = \
file-open.obj \
file-procedure.obj \
file-save.obj \
file-utils.obj \
gimprecentitem.obj \

View File

@ -268,7 +268,6 @@ EXPORTS
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
@ -646,12 +645,10 @@ EXPORTS
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
@ -692,10 +689,8 @@ gimp_progress_start
gimp_stroke_desc_new
gimp_view_size_get_type
levels_stretch
file_utils_find_proc_by_extension
gimp_templates_migrate
file_utils_filename_from_uri
file_utils_find_proc
gimp_drawable_get_sub_preview
gimp_drawable_preview_bytes
gimp_edit_copy_visible
@ -898,3 +893,22 @@ file_open_from_command_line
gimp_color_pick_mode_get_type
gimp_undo_get_age
gimp_undo_reset_age
file_procedure_find
file_procedure_find_by_extension
gimp_container_get_neighbor_of_active
gimp_image_resize_to_selection
gimp_param_display_id_get_type
gimp_projection_get_level
gimp_projection_get_tiles_at_level
gimp_projection_get_type
gimp_sub_progress_get_type
gimp_sub_progress_new
gimp_sub_progress_set_step
gimp_value_set_display
tile_swap_exit
gimp_image_parasite_attach
gimp_image_parasite_detach
gimp_image_get_active_drawable

View File

@ -63,7 +63,7 @@ PKG_LINK = \
$(top_builddir)/libgimpthumb/gimpthumb-$(LT_RELEASE).lib \
$(top_builddir)/libgimpmodule/gimpmodule-$(LT_RELEASE).lib \
$(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \
$(GLIB_LIBS) \
$(GLIB_LIBS) $(GTHREAD_LIBS) \
$(GTK2_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \

View File

@ -15,6 +15,7 @@ LT_RELEASE = $(PKG_VER)
OBJECTS = \
paint-funcs.obj \
scale-funcs.obj \
sample-funcs.obj \
mmx_sources = \

View File

@ -33,6 +33,7 @@ OBJECTS = \
gimppluginmanager-locale-domain.obj \
gimppluginmanager-menu-branch.obj \
gimppluginmanager-query.obj \
gimppluginmanager-restore.obj \
gimpplugin-message.obj \
gimppluginprocedure.obj \
gimppluginprocframe.obj \

View File

@ -35,7 +35,6 @@ OBJECTS = \
gimpbrushfactoryview.obj \
gimpbrushselect.obj \
gimpbufferview.obj \
gimpcellrendereraccel.obj \
gimpcellrendererdashes.obj \
gimpcellrendererviewable.obj \
gimpchanneltreeview.obj \
@ -100,6 +99,7 @@ OBJECTS = \
gimphistogrambox.obj \
gimphistogrameditor.obj \
gimphistogramview.obj \
gimpimagecommenteditor.obj \
gimpimagedock.obj \
gimpimageeditor.obj \
gimpimageparasiteview.obj \
@ -130,6 +130,10 @@ OBJECTS = \
gimpselectiondata.obj \
gimpselectioneditor.obj \
gimpsessioninfo.obj \
gimpsessioninfo-aux.obj \
gimpsessioninfo-book.obj \
gimpsessioninfo-dock.obj \
gimpsessioninfo-dockable.obj \
gimpsizebox.obj \
gimpstringaction.obj \
gimpstrokeeditor.obj \

View File

@ -6,6 +6,8 @@ GIMP_VER = 2.0
# The name of the directory in your %HOME% where GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
# don't interfer with stable version
GIMPDIR = _gimp-2.3.x
# Build app/* as DLLs; don't define this, it doesn't work yet.
#DLLGIMP = 1

View File

@ -48,7 +48,8 @@ OBJECTS = \
gimpunit.obj \
gimputils.obj \
gimpwire.obj \
\
xdg-user-dir.obj
EXTRA_DIST = \
makefile.mingw \
@ -82,7 +83,8 @@ $(PACKAGE).lib : $(OBJECTS)
lib /out:$(PACKAGE).lib $(OBJECTS)
$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
$(CC) $(CFLAGS) -LD -Fe$(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 shell32.lib ole32.lib $(LDFLAGS) /def:$(PACKAGE).def
$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \

View File

@ -34,6 +34,7 @@ OBJECTS = \
gimpadaptivesupersample.obj \
gimpbilinear.obj \
gimpcmyk.obj \
gimpcolormanaged.obj \
gimpcolorspace.obj \
gimphsl.obj \
gimphsv.obj \

View File

@ -37,6 +37,7 @@ OBJECTS = \
gimpthumb-error.obj \
gimpthumb-utils.obj \
gimpthumbnail.obj \
gimp-thumbnail-list.obj \
!IFNDEF PERL
PERL = perl

View File

@ -74,7 +74,7 @@ OBJECTS = \
gimpscrolledpreview.obj \
gimpstringcombobox.obj \
gimpquerybox.obj \
gimpresolutionentry.obj \
# gimpresolutionentry.obj \
gimpsizeentry.obj \
gimpstock.obj \
gimpunitmenu.obj \

View File

@ -35,13 +35,13 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below
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 gifload 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 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
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 tiff_load tiff_save
COMMON6 = tile tileit tiler uniteditor unsharp video vinvert vpropagate warp waves webbrowser whirlpinch wind xbm xwd zealouscrop
COMMON7 = winprint winclipboard wiredebug
NOTNOW = wmf svg
NOTNOW = wmf
# 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
@ -51,7 +51,7 @@ SEPARATE = FractalExplorer Lighting MapObject bmp faxg3 fits flame gfig gflare g
# ..\unofficial-plug-ins directory, go there, and do "nmake -f
# makefile.msc unofficial".
UNOFFICIAL = Anamorphose DigitalSignature RGB_Displace gimp_ace guash sel_gauss magiceye psd_save user_filter
UNOFFICIAL = Anamorphose DigitalSignature RGB_Displace gimp_ace guash sel_gauss magiceye user_filter
# The main target
@ -78,7 +78,7 @@ libs-clean :
sub-libs:
cd script-fu\tinyscheme
nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. EXTRACFLAGS="-DWIN32 -DUSE_MATH -DUSE_INTERFACE" \
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
@ -346,6 +346,14 @@ 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
OBJECTS = \
ifscompose.obj \
@ -469,7 +477,9 @@ OBJECTS = \
jpeg-exif.obj \
jpeg-icc.obj \
jpeg-load.obj \
jpeg-quality.obj \
jpeg-save.obj \
jpeg-settings.obj \
!IFDEF EXIF
gimpexif.obj
!ENDIF
@ -538,13 +548,22 @@ 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
EXTRALIBS = $(CAIRO_LIBS)
EXTRALIBS = $(CAIRO_LIBS) $(GTHREAD_LIBS)
!ENDIF
!IFDEF EXTRA_gnomeprint
@ -596,7 +615,7 @@ OBJECTS = \
script-fu-server.obj
EXTRALIBS = tinyscheme\tinyscheme.lib re\re.lib ftx\ftx.lib kernel32.lib wsock32.lib
EXTRACFLAGS = -DREGEX_MALLOC -DUSE_INTERFACE
EXTRACFLAGS = -DREGEX_MALLOC -DUSE_INTERFACE -DSTANDALONE=0
#HAVE_RESOURCE = YES
!ENDIF
@ -624,6 +643,16 @@ 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
EXTRACFLAGS = $(TIFF_CFLAGS)
EXTRALIBS = $(TIFF_LIBS) $(JPEG)\libjpeg.lib $(ZLIB_LIBS) user32.lib