2006-10-27  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc app/gimpcore.def : updated
This commit is contained in:
Hans Breuer 2006-10-27 16:04:53 +00:00 committed by Hans Breuer
parent 63da8bb8ca
commit 3551bbcca0
10 changed files with 168 additions and 57 deletions

View file

@ -1,3 +1,7 @@
2006-10-27 Hans Breuer <hans@breuer.org>
* **/makefile.msc app/gimpcore.def : updated
2006-10-27 Sven Neumann <sven@gimp.org>
* libgimpconfig/gimpcolorconfig-enums.[ch]

View file

@ -31,33 +31,42 @@ PKG_LINK = \
# ..\xcf\xcf.lib \
OBJECTS = \
# ..\undo.obj \
core-enums.obj \
gimp.obj \
gimp-contexts.obj \
gimp-documents.obj \
gimp-edit.obj \
gimp-gradients.obj \
gimp-gui.obj \
gimp-modules.obj \
gimp-parasites.obj \
gimp-templates.obj \
gimp-transform-region.obj \
gimp-transform-utils.obj \
gimp-units.obj \
gimp-user-install.obj \
gimp-utils.obj \
gimp.obj \
gimparea.obj \
gimpbrush.obj \
gimpbrush-load.obj \
gimpbrush.obj \
gimpbrushclipboard.obj \
gimpbrushgenerated-load.obj \
gimpbrushgenerated-save.obj \
gimpbrushgenerated.obj \
gimpbrushpipe-load.obj \
gimpbrushpipe.obj \
gimpbuffer.obj \
gimpchannel.obj \
gimpchannel-combine.obj \
gimpchannel-select.obj \
gimpcoords.obj \
gimpcontainer.obj \
gimpchannel.obj \
gimpcontainer-filter.obj \
gimpcontainer.obj \
gimpcontext.obj \
gimpcoords.obj \
gimpdashpattern.obj \
gimpdata.obj \
gimpdatafactory.obj \
gimp-documents.obj \
gimpdocumentlist.obj \
gimpdrawable.obj \
gimpdrawable-blend.obj \
gimpdrawable-bucket-fill.obj \
gimpdrawable-combine.obj \
@ -72,14 +81,13 @@ OBJECTS = \
gimpdrawable-preview.obj \
gimpdrawable-stroke.obj \
gimpdrawable-transform.obj \
gimpgradient.obj \
gimpdrawable.obj \
gimpdrawableundo.obj \
gimpgradient-load.obj \
gimpgradient-save.obj \
gimpgradient.obj \
gimpgrid.obj \
gimpguide.obj \
gimp-gradients.obj \
gimpimage.obj \
gimpimagemap.obj \
gimpimage-arrange.obj \
gimpimage-colorhash.obj \
gimpimage-colormap.obj \
@ -99,54 +107,51 @@ OBJECTS = \
gimpimage-resize.obj \
gimpimage-rotate.obj \
gimpimage-sample-points.obj \
gimpimage-snap.obj \
gimpimage-scale.obj \
gimpimage-undo.obj \
gimpimage-snap.obj \
gimpimage-undo-push.obj \
gimpimage-undo.obj \
gimpimage.obj \
gimpimagefile.obj \
gimpitem.obj \
gimpimagemap.obj \
gimpitem-linked.obj \
gimpitem-preview.obj \
gimpitem.obj \
gimpitemundo.obj \
gimplayer.obj \
gimplayer-floating-sel.obj \
gimplayer.obj \
gimplayermask.obj \
gimplist.obj \
gimpparamspecs.obj \
gimpparamspecs-desc.obj \
gimpprojection.obj \
gimpprojection-construct.obj \
gimpmarshal.obj \
gimp-modules.obj \
gimpobject.obj \
gimppaintinfo.obj \
gimppalette.obj \
gimppalette-import.obj \
gimp-parasites.obj \
gimppalette-load.obj \
gimppalette-save.obj \
gimppalette.obj \
gimpparamspecs-desc.obj \
gimpparamspecs.obj \
gimpparasitelist.obj \
gimppattern-load.obj \
gimppattern.obj \
gimppatternclipboard.obj \
gimppickable.obj \
gimppdbprogress.obj \
gimppickable.obj \
gimppreviewcache.obj \
gimpprogress.obj \
gimpprojection-construct.obj \
gimpprojection.obj \
gimpscanconvert.obj \
gimpselection.obj \
gimpstrokedesc.obj \
gimpstrokeoptions.obj \
gimptemplate.obj \
gimptooloptions.obj \
# gimp-transform-resize.obj \
gimp-transform-utils.obj \
gimp-templates.obj \
gimptoolinfo.obj \
gimptooloptions.obj \
gimpundo.obj \
gimpundostack.obj \
gimpunit.obj \
# gimpunits.obj \
gimpviewable.obj \
gimp-utils.obj \
gimp-user-install.obj
OTHER_FILES = \
\
@ -218,4 +223,4 @@ gimpcore-$(PKG_VER).dll : $(DLLOBJS) gimpcore.def
clean ::
del gimpmarshal.c
del gimpmarshal.h
del gimpmarshal.h

View file

@ -30,6 +30,7 @@ OBJECTS = \
desaturate-dialog.obj \
dialogs-constructors.obj \
dialogs.obj \
fade-dialog.obj \
file-open-dialog.obj \
file-open-location-dialog.obj \
file-save-dialog.obj \

View file

@ -235,7 +235,6 @@ EXPORTS
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
@ -855,3 +854,28 @@ gimp_source_options_get_type
gimp_perspective_clone_get_source_point
gimp_perspective_clone_get_type
gimp_perspective_clone_options_get_type
gimp_brush_generated_load
gimp_brush_generated_save
gimp_brush_pipe_load
gimp_palette_load
gimp_palette_load_act
gimp_palette_load_detect_format
gimp_palette_load_psp
gimp_palette_load_riff
gimp_palette_save
gimp_pattern_load
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_channel_select_round_rect
gimp_drawable_undo_get_type
gimp_edit_fade
gimp_image_undo_get_fadeable
gimp_message_severity_get_type
gimp_progress_message
plug_in_icc_profile_info

View file

@ -20,6 +20,7 @@ OBJECTS = \
gimpenvirontable.obj \
gimpinterpreterdb.obj \
gimpplugin.obj \
gimpplugin-cleanup.obj \
gimpplugin-context.obj \
gimpplugindebug.obj \
gimppluginmanager.obj \
@ -40,6 +41,7 @@ OBJECTS = \
\
plug-in-def.obj \
plug-in-enums.obj \
plug-in-icc-profile.obj \
plug-in-params.obj \
plug-in-rc.obj

View file

@ -31,6 +31,7 @@ OBJECTS = \
gimpvectors-export.obj \
gimpvectors-import.obj \
gimpbezierstroke.obj \
gimpstroke-new.obj \
gimpvectors.obj \
gimpvectors-compat.obj \
gimpvectors-preview.obj \

View file

@ -101,6 +101,7 @@ OBJECTS = \
gimphistogramview.obj \
gimpimagedock.obj \
gimpimageeditor.obj \
gimpimageprofileview.obj \
gimpimagepropview.obj \
gimpimageview.obj \
gimpitemtreeview.obj \

View file

@ -33,12 +33,13 @@ FROMPLUGINSDIR=YES # Used to bypass other parts below
# The COMMON* ones are in the common subdirectory
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
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 lic
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 tile tileit tiler uniteditor unsharp video vinvert vpropagate
COMMON6 = warp waves webbrowser whirlpinch winclipboard wind winprint wiredebug xbm xwd zealouscrop
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
COMMON6 = tile tileit tiler uniteditor unsharp video vinvert vpropagate warp waves webbrowser whirlpinch wind wiredebug xbm xwd zealouscrop
COMMON7 = winprint winclipboard
NOTNOW = wmf svg
@ -76,10 +77,19 @@ libs-clean :
@nmake -nologo -f makefile.msc sub-libs TARGET=clean
sub-libs:
cd script-fu\siod
nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. LIBRARY=siod OBJECTS="trace.obj slib.obj sliba.obj regex.obj" $(TARGET)
cd script-fu\tinyscheme
nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. EXTRACFLAGS="-DWIN32 -DUSE_MATH -DUSE_INTERFACE" \
MODULE=tinyscheme OBJECTS="dynload.obj scheme.obj" $(TARGET)
cd ..\..
cd script-fu\re
nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. EXTRACFLAGS="-DWIN32 -I.. -DUSE_INTERFACE" \
MODULE=re OBJECTS="debug.obj regcomp.obj regerror.obj regexec.obj re.obj regfree.obj" \
$(TARGET)
cd ..\..
cd script-fu\ftx
nmake -nologo -f ..\..\makefile.msc GIMPTOP=..\..\.. EXTRACFLAGS="-DWIN32 -I.. -DUSE_INTERFACE" \
MODULE=ftx OBJECTS="ftx.obj" EXTRA_EXPORT=/export:init_ftx $(TARGET)
cd ..\..
common-plugins-all :
@nmake -nologo -f makefile.msc sub-common-plugins TARGET=all
@ -88,7 +98,7 @@ common-plugins-install :
@nmake -nologo -f makefile.msc sub-common-plugins TARGET=install
common-plugins-clean :
@nmake -nologo -f makefile.msc sub-common-plugins TARGET=clean
@nmake -nologo -f makefile.msc sub-one-common TARGET=clean
@ -100,6 +110,7 @@ sub-common-plugins :
for %d in ($(COMMON4)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
for %d in ($(COMMON5)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
for %d in ($(COMMON6)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
# for %d in ($(COMMON7)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET)
sub-one-common :
@cd common
@ -229,6 +240,11 @@ OBJECTS = \
bmpwrite.obj
!ENDIF
!IFDEF EXTRA_colormap_remap
OBJECTS = \
colormap-remap.obj
!ENDIF
!IFDEF EXTRA_plugin_browser
OBJECTS = \
plugin-browser.obj
@ -462,6 +478,11 @@ OBJECTS = \
jpeg-save.obj
!ENDIF
!IFDEF EXTRA_lcms
EXTRACFLAGS = $(LCMS_CFLAGS)
EXTRALIBS = $(LCMS_LIBS)
!ENDIF
!IFDEF EXTRA_maze
OBJECTS = \
algorithms.obj \
@ -568,7 +589,7 @@ OPTIMIZE =
!IFDEF EXTRA_script_fu
OBJECTS = \
siod-wrapper.obj \
scheme-wrapper.obj \
script-fu.obj \
script-fu-console.obj \
script-fu-scripts.obj \
@ -576,8 +597,8 @@ OBJECTS = \
script-fu-interface.obj \
script-fu-server.obj
EXTRALIBS = ..\..\regexrepl\regexrepl.lib siod\siod.lib kernel32.lib wsock32.lib
EXTRACFLAGS = -DREGEX_MALLOC
EXTRALIBS = tinyscheme\tinyscheme.lib re\re.lib ftx\ftx.lib kernel32.lib wsock32.lib
EXTRACFLAGS = -DREGEX_MALLOC -DUSE_INTERFACE
HAVE_RESOURCE = YES
!ENDIF
@ -606,8 +627,8 @@ EXTRALIBS = $(RSVG_LIBS)
!ENDIF
!IFDEF EXTRA_tiff
EXTRACFLAGS = -I$(TIFF)
EXTRALIBS = $(TIFF)\libtiff.lib $(JPEG)\libjpeg.lib $(ZLIB_LIBS) user32.lib
EXTRACFLAGS = $(TIFF_CFLAGS)
EXTRALIBS = $(TIFF_LIBS) $(JPEG)\libjpeg.lib $(ZLIB_LIBS) user32.lib
!ENDIF
!IFDEF EXTRA_gimp_ace
@ -735,6 +756,8 @@ EXTRALIBS = user32.lib
!ENDIF
!IFDEF EXTRA_winicon
EXTRACFLAGS = $(PNG_CFLAGS)
EXTRALIBS = $(PNG_LIBS)
OBJECTS = \
icodialog.obj \
icoload.obj \
@ -782,7 +805,7 @@ CFLAGS = -FImsvc_recommended_pragmas.h \
$(EXTRACFLAGS) \
$(GTK2_CFLAGS) $(INTL_CFLAGS)
LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG) /NODEFAULTLIB:LIBC
!IFDEF PLUGIN
@ -845,6 +868,8 @@ $(LIBRARY).lib : $(OBJECTS)
# Allow building libraries with specific extensions
!IFNDEF MODULE_EXT
MODULE_EXT = dll
!ELSE
EXTRA_EXPORT = /export:init$(MODULE)
!ENDIF
all : $(MODULE).$(MODULE_EXT)
@ -857,10 +882,12 @@ OBJECTS = $(MODULE).obj
$(MODULE).$(MODULE_EXT) : $(OBJECTS)
$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(LDFLAGS) $(EXTRALIBS) \
..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib \
..\..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
..\..\libgimpbase\gimpbase-$(GIMP_VER).lib \
$(GLIB_LIBS) $(GTK2_LIBS) /export:init$(MODULE)
$(GIMPTOP)\libgimp\gimp-$(GIMP_VER).lib \
$(GIMPTOP)\libgimp\gimpui-$(GIMP_VER).lib \
$(GIMPTOP)\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
$(GIMPTOP)\libgimpbase\gimpbase-$(GIMP_VER).lib \
$(GIMPTOP)\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) $(EXTRA_EXPORT)
!ENDIF
.c.obj :

View file

@ -1,6 +1,6 @@
!IFNDEF MODULE
MODULES = gimp _gimpenums gimpcolor gimpprocbrowser
MODULES = gimp _gimpenums gimpcolor _gimpui
all : sub-all
@ -24,7 +24,8 @@ OBJECTS = \
pygimp-tile.obj \
pygimp-display.obj \
pygimp-parasite.obj \
pygimp-pdb.obj
pygimp-pdb.obj \
pygimp-vectors.obj
!ENDIF
!IFDEF OBJ__gimpenums
@ -35,14 +36,32 @@ OBJECTS = \
!IFDEF OBJ_gimpcolor
OBJECTS = \
gimpcolormodule.obj \
pygimp-rgb.obj
pygimp-colors.obj
!ENDIF
!IFDEF OBJ_gimpprocbrowser
!IFDEF OBJ__gimpui
OBJECTS = \
procbrowser.obj
gimpuimodule.obj \
gimpui.obj
!ENDIF
.SUFFIXES: .defs .c .exe
gimpui.c: gimpui.defs gimpui.override gimpcolor-types.defs gimpenums-types.defs makefile.msc
.defs.c :
$(PYGTK_CODEGEN) \
$(PYGTK_CODEGEN_DEFINES) \
--override $*.override \
--register $(PYGTK_DEFSDIR)/gdk-types.defs \
--register $(PYGTK_DEFSDIR)/gtk-types.defs \
--register gimpcolor-types.defs \
--register gimpenums-types.defs \
--prefix $* $*.defs > gen-$*.c
echo #pragma warning(disable:4049) > $*.c
type gen-$*.c >> $*.c
del gen-$*.c
PYTHON = ..\..\..\..\python23
!IFNDEF DEBUG
EXTRALIBS = $(PYTHON)\libs\python23.lib user32.lib
@ -50,7 +69,7 @@ EXTRALIBS = $(PYTHON)\libs\python23.lib user32.lib
EXTRALIBS = $(PYTHON)\libs\python23_d.lib user32.lib
!ENDIF
EXTRACFLAGS = -I$(PYTHON)\include -I $(TOP)\gnome-python\pygtk\gobject
EXTRACFLAGS = -I$(PYTHON)\include $(PYGOBJECT_CFLAGS) $(PYGTK_CFLAGS)
GIMPTOP=..\..
# Lib Extension is
@ -59,3 +78,10 @@ MODULE_EXT = pyd
!include ..\makefile.msc
!ENDIF
clean::
del *.obj *.pyd *.lib *.ilk *.pdb *.exp
del gimpui.c

View file

@ -47,6 +47,16 @@ STOCK_VARIABLES = \
stock_color_triangle_16 stock-color-triangle-16.png \
stock_colormap_16 stock-colormap-16.png \
stock_colormap_24 stock-colormap-24.png \
stock_controller_16 stock-controller-16.png \
stock_controller_24 stock-controller-24.png \
stock_controller_linux_input_16 stock-controller-linux-input-16.png \
stock_controller_linux_input_24 stock-controller-linux-input-24.png \
stock_controller_keyboard_16 stock-controller-keyboard-16.png \
stock_controller_keyboard_24 stock-controller-keyboard-24.png \
stock_controller_midi_16 stock-controller-midi-16.png \
stock_controller_midi_24 stock-controller-midi-24.png \
stock_controller_wheel_16 stock-controller-wheel-16.png \
stock_controller_wheel_24 stock-controller-wheel-24.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 \
@ -59,6 +69,16 @@ STOCK_VARIABLES = \
stock_device_status_24 stock-device-status-24.png \
stock_display_filter_16 stock-display-filter-16.png \
stock_display_filter_24 stock-display-filter-24.png \
stock_display_filter_colorblind_16 stock-display-filter-colorblind-16.png \
stock_display_filter_colorblind_24 stock-display-filter-colorblind-24.png \
stock_display_filter_contrast_16 stock-display-filter-contrast-16.png \
stock_display_filter_contrast_24 stock-display-filter-contrast-24.png \
stock_display_filter_gamma_16 stock-display-filter-gamma-16.png \
stock_display_filter_gamma_24 stock-display-filter-gamma-24.png \
stock_display_filter_lcms_16 stock-display-filter-lcms-16.png \
stock_display_filter_lcms_24 stock-display-filter-lcms-24.png \
stock_display_filter_proof_16 stock-display-filter-proof-16.png \
stock_display_filter_proof_24 stock-display-filter-proof-24.png \
stock_duplicate_16 stock-duplicate-16.png \
stock_edit_16 stock-edit-16.png \
stock_error_64 stock-error-64.png \