From 056e09a6cb437829cf4f20e97116989ddb2529f3 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 16 Dec 2011 15:53:56 +0100 Subject: [PATCH] Remove the makefile.msc build system, it is unmaintained since 2008 --- Makefile.am | 4 +- app/Makefile.am | 3 - app/actions/Makefile.am | 2 - app/actions/makefile.msc | 128 ---- app/base/Makefile.am | 2 - app/base/makefile.msc | 79 --- app/composite/Makefile.am | 1 - app/composite/makefile.msc | 70 --- app/config/Makefile.am | 3 - app/config/makefile.msc | 78 --- app/core/Makefile.am | 1 - app/core/makefile.msc | 261 -------- app/dialogs/Makefile.am | 3 +- app/dialogs/makefile.msc | 89 --- app/display/Makefile.am | 2 - app/display/makefile.msc | 85 --- app/file/Makefile.am | 2 - app/file/makefile.msc | 56 -- app/gegl/makefile.msc | 88 --- app/gui/Makefile.am | 4 +- app/gui/makefile.msc | 79 --- app/makefile.msc | 168 ------ app/menus/Makefile.am | 2 - app/menus/makefile.msc | 57 -- app/paint-funcs/Makefile.am | 2 - app/paint-funcs/makefile.msc | 60 -- app/paint/Makefile.am | 2 - app/paint/makefile.msc | 95 --- app/pdb/Makefile.am | 2 - app/pdb/makefile.msc | 121 ---- app/plug-in/Makefile.am | 2 - app/plug-in/makefile.msc | 80 --- app/text/Makefile.am | 2 - app/text/makefile.msc | 79 --- app/tools/Makefile.am | 2 - app/tools/makefile.msc | 150 ----- app/vectors/Makefile.am | 2 - app/vectors/makefile.msc | 66 -- app/widgets/Makefile.am | 2 - app/widgets/makefile.msc | 231 ------- app/xcf/Makefile.am | 2 - app/xcf/makefile.msc | 53 -- cursors/Makefile.am | 3 +- cursors/makefile.msc | 76 --- gimpdefs.msc | 25 - libgimp/Makefile.am | 1 - libgimp/makefile.msc | 215 ------- libgimpbase/Makefile.am | 1 - libgimpbase/makefile.msc | 89 --- libgimpcolor/Makefile.am | 1 - libgimpcolor/makefile.msc | 46 -- libgimpconfig/Makefile.am | 1 - libgimpconfig/makefile.msc | 50 -- libgimpmath/Makefile.am | 1 - libgimpmath/makefile.msc | 39 -- libgimpmodule/Makefile.am | 1 - libgimpmodule/makefile.msc | 78 --- libgimpthumb/Makefile.am | 1 - libgimpthumb/makefile.msc | 56 -- libgimpwidgets/Makefile.am | 1 - libgimpwidgets/makefile.msc | 126 ---- makefile.msc | 68 --- menus/Makefile.am | 3 +- menus/makefile.msc | 33 - modules/Makefile.am | 3 - modules/makefile.msc | 117 ---- plug-ins/Makefile.am | 4 - plug-ins/makefile.msc | 929 ----------------------------- plug-ins/pygimp/Makefile.am | 3 +- plug-ins/pygimp/makefile.msc | 87 --- themes/Default/images/Makefile.am | 4 +- themes/Default/images/makefile.msc | 349 ----------- 72 files changed, 7 insertions(+), 4624 deletions(-) delete mode 100644 app/actions/makefile.msc delete mode 100644 app/base/makefile.msc delete mode 100644 app/composite/makefile.msc delete mode 100644 app/config/makefile.msc delete mode 100644 app/core/makefile.msc delete mode 100644 app/dialogs/makefile.msc delete mode 100644 app/display/makefile.msc delete mode 100644 app/file/makefile.msc delete mode 100644 app/gegl/makefile.msc delete mode 100644 app/gui/makefile.msc delete mode 100644 app/makefile.msc delete mode 100644 app/menus/makefile.msc delete mode 100644 app/paint-funcs/makefile.msc delete mode 100644 app/paint/makefile.msc delete mode 100644 app/pdb/makefile.msc delete mode 100644 app/plug-in/makefile.msc delete mode 100644 app/text/makefile.msc delete mode 100644 app/tools/makefile.msc delete mode 100644 app/vectors/makefile.msc delete mode 100644 app/widgets/makefile.msc delete mode 100644 app/xcf/makefile.msc delete mode 100644 cursors/makefile.msc delete mode 100644 gimpdefs.msc delete mode 100644 libgimp/makefile.msc delete mode 100644 libgimpbase/makefile.msc delete mode 100644 libgimpcolor/makefile.msc delete mode 100644 libgimpconfig/makefile.msc delete mode 100644 libgimpmath/makefile.msc delete mode 100644 libgimpmodule/makefile.msc delete mode 100644 libgimpthumb/makefile.msc delete mode 100644 libgimpwidgets/makefile.msc delete mode 100644 makefile.msc delete mode 100644 menus/makefile.msc delete mode 100644 modules/makefile.msc delete mode 100644 plug-ins/makefile.msc delete mode 100644 plug-ins/pygimp/makefile.msc delete mode 100644 themes/Default/images/makefile.msc diff --git a/Makefile.am b/Makefile.am index add59a2382..53b4ca79d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,9 +73,7 @@ EXTRA_DIST = \ authors.xml \ authors.xsl \ config.h.win32 \ - gimp-zip.in \ - gimpdefs.msc \ - makefile.msc + gimp-zip.in DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc diff --git a/app/Makefile.am b/app/Makefile.am index e51c6c785f..09a2209da3 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -89,9 +89,6 @@ libapp_a_SOURCES = $(libapp_sources) $(libapp_generated_sources) gimp_2_7_SOURCES = $(libapp_sources) main.c -EXTRA_DIST = \ - makefile.msc - if OS_WIN32 win32_ldflags = -mwindows $(WIN32_LARGE_ADDRESS_AWARE) endif diff --git a/app/actions/Makefile.am b/app/actions/Makefile.am index 5a7d8766e7..afffe7a3df 100644 --- a/app/actions/Makefile.am +++ b/app/actions/Makefile.am @@ -185,5 +185,3 @@ libappactions_a_SOURCES = \ windows-actions.h \ windows-commands.c \ windows-commands.h - -EXTRA_DIST = makefile.msc diff --git a/app/actions/makefile.msc b/app/actions/makefile.msc deleted file mode 100644 index 4926c8e188..0000000000 --- a/app/actions/makefile.msc +++ /dev/null @@ -1,128 +0,0 @@ -PACKAGE = appactions -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(PRJ_TOP) \ - -I$(PRJ_TOP)/app \ - $(GTK2_CFLAGS) \ - $(GEGL_CFLAGS) - -DEFINES = \ - -DGIMP_COMPILATION \ - -DG_LOG_DOMAIN=\"Gimp-Actions\" - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -OBJECTS = \ - actions.obj \ - brush-editor-actions.obj \ - brushes-actions.obj \ - buffers-actions.obj \ - buffers-commands.obj \ - channels-actions.obj \ - channels-commands.obj \ - context-actions.obj \ - context-commands.obj \ - colormap-actions.obj \ - colormap-commands.obj \ - config-actions.obj \ - config-commands.obj \ - cursor-info-actions.obj \ - cursor-info-commands.obj \ - data-commands.obj \ - data-editor-commands.obj \ - debug-actions.obj \ - debug-commands.obj \ - dialogs-actions.obj \ - dialogs-commands.obj \ - dock-actions.obj \ - dock-commands.obj \ - dockable-actions.obj \ - dockable-commands.obj \ - documents-actions.obj \ - documents-commands.obj \ - drawable-actions.obj \ - drawable-commands.obj \ - edit-actions.obj \ - edit-commands.obj \ - error-console-actions.obj \ - error-console-commands.obj \ - file-actions.obj \ - file-commands.obj \ - fonts-actions.obj \ - fonts-commands.obj \ - gradient-editor-actions.obj \ - gradient-editor-commands.obj \ - gradients-actions.obj \ - gradients-commands.obj \ - help-actions.obj \ - help-commands.obj \ - image-actions.obj \ - image-commands.obj \ - images-actions.obj \ - images-commands.obj \ - layers-actions.obj \ - layers-commands.obj \ - palette-editor-actions.obj \ - palette-editor-commands.obj \ - palettes-actions.obj \ - palettes-commands.obj \ - patterns-actions.obj \ - plug-in-actions.obj \ - plug-in-commands.obj \ - quick-mask-actions.obj \ - quick-mask-commands.obj \ - sample-points-actions.obj \ - sample-points-commands.obj \ - select-actions.obj \ - select-commands.obj \ - templates-actions.obj \ - templates-commands.obj \ - text-editor-actions.obj \ - text-editor-commands.obj \ - tool-options-actions.obj \ - tool-options-commands.obj \ - tools-actions.obj \ - tools-commands.obj \ - vectors-actions.obj \ - vectors-commands.obj \ - view-actions.obj \ - view-commands.obj \ - window-actions.obj \ - window-commands.obj \ - windows-actions.obj \ - windows-commands.obj \ - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -gimpcore-$(PKG_VER).dll : $(DLLOBJS) gimpcore.def - $(CC) $(CFLAGS) -LD -Fegimpcore-$(PKG_VER).dll $(DLLOBJS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< - diff --git a/app/base/Makefile.am b/app/base/Makefile.am index 7c9140cce9..164aee1c37 100644 --- a/app/base/Makefile.am +++ b/app/base/Makefile.am @@ -73,8 +73,6 @@ libappbase_a_SOURCES = \ tile-swap.c \ tile-swap.h -EXTRA_DIST = makefile.msc - # # rules to generate built sources # diff --git a/app/base/makefile.msc b/app/base/makefile.msc deleted file mode 100644 index a094dc8719..0000000000 --- a/app/base/makefile.msc +++ /dev/null @@ -1,79 +0,0 @@ -# autogenerated from automake.am with automake.py -# and slightly modified - -PACKAGE = appbase -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -PKG_LINK = \ - $(GLIB_LIBS) \ - ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ - ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ - ..\composite\appcomposite-$(PKG_VER).lib \ - ..\config\appconfig-$(PKG_VER).lib - -OBJECTS = \ - base.obj \ - base-enums.obj \ - base-utils.obj \ - boundary.obj \ - color-balance.obj \ - colorize.obj \ - cpercep.obj \ - curves.obj \ - desaturate.obj \ - gimphistogram.obj \ - gimplut.obj \ - hue-saturation.obj \ - levels.obj \ - lut-funcs.obj \ - pixel-processor.obj \ - pixel-region.obj \ - pixel-surround.obj \ - siox.obj \ - temp-buf.obj \ - threshold.obj \ - tile.obj \ - tile-cache.obj \ - tile-manager.obj \ - tile-manager-crop.obj \ - tile-manager-preview.obj \ - tile-pyramid.obj \ - tile-rowhints.obj \ - tile-swap.obj \ - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I $(PRJ_TOP) \ - -I $(PRJ_TOP)/app \ - $(GLIB_CFLAGS) \ - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/composite/Makefile.am b/app/composite/Makefile.am index c81cbbb98e..f843a19bee 100644 --- a/app/composite/Makefile.am +++ b/app/composite/Makefile.am @@ -105,7 +105,6 @@ regenerate: gimp-composite-generic.o $(libcomposite3dnow_a_OBJECTS) $(libcomposi EXTRA_DIST = \ make-installer.py \ - makefile.msc \ ns.py diff --git a/app/composite/makefile.msc b/app/composite/makefile.msc deleted file mode 100644 index 5d2ca8146f..0000000000 --- a/app/composite/makefile.msc +++ /dev/null @@ -1,70 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = appcomposite -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - gimp-composite.obj \ - gimp-composite-altivec.obj \ - gimp-composite-generic.obj \ - gimp-composite-generic-installer.obj \ - gimp-composite-mmx.obj \ - gimp-composite-sse.obj \ - gimp-composite-sse2.obj \ - \ - gimp-composite-3dnow-installer.obj \ - gimp-composite-altivec-installer.obj \ - gimp-composite-mmx-installer.obj \ - gimp-composite-sse-installer.obj \ - gimp-composite-sse2-installer.obj \ - gimp-composite-vis-installer.obj \ - -mmx_sources = \ - -# temporay hack, link appbase to find our required exports -PKG_LINK = \ - ..\base\appbase.lib \ - $(GLIB_LIBS) \ - ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ - ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/app \ - $(GTK2_CFLAGS) \ - -I$(includedir) - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/config/Makefile.am b/app/config/Makefile.am index 1f756b17e2..8012c01d0a 100644 --- a/app/config/Makefile.am +++ b/app/config/Makefile.am @@ -62,11 +62,8 @@ libappconfig_a_SOURCES = \ $(libappconfig_a_built_sources) \ $(libappconfig_a_sources) - EXTRA_PROGRAMS = test-config -EXTRA_DIST = makefile.msc - # # unit tests for the GimpConfig system # diff --git a/app/config/makefile.msc b/app/config/makefile.msc deleted file mode 100644 index 855f0ce517..0000000000 --- a/app/config/makefile.msc +++ /dev/null @@ -1,78 +0,0 @@ -# autogenerated from automake.am with automake.py -# and slightly modified - -PACKAGE = appconfig -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -PKG_LINK = \ -# ..\base\appbase-$(PKG_VER).lib \ -# ..\core\appcore-$(PKG_VER).lib \ - ..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib \ - ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ - ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ - ..\..\libgimpmath\gimpmath-$(PKG_VER).lib \ - $(GLIB_LIBS) $(GOBJECT_LIBS) $(INTL_LIBS) \ - $(GDK_PIXBUF_LIBS) - -OBJECTS = \ - gimpbaseconfig.obj \ - gimpconfig-dump.obj \ - gimpconfig-file.obj \ - gimpconfig-utils.obj \ - gimpcoreconfig.obj \ - gimpdisplayconfig.obj \ - gimpguiconfig.obj \ - gimppluginconfig.obj \ - gimprc-deserialize.obj \ - gimprc-serialize.obj \ - gimprc-unknown.obj \ - gimprc.obj \ - gimpxmlparser.obj \ - \ -!IFDEF DLLGIMP - config-noelf.obj -!ENDIF - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I $(PRJ_TOP) \ - -I $(PRJ_TOP)/app \ - $(GLIB_CFLAGS) \ - $(GDK_PIXBUF_CFLAGS) - -# -DG_DISABLE_CAST_CHECKS - -DEFINES = \ - -DG_LOG_DOMAIN=\"Gimp-Config\" \ - $(GIMP_VERSION_DEFINES) - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $< diff --git a/app/core/Makefile.am b/app/core/Makefile.am index 5e29df8c13..a879932b07 100644 --- a/app/core/Makefile.am +++ b/app/core/Makefile.am @@ -399,7 +399,6 @@ libappcore_a_extra_sources = \ libappcore_a_SOURCES = $(libappcore_a_built_sources) $(libappcore_a_sources) EXTRA_DIST = \ - makefile.msc \ $(libappcore_a_extra_sources) # diff --git a/app/core/makefile.msc b/app/core/makefile.msc deleted file mode 100644 index 258c1ad112..0000000000 --- a/app/core/makefile.msc +++ /dev/null @@ -1,261 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = appcore -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -PKG_LINK = \ - $(GLIB_LIBS) $(GTK_PIXBUF_LIBS) $(INTL_LIBS) $(LIBART_LIBS) \ - $(PANGOWIN32_LIBS) $(GDK_PIXBUF_LIBS) $(GEGL_LIBS) \ -# $(PANGOFT2_LIBS) \ - \ - ..\..\regexrepl\regexrepl.lib \ - \ - ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ - ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ - ..\..\libgimpmath\gimpmath-$(PKG_VER).lib \ - ..\..\libgimpmodule\gimpmodule-$(PKG_VER).lib \ - \ - ..\config\appconfig-$(PKG_VER).lib \ - ..\base\appbase-$(PKG_VER).lib \ - ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ -# ..\vectors\appvectors.lib \ -# ..\text\apptext.lib \ -# ..\paint\apppaint.lib \ -# ..\pdb\apppdb.lib \ -# ..\plug-in\appplug-in.lib \ -# ..\file\appfile.lib \ -# ..\xcf\xcf.lib \ - -OBJECTS = \ - core-enums.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-resize.obj \ - gimp-transform-utils.obj \ - gimp-units.obj \ - gimp-user-install.obj \ - gimp-utils.obj \ - gimp.obj \ - gimparea.obj \ - gimpbrush-load.obj \ - gimpbrush.obj \ - gimpbrush-scale.obj \ - gimpbrushclipboard.obj \ - gimpbrushgenerated-load.obj \ - gimpbrushgenerated-save.obj \ - gimpbrushgenerated.obj \ - gimpbrushpipe-load.obj \ - gimpbrushpipe.obj \ - gimpbuffer.obj \ - gimpchannel-combine.obj \ - gimpchannel-select.obj \ - gimpchannel.obj \ - gimpchannelpropundo.obj \ - gimpchannelundo.obj \ - gimpcontainer-filter.obj \ - gimpcontainer.obj \ - gimpcontext.obj \ - gimpcoords.obj \ - gimpcurve.obj \ - gimpcurve-load.obj \ - gimpcurve-save.obj \ - gimpdashpattern.obj \ - gimpdata.obj \ - gimpdatafactory.obj \ - gimpdocumentlist.obj \ - gimpdrawable-blend.obj \ - gimpdrawable-bucket-fill.obj \ - gimpdrawable-combine.obj \ - gimpdrawable-convert.obj \ - gimpdrawable-desaturate.obj \ - gimpdrawable-equalize.obj \ - gimpdrawable-foreground-extract.obj \ - gimpdrawable-histogram.obj \ - gimpdrawable-invert.obj \ - gimpdrawable-levels.obj \ - gimpdrawable-offset.obj \ - gimpdrawable-operation.obj \ - gimpdrawable-preview.obj \ - 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 \ - gimpimage-contiguous-region.obj \ - gimpimage-convert.obj \ - gimpimage-crop.obj \ - gimpimage-duplicate.obj \ - gimpimage-flip.obj \ - gimpimage-grid.obj \ - gimpimage-guides.obj \ - gimpimage-item-list.obj \ - gimpimage-merge.obj \ - gimpimage-new.obj \ - gimpimage-pick-color.obj \ - gimpimage-preview.obj \ - gimpimage-quick-mask.obj \ - gimpimage-resize.obj \ - gimpimage-rotate.obj \ - gimpimage-sample-points.obj \ - gimpimage-scale.obj \ - gimpimage-snap.obj \ - gimpimage-undo-push.obj \ - gimpimage-undo.obj \ - 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 \ - gimppalette-load.obj \ - gimppalette-save.obj \ - gimppalette.obj \ - gimpparamspecs-desc.obj \ - gimpparamspecs.obj \ - gimpparasitelist.obj \ - gimppattern-load.obj \ - gimppattern.obj \ - gimppatternclipboard.obj \ - gimppdbprogress.obj \ - gimppickable.obj \ - gimppreviewcache.obj \ - 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 \ - gimpundo.obj \ - gimpundostack.obj \ - gimpunit.obj \ - gimpviewable.obj \ - gimpcurve-map.obj \ - gimpdrawable-brightness-contrast.obj \ - gimpdrawable-color-balance.obj \ - gimpdrawable-colorize.obj \ - gimpdrawable-curves.obj \ - gimpdrawable-hue-saturation.obj \ - gimpdrawable-posterize.obj \ - gimpdrawable-process.obj \ - gimpdrawable-shadow.obj \ - gimpdrawable-threshold.obj \ - gimpimagemapconfig.obj \ - gimptagged.obj \ - -OTHER_FILES = \ - \ - ..\floating_sel.obj \ - ..\gimpparasite.obj \ - ..\parasitelist.obj \ - ..\drawable.obj \ - ..\datafiles.obj \ - ..\undo.obj \ - ..\path.obj - - - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(PRJ_TOP) \ - -I$(PRJ_TOP)/app \ - $(GTK2_CFLAGS) \ - $(LIBART_CFLAGS) \ - $(GEGL_CFLAGS) - -DEFINES = \ - -DGIMP_COMPILATION \ - -DG_LOG_DOMAIN=\"Gimp-Core\" \ - $(GIMP_VERSION_DEFINES) - -all : \ - $(PRJ_TOP)\config.h \ - gimpmarshal.h \ - gimpmarshal.c \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -gimpmarshal.h : gimpmarshal.list - echo #ifndef __GIMP_MARSHAL_H__ > xgen-gmh - echo #define __GIMP_MARSHAL_H__ >> xgen-gmh - $(GLIB)\gobject\glib-genmarshal --nostdinc --prefix=gimp_marshal gimpmarshal.list --header >> xgen-gmh - echo #endif /* __GIMP_MARSHAL_H__ */ >> xgen-gmh - copy xgen-gmh gimpmarshal.h - -gimpmarshal.c : gimpmarshal.h gimpmarshal.list - echo #include "glib.h" > xgen-gmc - echo #include "glib-object.h" >> xgen-gmc - echo #include "gimpmarshal.h" >> xgen-gmc - $(GLIB)\gobject\glib-genmarshal --nostdinc --prefix=gimp_marshal gimpmarshal.list --body >> xgen-gmc - copy xgen-gmc gimpmarshal.c - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -gimpcore-$(PKG_VER).dll : $(DLLOBJS) gimpcore.def - $(CC) $(CFLAGS) -LD -Fegimpcore-$(PKG_VER).dll $(DLLOBJS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< - -clean :: - del gimpmarshal.c - del gimpmarshal.h diff --git a/app/dialogs/Makefile.am b/app/dialogs/Makefile.am index 6f6dc16fd5..bcbdaacfc3 100644 --- a/app/dialogs/Makefile.am +++ b/app/dialogs/Makefile.am @@ -97,8 +97,7 @@ libappdialogs_a_SOURCES = \ $(libappdialogs_a_built_sources) $(libappdialogs_a_sources) EXTRA_DIST = \ - authors.xsl \ - makefile.msc + authors.xsl $(srcdir)/about-dialog.c: authors.h diff --git a/app/dialogs/makefile.msc b/app/dialogs/makefile.msc deleted file mode 100644 index 7d39cf641c..0000000000 --- a/app/dialogs/makefile.msc +++ /dev/null @@ -1,89 +0,0 @@ -# autogenerated from automake.am with automake.py -# and slightly modified -PACKAGE = appdialogs -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(PRJ_TOP) \ - -I$(PRJ_TOP)/app \ - $(GTK2_CFLAGS) \ - -DEFINES = \ - -DG_LOG_DOMAIN=\"Gimp-Dialog\" - -PKG_LINK = \ - $(GLIB_LIBS) $(GTK2_LIBS) \ - ..\base\appbase-$(PKG_VER).lib \ - ..\core\appcore-$(PKG_VER).lib \ - -OBJECTS = \ - about-dialog.obj \ - channel-options-dialog.obj \ - convert-dialog.obj \ - dialogs-constructors.obj \ - dialogs.obj \ - fade-dialog.obj \ - file-open-dialog.obj \ - file-open-location-dialog.obj \ - file-save-dialog.obj \ - grid-dialog.obj \ - image-merge-layers-dialog.obj \ - image-new-dialog.obj \ - image-properties-dialog.obj \ - image-scale-dialog.obj \ - keyboard-shortcuts-dialog.obj \ - layer-add-mask-dialog.obj \ - layer-options-dialog.obj \ - module-dialog.obj \ - offset-dialog.obj \ - palette-import-dialog.obj \ - preferences-dialog.obj \ - print-size-dialog.obj \ - quit-dialog.obj \ - resize-dialog.obj \ - resolution-calibrate-dialog.obj \ - scale-dialog.obj \ - stroke-dialog.obj \ - template-options-dialog.obj \ - tips-dialog.obj \ - tips-parser.obj \ - user-install-dialog.obj \ - vectors-export-dialog.obj \ - vectors-import-dialog.obj \ - vectors-options-dialog.obj \ - -all : \ - $(PRJ_TOP)\config.h \ - authors.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(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) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(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 - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/display/Makefile.am b/app/display/Makefile.am index 6bee6f8a6b..7b65bb0d83 100644 --- a/app/display/Makefile.am +++ b/app/display/Makefile.am @@ -154,8 +154,6 @@ libappdisplay_a_SOURCES = \ $(libappdisplay_a_built_sources) \ $(libappdisplay_a_sources) -EXTRA_DIST = makefile.msc - # # rules to generate built sources # diff --git a/app/display/makefile.msc b/app/display/makefile.msc deleted file mode 100644 index e1973a9b90..0000000000 --- a/app/display/makefile.msc +++ /dev/null @@ -1,85 +0,0 @@ -# autogenerated from automake.am with automake.py -# and slightly modified -PACKAGE = appdisplay -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(PRJ_TOP) \ - -I$(PRJ_TOP)/app \ - $(GTK2_CFLAGS) \ - $(GEGL_CFLAGS) - -DEFINES = \ - -DG_LOG_DOMAIN=\"Gimp-Display\" - -PKG_LINK = \ - $(GLIB_LIBS) $(GTK2_LIBS) \ - ..\base\appbase-$(PKG_VER).lib \ - ..\core\appcore-$(PKG_VER).lib \ - -OBJECTS = \ - gimpcanvas.obj \ - gimpdisplay.obj \ - gimpdisplay-foreach.obj \ - gimpdisplay-handlers.obj \ - gimpdisplayshell.obj \ - gimpdisplayshell-appearance.obj \ - gimpdisplayshell-autoscroll.obj \ - gimpdisplayshell-callbacks.obj \ - gimpdisplayshell-close.obj \ - gimpdisplayshell-coords.obj \ - gimpdisplayshell-cursor.obj \ - gimpdisplayshell-dnd.obj \ - gimpdisplayshell-draw.obj \ - gimpdisplayshell-filter.obj \ - gimpdisplayshell-filter-dialog.obj \ - gimpdisplayshell-handlers.obj \ - gimpdisplayshell-layer-select.obj \ - gimpdisplayshell-preview.obj \ - gimpdisplayshell-progress.obj \ - gimpdisplayshell-render.obj \ - gimpdisplayshell-scale.obj \ - gimpdisplayshell-scroll.obj \ - gimpdisplayshell-selection.obj \ - gimpdisplayshell-title.obj \ - gimpdisplayshell-transform.obj \ - gimpnavigationeditor.obj \ - gimpscalecombobox.obj \ - gimpstatusbar.obj \ - gimpdisplayshell-icon.obj \ - gimpdisplayshell-scale-dialog.obj \ -# display-enums.obj \ - -all : \ - $(PRJ_TOP)\config.h \ - display-enums.obj \ - gimpdisplayoptions.obj \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(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 - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/file/Makefile.am b/app/file/Makefile.am index 34f05f045e..2f34fe986c 100644 --- a/app/file/Makefile.am +++ b/app/file/Makefile.am @@ -24,5 +24,3 @@ libappfile_a_SOURCES = \ file-utils.c \ file-utils.h \ gimp-file.h - -EXTRA_DIST = makefile.msc diff --git a/app/file/makefile.msc b/app/file/makefile.msc deleted file mode 100644 index b4a6d3ea85..0000000000 --- a/app/file/makefile.msc +++ /dev/null @@ -1,56 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = appfile -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -OBJECTS = \ - file-open.obj \ - file-procedure.obj \ - file-save.obj \ - file-utils.obj \ - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(PRJ_TOP) \ - -I$(PRJ_TOP)/app \ - $(GLIB_CFLAGS) \ - $(GDK_PIXBUF_CFLAGS) - -DEFINES = \ - -DG_LOG_DOMAIN=\"Gimp-File\" - -PKG_LINK = \ - $(GLIB_LIBS) $(INTL_LIBS) \ - ..\base\appbase-$(PKG_VER).lib \ - ..\core\appcore-$(PKG_VER).lib \ - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/gegl/makefile.msc b/app/gegl/makefile.msc deleted file mode 100644 index b616f94c2b..0000000000 --- a/app/gegl/makefile.msc +++ /dev/null @@ -1,88 +0,0 @@ -PACKAGE = appgegl -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -PKG_LINK = \ - $(GLIB_LIBS) $(GTK_PIXBUF_LIBS) $(INTL_LIBS) $(LIBART_LIBS) \ - $(PANGOWIN32_LIBS) $(GDK_PIXBUF_LIBS) $(GEGL_LIBS) \ - \ - ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ - ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ - ..\..\libgimpmath\gimpmath-$(PKG_VER).lib \ - ..\..\libgimpmodule\gimpmodule-$(PKG_VER).lib \ - \ - ..\config\appconfig-$(PKG_VER).lib \ - ..\base\appbase-$(PKG_VER).lib \ - ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ - -OBJECTS = \ - gimp-gegl-utils.obj \ - gimp-gegl.obj \ - gimpoperationcolorize.obj \ - gimpoperationdesaturate.obj \ - gimpoperationposterize.obj \ - gimpoperationthreshold.obj \ - gimpoperationtilesink.obj \ - gimpoperationtilesource.obj \ - gimpbrightnesscontrastconfig.obj \ - gimpcageconfig.obj \ - gimpcolorbalanceconfig.obj \ - gimpcolorizeconfig.obj \ - gimpcurvesconfig.obj \ - gimpdesaturateconfig.obj \ - gimphuesaturationconfig.obj \ - gimplevelsconfig.obj \ - gimpoperationcolorbalance.obj \ - gimpoperationcagecoefcalc.obj \ - gimpoperationcagepreview.obj \ - gimpoperationcagetransform.obj \ - gimpoperationcurves.obj \ - gimpoperationhuesaturation.obj \ - gimpoperationlevels.obj \ - gimpoperationpointfilter.obj \ - gimpposterizeconfig.obj \ - gimpthresholdconfig.obj \ - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(PRJ_TOP) \ - -I$(PRJ_TOP)/app \ - $(GTK2_CFLAGS) \ - $(GEGL_CFLAGS) - -DEFINES = \ - -DGIMP_COMPILATION \ - -DG_LOG_DOMAIN=\"Gimp-Gegl\" \ - $(GIMP_VERSION_DEFINES) - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -gimpcore-$(PKG_VER).dll : $(DLLOBJS) gimpcore.def - $(CC) $(CFLAGS) -LD -Fegimpcore-$(PKG_VER).dll $(DLLOBJS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am index 47f96a3dcd..10f9c3265d 100644 --- a/app/gui/Makefile.am +++ b/app/gui/Makefile.am @@ -46,9 +46,7 @@ libappgui_a_built_sources = gimpdbusservice-glue.h libappgui_a_SOURCES = $(libappgui_a_built_sources) $(libappgui_a_sources) EXTRA_DIST = \ - dbus-service.xml \ - makefile.msc - + dbus-service.xml # # rules to generate built sources diff --git a/app/gui/makefile.msc b/app/gui/makefile.msc deleted file mode 100644 index bf1a6176cb..0000000000 --- a/app/gui/makefile.msc +++ /dev/null @@ -1,79 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = appgui -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -PKG_LINK = \ - $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \ - $(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \ - $(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \ - $(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \ - ..\base\appbase-$(PKG_VER).lib \ - ..\core\appcore-$(PKG_VER).lib \ - ..\file\appfile-$(PKG_VER).lib \ -# ..\pdb\apppdb-$(PKG_VER).lib \ - ..\vectors\appvectors-$(PKG_VER).lib \ - ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ - ..\display\appdisplay-$(PKG_VER).lib \ - ..\widgets\appwidgets-$(PKG_VER).lib \ - -OBJECTS = \ - color-history.obj \ - gui.obj \ - gui-message.obj \ - gui-vtable.obj \ - session.obj \ - splash.obj \ - themes.obj \ - gimpdbusservice.obj \ - gui-unique.obj \ - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/app \ - $(GTK2_CFLAGS) \ - $(FONTCONFIG_CFLAGS) \ - -I$(includedir) - -DEFINES = \ - -DG_LOG_DOMAIN=\"Gimp-GUI\" \ - -DGIMP_COMMAND=\"gimp.exe\" - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(PACKAGE)-$(PKG_VER).exp : $(OBJECTS) $(PACKAGE).def - lib /def:$(PACKAGE).DEF /out:$(PACKAGE)-$(PKG_VER).exp $(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/makefile.msc b/app/makefile.msc deleted file mode 100644 index cd25b69e64..0000000000 --- a/app/makefile.msc +++ /dev/null @@ -1,168 +0,0 @@ -# autogenerated from automake.am with automake.py -# and slightly modified - -PACKAGE = gimp -TOP = ..\.. -PRJ_TOP = .. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -SUBDIRS = composite paint-funcs base config xcf core file text \ - dialogs display paint vectors pdb plug-in tools widgets gui \ - actions menus gegl - -sub-all: - for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d - -sub-one: - cd $(THIS) - nmake -nologo -f makefile.msc $(TARGET) - cd .. - -clean :: sub-clean - -sub-clean: - for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=clean - -LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG) - - -GIMP_CORE_OBJECTS = \ - widgets/widgets-enums.obj \ - display/display-enums.obj \ - display/gimpdisplayoptions.obj \ - \ - gimp-log.obj \ - \ - base/appbase.lib \ - composite/appcomposite.lib \ - config/appconfig.lib \ - core/appcore.lib \ - file/appfile.lib \ - gegl/appgegl.lib \ - paint/apppaint.lib \ - paint-funcs/apppaint-funcs.lib \ - pdb/apppdb.lib \ - plug-in/appplug-in.lib \ - text/apptext.lib \ - vectors/appvectors.lib \ - plug-in/appplug-in.lib \ - xcf/xcf.lib \ - -PKG_LINK = \ - $(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \ - $(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \ - $(top_builddir)/libgimpconfig/gimpconfig-$(LT_RELEASE).lib \ - $(top_builddir)/libgimpmath/gimpmath-$(LT_RELEASE).lib \ - $(top_builddir)/libgimpthumb/gimpthumb-$(LT_RELEASE).lib \ - $(top_builddir)/libgimpmodule/gimpmodule-$(LT_RELEASE).lib \ - $(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \ - $(GLIB_LIBS) $(GTHREAD_LIBS) \ - $(GTK2_LIBS) \ - $(GIMP_THREAD_LIBS) \ - $(GIMP_MP_LIBS) \ - $(CAIRO_LIBS) \ - $(INTL_LIBS) \ - $(LIBART_LIBS) \ - $(PANGOWIN32_LIBS) \ - $(PANGOCAIRO_LIBS) \ - $(GEGL_LIBS) $(BABL_LIBS) \ -!IFNDEF PANGO_WIN32_EXTENDED - $(PANGOFT2_LIBS) \ - $(FREETYPE2_LIBS) \ - $(FONTCONFIG_LIBS) \ -!ENDIF - -gimp_LDFLAGS = \ - -export-dynamic -export-symbols $(srcdir)/gimp.sym - -INCLUDES = \ - -DG_LOG_DOMAIN=\"Gimp\" \ - -DGIMP_APP_GLUE_COMPILATION \ - -I$(top_srcdir) \ - -I$(top_srcdir)/app \ - $(GTK2_CFLAGS) \ - $(GEGL_CFLAGS) \ -!IFNDEF PANGO_WIN32_EXTENDED - $(FONTCONFIG_CFLAGS) \ - $(FREETYPE2_CFLAGS) \ -!ENDIF - -I$(includedir) - -OBJECTS = \ - main.obj \ - batch.obj \ - errors.obj \ - sanity.obj \ - unique.obj \ - units.obj \ - version.obj \ - \ - actions/appactions.lib \ - menus/appmenus.lib \ - tools/apptools.lib \ - gui/appgui.lib \ - dialogs/appdialogs.lib \ - widgets/appwidgets.lib \ - display/appdisplay.lib \ - -app_console.obj : app.c - $(CC) $(CFLAGS) -DGIMP_CONSOLE_COMPILATION -c -Foapp_console.obj app.c - -EXTRA_DIST = \ - makefile.mingw \ - makefile.mingw.in \ - makefile.msc \ - gimp.rc \ - gimp.sym \ - fileicon.ico \ - wilber.ico \ - arch/i386/mmx/detect_mmx.S \ - arch/i386/mmx/paint_funcs_mmx.S \ - detect_mmx.S - -scriptdata = \ - - -all : \ - $(PRJ_TOP)\config.h \ - sub-all \ - gimp-core-$(PKG_VER).dll \ - $(PACKAGE).exe \ - gimp-console.exe - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -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 kernel32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def - -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 kernel32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) - -$(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 kernel32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) - -.c.obj : - $(CC) $(CFLAGS) -c $< diff --git a/app/menus/Makefile.am b/app/menus/Makefile.am index 7739acc28d..b6865f2a8e 100644 --- a/app/menus/Makefile.am +++ b/app/menus/Makefile.am @@ -32,5 +32,3 @@ libappmenus_a_SOURCES = \ window-menu.h \ windows-menu.c \ windows-menu.h - -EXTRA_DIST = makefile.msc diff --git a/app/menus/makefile.msc b/app/menus/makefile.msc deleted file mode 100644 index 8e1cd9c274..0000000000 --- a/app/menus/makefile.msc +++ /dev/null @@ -1,57 +0,0 @@ -PACKAGE = appmenus -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(PRJ_TOP) \ - -I$(PRJ_TOP)/app \ - $(GTK2_CFLAGS) \ - -DEFINES = \ - -DGIMP_COMPILATION \ - -DG_LOG_DOMAIN=\"Gimp-Menus\" - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -OBJECTS = \ - dockable-menu.obj \ - file-menu.obj \ - image-menu.obj \ - menus.obj \ - plug-in-menus.obj \ -# toolbox-menu.obj \ - tool-options-menu.obj \ - window-menu.obj \ - windows-menu.obj \ - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -gimpcore-$(PKG_VER).dll : $(DLLOBJS) gimpcore.def - $(CC) $(CFLAGS) -LD -Fegimpcore-$(PKG_VER).dll $(DLLOBJS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gimpcore.def - -.c.obj : - $(CC) $(CFLAGS) -c $< - diff --git a/app/paint-funcs/Makefile.am b/app/paint-funcs/Makefile.am index 1e412cc99b..c6f8b27720 100644 --- a/app/paint-funcs/Makefile.am +++ b/app/paint-funcs/Makefile.am @@ -31,5 +31,3 @@ libapppaint_funcs_a_SOURCES = \ scale-region.h \ subsample-region.c \ subsample-region.h - -EXTRA_DIST = makefile.msc diff --git a/app/paint-funcs/makefile.msc b/app/paint-funcs/makefile.msc deleted file mode 100644 index 53fc80502d..0000000000 --- a/app/paint-funcs/makefile.msc +++ /dev/null @@ -1,60 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = apppaint-funcs -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -OBJECTS = \ - paint-funcs.obj \ - reduce-region.obj \ - scale-region.obj \ - subsample-region.obj \ - -mmx_sources = \ - -# temporay hack, link appbase to find our required exports -PKG_LINK = \ - ..\base\appbase-$(PKG_VER).lib \ - ..\composite\appcomposite-$(PKG_VER).lib \ - $(GLIB_LIBS) \ - ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/app \ - $(GTK2_CFLAGS) \ - -I$(includedir) - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/paint/Makefile.am b/app/paint/Makefile.am index e72b5a6f34..8343c01559 100644 --- a/app/paint/Makefile.am +++ b/app/paint/Makefile.am @@ -84,8 +84,6 @@ libapppaint_a_built_sources = paint-enums.c libapppaint_a_SOURCES = $(libapppaint_a_built_sources) $(libapppaint_a_sources) -EXTRA_DIST = makefile.msc - # # rules to generate built sources # diff --git a/app/paint/makefile.msc b/app/paint/makefile.msc deleted file mode 100644 index 77cf01014b..0000000000 --- a/app/paint/makefile.msc +++ /dev/null @@ -1,95 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = apppaint -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -PKG_LINK = \ - $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \ - ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ - ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ - ..\..\libgimpmath\gimpmath-$(PKG_VER).lib \ - ..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib \ - ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ - ..\base\appbase-$(PKG_VER).lib \ - ..\core\appcore-$(PKG_VER).lib \ - ..\gui\appgui-$(PKG_VER).lib \ - ..\widgets\appwidgets-$(PKG_VER).lib \ - -OBJECTS = \ - gimp-paint.obj \ - gimpairbrush.obj \ - gimpairbrushoptions.obj \ - gimpbrushcore.obj \ - gimpclone.obj \ - gimpcloneoptions.obj \ - gimpconvolve.obj \ - gimpconvolveoptions.obj \ - gimpdodgeburn.obj \ - gimpdodgeburnoptions.obj \ - gimperaser.obj \ - gimperaseroptions.obj \ - gimpink.obj \ - gimpink-blob.obj \ - gimpinkundo.obj \ - gimpinkoptions.obj \ - gimpheal.obj \ - gimppaintbrush.obj \ - gimppaintcore.obj \ - gimppaintcore-stroke.obj \ - gimppaintcoreundo.obj \ - gimppaintoptions.obj \ - gimppencil.obj \ - gimppenciloptions.obj \ - gimpperspectiveclone.obj \ - gimpperspectivecloneoptions.obj \ - gimpsmudge.obj \ - gimpsmudgeoptions.obj \ - gimpsourcecore.obj \ - gimpsourceoptions.obj \ - paint-enums.obj \ - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/app \ - $(GTK2_CFLAGS) \ - -I$(includedir) -# $(FREETYPE2_CFLAGS) - -DEFINES = \ - -DG_LOG_DOMAIN=\"Gimp-Paint\" \ - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/pdb/Makefile.am b/app/pdb/Makefile.am index b146f6dc35..dd5551a78f 100644 --- a/app/pdb/Makefile.am +++ b/app/pdb/Makefile.am @@ -86,5 +86,3 @@ libappinternal_procs_a_SOURCES = \ undo-cmds.c \ unit-cmds.c \ vectors-cmds.c - -EXTRA_DIST = makefile.msc diff --git a/app/pdb/makefile.msc b/app/pdb/makefile.msc deleted file mode 100644 index a877479d21..0000000000 --- a/app/pdb/makefile.msc +++ /dev/null @@ -1,121 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = apppdb -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -PKG_LINK = \ - $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \ - ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ - ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ - ..\..\libgimpmath\gimpmath-$(PKG_VER).lib \ - ..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib \ - ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ - ..\base\appbase-$(PKG_VER).lib \ - ..\core\appcore-$(PKG_VER).lib \ - ..\gui\appgui-$(PKG_VER).lib \ - ..\tools\apptools-$(PKG_VER).lib \ - ..\widgets\appwidgets-$(PKG_VER).lib \ - - -OBJECTS_UI = \ - brush-select-cmds.obj \ - gradient-select-cmds.obj \ - palette-select-cmds.obj \ - pattern-select-cmds.obj \ - -OBJECTS = \ - $(OBJECTS_UI) \ - internal-procs.obj \ - brush-cmds.obj \ - brushes-cmds.obj \ - buffer-cmds.obj \ - channel-cmds.obj \ - color-cmds.obj \ - context-cmds.obj \ - convert-cmds.obj \ - display-cmds.obj \ - drawable-cmds.obj \ - drawable-transform-cmds.obj \ - edit-cmds.obj \ - fileops-cmds.obj \ - floating-sel-cmds.obj \ - fonts-cmds.obj \ - font-select-cmds.obj \ - gimprc-cmds.obj \ - gradient-cmds.obj \ - gradients-cmds.obj \ - grid-cmds.obj \ - guides-cmds.obj \ - help-cmds.obj \ - image-cmds.obj \ - layer-cmds.obj \ - message-cmds.obj \ - misc-cmds.obj \ - paint-tools-cmds.obj \ - palette-cmds.obj \ - palettes-cmds.obj \ - parasite-cmds.obj \ - paths-cmds.obj \ - pattern-cmds.obj \ - patterns-cmds.obj \ - plug-in-cmds.obj \ - procedural-db-cmds.obj \ - progress-cmds.obj \ - selection-cmds.obj \ - selection-tools-cmds.obj \ - text-layer-cmds.obj \ - text-tool-cmds.obj \ - transform-tools-cmds.obj \ - undo-cmds.obj \ - unit-cmds.obj \ - vectors-cmds.obj \ - \ - gimppdb.obj \ - gimppdb-utils.obj \ - gimppdberror.obj \ - \ - gimp-pdb-compat.obj \ - gimppdb-query.obj \ - gimpprocedure.obj \ - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/app \ - $(GLIB_CFLAGS) $(GDK_PIXBUF_CFLAGS) \ - -I$(includedir) - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $< diff --git a/app/plug-in/Makefile.am b/app/plug-in/Makefile.am index 8b14512dab..bd9053e47b 100644 --- a/app/plug-in/Makefile.am +++ b/app/plug-in/Makefile.am @@ -79,8 +79,6 @@ libappplug_in_a_SOURCES = \ plug-in-icc-profile.c \ plug-in-icc-profile.h -EXTRA_DIST = makefile.msc - # # rules to generate built sources # diff --git a/app/plug-in/makefile.msc b/app/plug-in/makefile.msc deleted file mode 100644 index 488d1eb1e3..0000000000 --- a/app/plug-in/makefile.msc +++ /dev/null @@ -1,80 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = appplug-in -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -PKG_LINK = \ - $(GLIB_LIBS) \ - ..\config\appconfig-$(PKG_VER).lib \ - ..\base\appbase-$(PKG_VER).lib \ - ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ - \ - ..\core\appcore-$(PKG_VER).lib - -OBJECTS = \ - gimpenvirontable.obj \ - gimpinterpreterdb.obj \ - gimpplugin.obj \ - gimppluginerror.obj \ - gimpplugin-cleanup.obj \ - gimpplugin-context.obj \ - gimpplugindebug.obj \ - gimpplugindef.obj \ - gimppluginmanager.obj \ - gimppluginmanager-call.obj \ - gimppluginmanager-data.obj \ - gimppluginmanager-file.obj \ - gimppluginmanager-help-domain.obj \ - gimppluginmanager-history.obj \ - gimppluginmanager-locale-domain.obj \ - gimppluginmanager-menu-branch.obj \ - gimppluginmanager-query.obj \ - gimppluginmanager-restore.obj \ - gimpplugin-message.obj \ - gimppluginprocedure.obj \ - gimppluginprocframe.obj \ - gimpplugin-progress.obj \ - gimppluginshm.obj \ - gimptemporaryprocedure.obj \ - \ - plug-in-enums.obj \ - plug-in-icc-profile.obj \ - plug-in-menu-path.obj \ - plug-in-params.obj \ - plug-in-rc.obj - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(PRJ_TOP) \ - -I$(PRJ_TOP)/app \ - $(GTK2_CFLAGS) \ - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/text/Makefile.am b/app/text/Makefile.am index 27a47907f7..779abf6a58 100644 --- a/app/text/Makefile.am +++ b/app/text/Makefile.am @@ -51,8 +51,6 @@ libapptext_a_built_sources = text-enums.c libapptext_a_SOURCES = $(libapptext_a_built_sources) $(libapptext_a_sources) -EXTRA_DIST = makefile.msc - # # rules to generate built sources # diff --git a/app/text/makefile.msc b/app/text/makefile.msc deleted file mode 100644 index 84c64f8c99..0000000000 --- a/app/text/makefile.msc +++ /dev/null @@ -1,79 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = apptext -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -PKG_LINK = \ - $(GLIB_LIBS) $(PANGOFT2_LIBS) \ - $(FREETYPE2_LIBS) \ - ..\config\appconfig-$(PKG_VER).lib \ - ..\base\appbase-$(PKG_VER).lib \ - ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ - \ - ..\core\appcore-$(PKG_VER).lib - -OBJECTS = \ - gimp-fonts.obj \ - gimpfont.obj \ - gimpfont-utils.obj \ - gimpfontlist.obj \ - gimptext.obj \ - gimptext-parasite.obj \ -!IFNDEF PANGO_WIN32_EXTENDED - gimptext-bitmap.obj \ - gimptext-vectors.obj \ -!ELSE - gimptext-bitmap-win32.obj \ - gimptext-vectors-win32.obj \ -!ENDIF - gimptext-compat.obj \ - gimptext-xlfd.obj \ - gimptextlayer.obj \ - gimptextlayer-transform.obj \ - gimptextlayer-xcf.obj \ - gimptextlayout.obj \ - gimptextlayout-render.obj \ - gimptextundo.obj \ - text-enums.obj \ - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -DUSE_PANGO_WIN32 \ - -I$(PRJ_TOP) \ - -I$(PRJ_TOP)/app \ - $(GLIB_CFLAGS) \ - $(FONTCONFIG_CFLAGS) \ - $(PANGO_CFLAGS) $(GTK2_CFLAGS) \ -!IFNDEF PANGO_WIN32_EXTENDED - $(FREETYPE2_CFLAGS) -!ENDIF - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $< diff --git a/app/tools/Makefile.am b/app/tools/Makefile.am index d0f3624229..7f161d0b86 100644 --- a/app/tools/Makefile.am +++ b/app/tools/Makefile.am @@ -201,8 +201,6 @@ libapptools_a_built_sources = tools-enums.c libapptools_a_SOURCES = $(libapptools_a_built_sources) $(libapptools_a_sources) -EXTRA_DIST = makefile.msc - # # rules to generate built sources # diff --git a/app/tools/makefile.msc b/app/tools/makefile.msc deleted file mode 100644 index afe5c20d9d..0000000000 --- a/app/tools/makefile.msc +++ /dev/null @@ -1,150 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = apptools -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -PKG_LINK = \ - $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \ - ..\..\libgimpbase\gimpbase-$(PKG_VER).lib \ - ..\..\libgimpcolor\gimpcolor-$(PKG_VER).lib \ - ..\..\libgimpmath\gimpmath-$(PKG_VER).lib \ - ..\..\libgimpwidgets\gimpwidgets-$(PKG_VER).lib \ - ..\paint-funcs\apppaint-funcs-$(PKG_VER).lib \ - ..\base\appbase-$(PKG_VER).lib \ - ..\core\appcore-$(PKG_VER).lib \ - ..\gui\appgui-$(PKG_VER).lib \ - ..\widgets\appwidgets-$(PKG_VER).lib \ - -OBJECTS = \ - gimpairbrushtool.obj \ - gimpaligntool.obj \ - gimpalignoptions.obj \ - gimpblendoptions.obj \ - gimpblendtool.obj \ - gimpbrightnesscontrasttool.obj \ - gimpbrushtool.obj \ - gimpbucketfilloptions.obj \ - gimpbucketfilltool.obj \ - gimpbycolorselecttool.obj \ - gimpcagetool.obj \ - gimpcageoptions.obj \ - gimpclonetool.obj \ - gimpcolorbalancetool.obj \ - gimpcolorizetool.obj \ - gimpcoloroptions.obj \ - gimpcolorpickeroptions.obj \ - gimpcolorpickertool.obj \ - gimpcolortool.obj \ - gimpconvolvetool.obj \ - gimpcropoptions.obj \ - gimpcroptool.obj \ - gimpcurvestool.obj \ - gimpdodgeburntool.obj \ - gimpdrawtool.obj \ - gimpeditselectiontool.obj \ - gimpellipseselecttool.obj \ - gimperasertool.obj \ - gimpflipoptions.obj \ - gimpfliptool.obj \ - gimpforegroundselectoptions.obj \ - gimpforegroundselecttool.obj \ - gimpforegroundselecttoolundo.obj \ - gimpfreeselecttool.obj \ - gimpfuzzyselecttool.obj \ - gimphealtool.obj \ - gimphistogramoptions.obj \ - gimphuesaturationtool.obj \ - gimpimagemapoptions.obj \ - gimpimagemaptool.obj \ - gimpinkoptions-gui.obj \ - gimpinktool.obj \ - gimpiscissorstool.obj \ - gimplevelstool.obj \ - gimpmagnifyoptions.obj \ - gimpmagnifytool.obj \ - gimpmeasureoptions.obj \ - gimpmeasuretool.obj \ - gimpmoveoptions.obj \ - gimpmovetool.obj \ - gimppaintbrushtool.obj \ - gimppaintoptions-gui.obj \ - gimppainttool.obj \ - gimppenciltool.obj \ - gimpperspectivetool.obj \ - gimpperspectiveclonetool.obj \ - gimpposterizetool.obj \ - gimprectangleoptions.obj \ - gimprectangletool.obj \ - gimprectangleselectoptions.obj \ - gimprectangleselecttool.obj \ - gimpregionselecttool.obj \ - gimprotatetool.obj \ - gimpscaletool.obj \ - gimpselectionoptions.obj \ - gimpselectiontool.obj \ - gimpsheartool.obj \ - gimpsourcetool.obj \ - gimpsmudgetool.obj \ - gimptextoptions.obj \ - gimptexttool.obj \ - gimpthresholdtool.obj \ - gimptool.obj \ - gimptoolcontrol.obj \ - gimptooloptions-gui.obj \ - gimptransformoptions.obj \ - gimptransformtool.obj \ - gimptransformtoolundo.obj \ - gimpvectoroptions.obj \ - gimpvectortool.obj \ - tool_manager.obj \ - gimp-tools.obj \ - tools-enums.obj \ - tools-utils.obj \ - gimpdesaturatetool.obj \ - gimpgegltool.obj \ - gimpimagemaptool-settings.obj \ - gimpiscissorsoptions.obj \ - gimpregionselectoptions.obj \ - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/app \ - $(GTK2_CFLAGS) $(FREETYPE2_CFLAGS) \ - $(GEGL_CFLAGS) \ - -I$(includedir) - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/vectors/Makefile.am b/app/vectors/Makefile.am index eb2274b5aa..86e37475f3 100644 --- a/app/vectors/Makefile.am +++ b/app/vectors/Makefile.am @@ -44,5 +44,3 @@ libappvectors_a_SOURCES = \ gimpvectorspropundo.h \ gimpvectorsundo.c \ gimpvectorsundo.h - -EXTRA_DIST = makefile.msc diff --git a/app/vectors/makefile.msc b/app/vectors/makefile.msc deleted file mode 100644 index 7253ac7807..0000000000 --- a/app/vectors/makefile.msc +++ /dev/null @@ -1,66 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = appvectors -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -PKG_LINK = \ - $(GLIB_LIBS) \ - ..\base\appbase-$(PKG_VER).lib \ - \ -# ..\core\appcore-$(PKG_VER).lib \ - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/app \ - $(GTK2_CFLAGS) \ - -I$(includedir) \ - -OBJECTS = \ - gimpanchor.obj \ - gimpbezierstroke.obj \ - gimpstroke-new.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 \ - $(PACKAGE).lib \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am index 9c27642e55..f6b3fa5c1c 100644 --- a/app/widgets/Makefile.am +++ b/app/widgets/Makefile.am @@ -412,8 +412,6 @@ libappwidgets_a_built_sources = widgets-enums.c libappwidgets_a_SOURCES = \ $(libappwidgets_a_built_sources) $(libappwidgets_a_sources) -EXTRA_DIST = makefile.msc - # # rules to generate built sources diff --git a/app/widgets/makefile.msc b/app/widgets/makefile.msc deleted file mode 100644 index db75688d06..0000000000 --- a/app/widgets/makefile.msc +++ /dev/null @@ -1,231 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = appwidgets -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) - -PKG_LINK = \ - $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) \ - $(top_builddir)/libgimpbase/gimpbase-$(LT_RELEASE).lib \ - $(top_builddir)/libgimpcolor/gimpcolor-$(LT_RELEASE).lib \ - $(top_builddir)/libgimpwidgets/gimpwidgets-$(LT_RELEASE).lib \ - ..\base\appbase-$(PKG_VER).lib \ - ..\core\appcore-$(PKG_VER).lib \ - ..\config\appconfig-$(PKG_VER).lib \ - ..\file\appfile-$(PKG_VER).lib \ -# ..\pdb\apppdb-$(PKG_VER).lib \ -# ..\gui\appgui-$(PKG_VER).lib - -OBJECTS = \ - gimpaction.obj \ - gimpactionfactory.obj \ - gimpactiongroup.obj \ - gimpactionview.obj \ - gimpblobeditor.obj \ - gimpbrusheditor.obj \ - gimpbrushfactoryview.obj \ - gimpbrushselect.obj \ - gimpbufferview.obj \ - gimpcellrendererdashes.obj \ - gimpcellrendererviewable.obj \ - gimpchanneltreeview.obj \ - gimpclipboard.obj \ - gimpcolorbar.obj \ - gimpcolordialog.obj \ - gimpcolordisplayeditor.obj \ - gimpcoloreditor.obj \ - gimpcolorframe.obj \ - gimpcolormapeditor.obj \ - gimpcolorpanel.obj \ - gimpcolorselectorpalette.obj \ - gimpcomponenteditor.obj \ - gimpcontainerbox.obj \ - gimpcontainercombobox.obj \ - gimpcontainereditor.obj \ - gimpcontainerentry.obj \ - gimpcontainergridview.obj \ - gimpcontainerpopup.obj \ - gimpcontainertreeview-dnd.obj \ - gimpcontainertreeview.obj \ - gimpcontainerview-utils.obj \ - gimpcontainerview.obj \ - gimpcontrollereditor.obj \ - gimpcontrollerinfo.obj \ - gimpcontrollerkeyboard.obj \ - gimpcontrollerlist.obj \ - gimpcontrollers.obj \ - gimpcontrollerwheel.obj \ - gimpcursor.obj \ - gimpcursorview.obj \ - gimpcurveview.obj \ - gimpdasheditor.obj \ - gimpdataeditor.obj \ - gimpdatafactoryview.obj \ - gimpdeviceinfo.obj \ - gimpdevices.obj \ - gimpdevicestatus.obj \ - gimpdialogfactory.obj \ - gimpdnd-xds.obj \ - gimpdnd.obj \ - gimpdock.obj \ - gimpdockable.obj \ - gimpdockbook.obj \ - gimpdocked.obj \ - gimpdockseparator.obj \ - gimpdocumentview.obj \ - gimpdrawabletreeview.obj \ - gimpeditor.obj \ - gimpenumaction.obj \ - gimperrorconsole.obj \ - gimperrordialog.obj \ - gimpfgbgeditor.obj \ - gimpfgbgview.obj \ - gimpfiledialog.obj \ - gimpfileprocview.obj \ - gimpfontselect.obj \ - gimpfontview.obj \ - gimpgradienteditor.obj \ - gimpgradientselect.obj \ - gimpgrideditor.obj \ - gimphandlebar.obj \ - gimphelp.obj \ - gimphistogrambox.obj \ - gimphistogrameditor.obj \ - gimphistogramview.obj \ - gimpimagecommenteditor.obj \ - gimpimagedock.obj \ - gimpimageeditor.obj \ - gimpimageparasiteview.obj \ - gimpimageprofileview.obj \ - gimpimagepropview.obj \ - gimpimageview.obj \ - gimpitemtreeview.obj \ - gimplayertreeview.obj \ - gimpmenudock.obj \ - gimpmenufactory.obj \ - gimpmessagebox.obj \ - gimpmessagedialog.obj \ - gimpnavigationview.obj \ - gimppaletteeditor.obj \ - gimppaletteselect.obj \ - gimppaletteview.obj \ - gimppatternfactoryview.obj \ - gimppatternselect.obj \ - gimppdbdialog.obj \ - gimppixbuf.obj \ - gimppluginaction.obj \ - gimpprofilechooserdialog.obj \ - gimpprogressbox.obj \ - gimpprogressdialog.obj \ - gimppropwidgets.obj \ - gimprender.obj \ - gimpsamplepointeditor.obj \ - gimpselectiondata.obj \ - gimpselectioneditor.obj \ - gimpsessioninfo.obj \ - gimpsessioninfo-aux.obj \ - gimpsessioninfo-book.obj \ - gimpsessioninfo-dock.obj \ - gimpsessioninfo-dockable.obj \ - gimpsizebox.obj \ - gimpstringaction.obj \ - gimpstrokeeditor.obj \ - gimptemplateeditor.obj \ - gimptemplateview.obj \ - gimptexteditor.obj \ - gimpthumbbox.obj \ - gimptoolbox-color-area.obj \ - gimptoolbox-dnd.obj \ - gimptoolbox-image-area.obj \ - gimptoolbox-indicator-area.obj \ - gimptoolbox.obj \ - gimptooldialog.obj \ - gimptooloptionseditor.obj \ - gimptoolview.obj \ - gimpuimanager.obj \ - gimpundoeditor.obj \ - gimpunitcombobox.obj \ - gimpunitstore.obj \ - gimpvectorstreeview.obj \ - gimpviewablebox.obj \ - gimpviewablebutton.obj \ - gimpviewabledialog.obj \ - gimpviewrenderer-frame.obj \ - gimpviewrenderer.obj \ - gimpviewrendererbuffer.obj \ - gimpviewrendererimage.obj \ - gimpviewrendererimagefile.obj \ - gimpviewrendererlayer.obj \ - gimpviewrendererpalette.obj \ - gimpviewrenderervectors.obj \ - gimpwidgets-constructors.obj \ - gimpwidgets-utils.obj \ - gimpview-popup.obj \ - gimpview.obj \ - gimpviewrenderer-utils.obj \ - gimpviewrendererbrush.obj \ - gimpviewrendererdrawable.obj \ - gimpviewrenderergradient.obj \ - gtkhwrapbox.obj \ - gtkvwrapbox.obj \ - gtkwrapbox.obj \ - gimpactioneditor.obj \ - gimpcairo-wilber.obj \ - gimplanguageentry.obj \ - gimplanguagestore-parser.obj \ - gimplanguagestore.obj \ - gimpradioaction.obj \ - gimpscalebutton.obj \ - gimpsettingsbox.obj \ - gimpsettingseditor.obj \ - gimptoggleaction.obj \ - gimpwindow.obj \ - gtkscalebutton.obj \ -# widgets-enums.obj \ - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I $(PRJ_TOP) \ - -I $(PRJ_TOP)/app \ - $(GTK2_CFLAGS) \ - -I$(includedir) - -#$(FREETYPE2_CFLAGS) - -DEFINES = \ - -DG_LOG_DOMAIN=\"Gimp-Widgets\" -DUSE_PANGO_WIN32 - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ - widgets-enums.obj \ -!IFDEF DLLGIMP - $(PACKAGE)-$(PKG_VER).dll -!ENDIF - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(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 - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/app/xcf/Makefile.am b/app/xcf/Makefile.am index 1efa6bf5b2..32f1cb4c93 100644 --- a/app/xcf/Makefile.am +++ b/app/xcf/Makefile.am @@ -29,5 +29,3 @@ libappxcf_a_SOURCES = \ xcf-seek.h \ xcf-write.c \ xcf-write.h - -EXTRA_DIST = makefile.msc diff --git a/app/xcf/makefile.msc b/app/xcf/makefile.msc deleted file mode 100644 index 764231467b..0000000000 --- a/app/xcf/makefile.msc +++ /dev/null @@ -1,53 +0,0 @@ -# autogenerated from automake.am with automake.py -PACKAGE = xcf -TOP = ..\..\.. -PRJ_TOP = ..\.. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/app \ - $(GTK2_CFLAGS) \ - -I$(includedir) \ - -OBJECTS = \ - xcf.obj \ - xcf-load.obj \ - xcf-read.obj \ - xcf-save.obj \ - xcf-seek.obj \ - xcf-write.obj \ - -noinst_LIBRARIES = \ - libappxcf.a - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE).lib \ -# $(PACKAGE)-$(PKG_VER).dll - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $< diff --git a/cursors/Makefile.am b/cursors/Makefile.am index 7d1b9b1c85..02dcd7ecac 100644 --- a/cursors/Makefile.am +++ b/cursors/Makefile.am @@ -127,8 +127,7 @@ COLOR_PICKER_IMAGES = \ EXTRA_DIST = \ $(CURSOR_IMAGES) \ - gimp-tool-cursors.xcf \ - makefile.msc + gimp-tool-cursors.xcf noinst_DATA = \ gimp-tool-cursors.h \ diff --git a/cursors/makefile.msc b/cursors/makefile.msc deleted file mode 100644 index 7a42df3d91..0000000000 --- a/cursors/makefile.msc +++ /dev/null @@ -1,76 +0,0 @@ -CURSOR_LIST = \ - cursor_bad cursor-bad.png \ - cursor_color_picker cursor-color-picker.png \ - cursor_move cursor-move.png \ - \ - cursor_corner_top_left cursor-corner-top-left.png \ - cursor_corner_top_right cursor-corner-top-right.png \ - cursor_corner_bottom_left cursor-corner-bottom-left.png \ - cursor_corner_bottom_right cursor-corner-bottom-right.png \ - cursor_side_top cursor-side-top.png \ - cursor_side_bottom cursor-side-bottom.png \ - cursor_side_left cursor-side-left.png \ - cursor_side_right cursor-side-right.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_bad modifier-bad.png \ - modifier_control modifier-control.png \ - modifier_foreground modifier-foreground.png \ - modifier_intersect modifier-intersect.png \ - modifier_join modifier-join.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 \ - modifier_select modifier-select.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_heal tool-heal.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_paths_anchor tool-paths-anchor.png \ - tool_paths_control tool-paths-control.png \ - tool_paths_segment tool-paths-segment.png \ - tool_pencil tool-pencil.png \ - tool_perspective tool-perspective.png \ - tool_polygon_select tool-polygon-select.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 - -clean : - del gimp-tool-cursors.h diff --git a/gimpdefs.msc b/gimpdefs.msc deleted file mode 100644 index 0c9ce97440..0000000000 --- a/gimpdefs.msc +++ /dev/null @@ -1,25 +0,0 @@ -# common GIMP definitions for msvc/win32 build -# to keep them in one place - -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.5 - -GIMP_VERSION_DEFINES = \ - -DGIMP_PACKAGE=\"gimp-2.6\" \ - -DGIMP_DATA_VERSION=\"2.6\" \ - -DGIMP_PLUGIN_VERSION=\"2.6\" \ - -DGIMP_SYSCONF_VERSION=\"2.6\" \ - -DGIMP_APP_VERSION=\"2.6\" \ - -DGIMP_APP_VERSION_STRING=\"2.6\" - -# Build app/* as DLLs; don't define this, it doesn't work yet. -#DLLGIMP = 1 - -# This one doesn't work either withot patching Pango and GIMP -# Tries to not depend on ft2 -#PANGO_WIN32_EXTENDED = 1 diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 45434d468d..6e728966bb 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -399,7 +399,6 @@ libgimpui_2_0_la_DEPENDENCIES = \ EXTRA_DIST = \ COPYING \ - makefile.msc \ gimp.def \ gimpui.def \ $(libgimp_2_0_la_extra_sources) \ diff --git a/libgimp/makefile.msc b/libgimp/makefile.msc deleted file mode 100644 index 417d1a7e77..0000000000 --- a/libgimp/makefile.msc +++ /dev/null @@ -1,215 +0,0 @@ -## Makefile for building the GIMP DLLs and LIBs with Microsoft C. -## Use: nmake -f makefile.msc - -TOP = ..\.. -!INCLUDE $(TOP)\glib\build\win32\make.msc -!INCLUDE ..\gimpdefs.msc - -################################################################ - -# Nothing much configurable below - -INCLUDES = -I.. -DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DEPCFLAGS = $(INTL_CFLAGS) $(GLIB_CFLAGS) $(GTK2_CFLAGS) -DEPLIBS = $(GLIB_LIBS) $(INTL_LIBS) - -# CFLAGS = $(GLIB_CFLAGS) - -!IFNDEF DEBUG -# Debug Release! -OPTIMIZE = -Zi -MD -!ENDIF - -all : \ - ..\config.h \ - gimpenums.c \ - gimpuimarshal.c \ - gimp-$(GIMP_VER).dll \ - gimpui-$(GIMP_VER).dll - -..\config.h : ..\config.h.win32 - copy ..\config.h.win32 ..\config.h - -install : all - $(INSTALL) gimp-$(GIMP_VER).dll $(BIN) - $(INSTALL) gimpui-$(GIMP_VER).dll $(BIN) - -PDB_WRAPPERS_O = \ - gimpbrush_pdb.obj \ - gimpbrushes_pdb.obj \ - gimpbrushselect_pdb.obj \ - gimpbuffer_pdb.obj \ - gimpchannel_pdb.obj \ - gimpcolor_pdb.obj \ - gimpcontext_pdb.obj \ - gimpconvert_pdb.obj \ - gimpdisplay_pdb.obj \ - gimpdrawable_pdb.obj \ - gimpdrawabletransform_pdb.obj \ - gimpedit_pdb.obj \ - gimpfileops_pdb.obj \ - gimpfloatingsel_pdb.obj \ - gimpfonts_pdb.obj \ - gimpfontselect_pdb.obj \ - gimpgimprc_pdb.obj \ - gimpgradient_pdb.obj \ - gimpgradients_pdb.obj \ - gimpgradientselect_pdb.obj \ - gimpgrid_pdb.obj \ - gimpguides_pdb.obj \ - gimphelp_pdb.obj \ - gimpimage_pdb.obj \ - gimplayer_pdb.obj \ - gimpmessage_pdb.obj \ - gimpmisc_pdb.obj \ - gimppainttools_pdb.obj \ - gimppalette_pdb.obj \ - gimppalettes_pdb.obj \ - gimppaletteselect_pdb.obj \ - gimpparasite_pdb.obj \ - gimppaths_pdb.obj \ - gimppattern_pdb.obj \ - gimppatterns_pdb.obj \ - gimppatternselect_pdb.obj \ - gimpplugin_pdb.obj \ - gimpproceduraldb_pdb.obj \ - gimpprogress_pdb.obj \ - gimpselection_pdb.obj \ - gimpselectiontools_pdb.obj \ - gimptextlayer_pdb.obj \ - gimptexttool_pdb.obj \ - gimptransformtools_pdb.obj \ - gimpundo_pdb.obj \ - gimpunit_pdb.obj \ - gimpvectors_pdb.obj \ - - -gimp_OBJECTS = \ - gimp.obj \ - gimpenums.obj \ - $(PDB_WRAPPERS_O) \ - gimpbrushes.obj \ - gimpbrushselect.obj \ - gimpchannel.obj \ - gimpdrawable.obj \ - gimpfontselect.obj \ - gimpgimprc.obj \ - gimpgradients.obj \ - gimpgradientselect.obj \ - gimpimage.obj \ - gimplayer.obj \ - gimppalette.obj \ - gimppalettes.obj \ - gimppaletteselect.obj \ - gimppatterns.obj \ - gimppatternselect.obj \ - gimppixelfetcher.obj \ - gimppixelrgn.obj \ - gimpplugin.obj \ - gimpproceduraldb.obj \ - gimpprogress.obj \ - gimpregioniterator.obj \ - gimpselection.obj \ - gimptile.obj \ - gimpunitcache.obj \ - -#? gimpprotocol.obj \ - -gimpenums.c: gimpenums.h gimpenums.c.tail - perl ..\tools\gimp-mkenums \ - --fhead "#include \"config.h\"\n#include \n#include \"libgimpbase/gimpbase.h\"\n#include \"gimpenums.h\"" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "GType\n@enum_name@_get_type (void)\n{\n static const G@Type@Value values[] =\n {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n" \ - --dhead " static const Gimp@Type@Desc descs[] =\n {" \ - --dprod " { @VALUENAME@, @valuedesc@, @valuehelp@ }," \ - --dtail " { 0, NULL, NULL }\n };\n\n static GType type = 0;\n\n \ - if (! type)\n {\n type = g_@type@_register_static (\"@EnumName@\", values);\n \ - gimp_type_set_translation_domain (type, GETTEXT_PACKAGE \"-libgimp\");\n \ - gimp_@type@_set_value_descriptions (type, descs);\n }\n\n return type;\n}\n" \ - gimpenums.h > xgen-cec - type gimpenums.c.tail >> xgen-cec - copy xgen-cec gimpenums.c - del xgen-cec - -gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def - $(CC) $(CFLAGS) -LD -Fegimp-$(GIMP_VER).dll $(gimp_OBJECTS) $(DEPLIBS) \ - ..\libgimpconfig\gimpconfig-$(GIMP_VER).lib \ - ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ - ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ - $(LDFLAGS) user32.lib /def:gimp.def - -# Pass -DLIBGIMP_COMPILATION when compiling gimp.c - -gimp.obj : gimp.c - $(CC) $(CFLAGS) -c -DLIBGIMP_COMPILATION gimp.c - -gimpui_OBJECTS = \ - gimpaspectpreview.obj \ - gimpbrushmenu.obj \ - gimpbrushselectbutton.obj \ - gimpdrawablepreview.obj \ - gimpexport.obj \ - gimpfontmenu.obj \ - gimpfontselect_pdb.obj \ - gimpfontselectbutton.obj \ - gimpgradientmenu.obj \ - gimpgradientselectbutton.obj \ - gimpimagecombobox.obj \ - gimpitemcombobox.obj \ - gimpmenu.obj \ - gimppalettemenu.obj \ - gimppaletteselectbutton.obj \ - gimppatternmenu.obj \ - gimppatternselectbutton.obj \ - gimppixbuf.obj \ - gimpprocbrowserdialog.obj \ - gimpprocview.obj \ - gimpprogressbar.obj \ - gimpselectbutton.obj \ - gimpui.obj \ - gimpuimarshal.obj \ - gimpzoompreview.obj \ - -gimpuimarshal.h : gimpuimarshal.list - $(GLIB)\gobject\glib-genmarshal --prefix=_gimpui_marshal gimpuimarshal.list --header >gimpuimarshal.h - -gimpuimarshal.c : gimpuimarshal.list gimpuimarshal.h - $(GLIB)\gobject\glib-genmarshal --prefix=_gimpui_marshal gimpuimarshal.list --body >gimpuimarshal.c - - -gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def - $(CC) $(CFLAGS) -LD -Fegimpui-$(GIMP_VER).dll $(gimpui_OBJECTS) \ - gimp-$(GIMP_VER).lib ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ - ..\libgimpmodule\gimpmodule-$(GIMP_VER).lib \ - ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ - ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ - $(GTK2_LIBS) $(INTL_LIBS) $(DEPLIBS) $(LDFLAGS) /def:gimpui.def - -# gimpwidgets only for gimp_dialog_new - -gimpmenu.obj : gimpmenu.c - $(CC) $(CFLAGS) -c gimpmenu.c - -gimpbrushmenu.obj : gimpbrushmenu.c - $(CC) $(CFLAGS) -c gimpbrushmenu.c - -gimpgradientmenu.obj : gimpgradientmenu.c - $(CC) $(CFLAGS) -c gimpgradientmenu.c - -gimppatternmenu.obj : gimppatternmenu.c - $(CC) $(CFLAGS) -c gimppatternmenu.c - -# General rule for compiling, used by the objects that don't go into -# gimp-$(GIMP_VER).dll. -.c.obj: - $(CC) $(CFLAGS) -c $< - -clean:: - del *.exe - del *.obj - del *.exp - del *.err - del *.map diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am index 100b39c654..89a81c00cc 100644 --- a/libgimpbase/Makefile.am +++ b/libgimpbase/Makefile.am @@ -65,7 +65,6 @@ INCLUDES = \ -I$(includedir) EXTRA_DIST = \ - makefile.msc \ gimpbase.def lib_LTLIBRARIES = libgimpbase-2.0.la diff --git a/libgimpbase/makefile.msc b/libgimpbase/makefile.msc deleted file mode 100644 index 884cb11258..0000000000 --- a/libgimpbase/makefile.msc +++ /dev/null @@ -1,89 +0,0 @@ -# autogenerated from automake.am with automake.py -# and slightly modified -TOP = ..\.. -PRJ_TOP = .. -PACKAGE = gimpbase -!INCLUDE $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DDATADIR=\"\" -DSYSCONFDIR=\"\" \ - -DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\" \ - $(GIMP_VERSION_DEFINES) - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intl \ - -I../intl \ - $(GLIB_CFLAGS) \ - -I$(includedir) \ - -PKG_LINK = \ - $(GLIB_LIBS) $(INTL_LIBS) - -OBJECTS = \ - gimpbaseenums.obj \ - gimpbase-private.obj \ - gimpbasetypes.obj \ - gimpchecks.obj \ - gimpcpuaccel.obj \ - gimpdatafiles.obj \ - gimpenv.obj \ - gimpmemsize.obj \ - gimpparasite.obj \ - gimpparasiteio.obj \ - gimpprotocol.obj \ - gimprectangle.obj \ - gimpreloc.obj \ - gimpsignal.obj \ - gimpunit.obj \ - gimputils.obj \ - gimpwire.obj - -EXTRA_DIST = \ - makefile.mingw \ - makefile.mingw.in \ - makefile.msc \ - gimpbase.def - -libgimpbaseinclude_HEADERS = \ - gimpbase.h \ - gimpbasetypes.h \ - gimpenv.h \ - gimplimits.h \ - gimpsignal.h \ - gimputils.h \ - gimpparasite.h \ - gimpparasiteio.h \ - gimpunit.h \ - gimpversion.h - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE)-$(PKG_VER).dll - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 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) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am index 3bb5eb67a2..5f89ab69a5 100644 --- a/libgimpcolor/Makefile.am +++ b/libgimpcolor/Makefile.am @@ -57,7 +57,6 @@ INCLUDES = \ -I$(includedir) EXTRA_DIST = \ - makefile.msc \ gimpcolor.def lib_LTLIBRARIES = libgimpcolor-2.0.la diff --git a/libgimpcolor/makefile.msc b/libgimpcolor/makefile.msc deleted file mode 100644 index 693f9d45b2..0000000000 --- a/libgimpcolor/makefile.msc +++ /dev/null @@ -1,46 +0,0 @@ -## Makefile for building the GIMP DLLs and LIBs with Microsoft C. -## Use: nmake -f makefile.msc - -TOP = ..\.. -PRJ_TOP = .. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -################################################################ - -# Nothing much configurable below - -INCLUDES = -I.. -# DEFINES = -DG_LOG_DOMAIN=\"LibGimpColor\" -DEPCFLAGS = \ - -FImsvc_recommended_pragmas.h \ - $(GLIB_CFLAGS) - -DEPLIBS = $(GLIB_LIBS) - -all : \ - ..\config.h \ - gimpcolor-$(GIMP_VER).dll - -..\config.h : ..\config.h.win32 - copy ..\config.h.win32 ..\config.h - -install : all - $(INSTALL) gimpcolor-$(GIMP_VER).dll $(BIN) - -OBJECTS = \ - gimpadaptivesupersample.obj \ - gimpbilinear.obj \ - gimpcmyk.obj \ - gimpcolormanaged.obj \ - gimpcolorspace.obj \ - gimphsl.obj \ - gimphsv.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/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am index 599e0d9d84..4f4816988f 100644 --- a/libgimpconfig/Makefile.am +++ b/libgimpconfig/Makefile.am @@ -54,7 +54,6 @@ INCLUDES = \ -I$(includedir) EXTRA_DIST = \ - makefile.msc \ gimpconfig.def lib_LTLIBRARIES = libgimpconfig-2.0.la diff --git a/libgimpconfig/makefile.msc b/libgimpconfig/makefile.msc deleted file mode 100644 index 8383980d20..0000000000 --- a/libgimpconfig/makefile.msc +++ /dev/null @@ -1,50 +0,0 @@ -## Makefile for building the GIMP DLLs and LIBs with Microsoft C. -## Use: nmake -f makefile.msc - -TOP = ..\.. -PRJ_TOP = .. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -################################################################ - -# Nothing much configurable below - -INCLUDES = -I.. -# DEFINES = -DG_LOG_DOMAIN=\"LibGimpConfig\" -DEPCFLAGS = \ - -FImsvc_recommended_pragmas.h \ - $(GLIB_CFLAGS) - -DEPLIBS = $(GLIB_LIBS) $(INTL_LIBS) \ - ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ - ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ - ..\libgimpmath\gimpmath-$(GIMP_VER).lib \ - -all : \ - ..\config.h \ - gimpconfig-$(GIMP_VER).dll - -..\config.h : ..\config.h.win32 - copy ..\config.h.win32 ..\config.h - -install : all - $(INSTALL) gimpconfig-$(GIMP_VER).dll $(BIN) - -OBJECTS = \ - gimpcolorconfig-enums.obj \ - gimpcolorconfig.obj \ - gimpconfig-deserialize.obj \ - gimpconfig-error.obj \ - gimpconfig-iface.obj \ - gimpconfig-path.obj \ - gimpconfig-serialize.obj \ - gimpconfig-utils.obj \ - gimpconfigwriter.obj \ - gimpscanner.obj \ - -gimpconfig-$(GIMP_VER).dll : $(OBJECTS) gimpconfig.def - $(CC) $(CFLAGS) -LD -Fegimpconfig-$(GIMP_VER).dll $(OBJECTS) $(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpconfig.def - diff --git a/libgimpmath/Makefile.am b/libgimpmath/Makefile.am index c97127a9f7..12010637fa 100644 --- a/libgimpmath/Makefile.am +++ b/libgimpmath/Makefile.am @@ -56,7 +56,6 @@ INCLUDES = \ -I$(includedir) EXTRA_DIST = \ - makefile.msc \ gimpmath.def lib_LTLIBRARIES = libgimpmath-2.0.la diff --git a/libgimpmath/makefile.msc b/libgimpmath/makefile.msc deleted file mode 100644 index 96f599580e..0000000000 --- a/libgimpmath/makefile.msc +++ /dev/null @@ -1,39 +0,0 @@ -## Makefile for building the GIMP DLLs and LIBs with Microsoft C. -## Use: nmake -f makefile.msc - -TOP = ..\.. -PRJ_TOP = .. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -################################################################ - -# Nothing much configurable below - -INCLUDES = -I.. -# DEFINES = -DG_LOG_DOMAIN=\"LibGimpMath\" -DEPCFLAGS = \ - -FImsvc_recommended_pragmas.h \ - $(GLIB_CFLAGS) -DEPLIBS = $(GLIB_LIBS) - -all : \ - ..\config.h \ - gimpmath-$(GIMP_VER).dll - -..\config.h : ..\config.h.win32 - copy ..\config.h.win32 ..\config.h - -install : all - $(INSTALL) gimpmath-$(GIMP_VER).dll $(BIN) - -OBJECTS = \ - gimpmatrix.obj \ - gimpmd5.obj \ - gimpvector.obj \ - -gimpmath-$(GIMP_VER).dll : $(OBJECTS) gimpmath.def - $(CC) $(CFLAGS) -LD -Fegimpmath-$(GIMP_VER).dll $(OBJECTS) $(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpmath.def - diff --git a/libgimpmodule/Makefile.am b/libgimpmodule/Makefile.am index cdee2c46be..9d8dcc4423 100644 --- a/libgimpmodule/Makefile.am +++ b/libgimpmodule/Makefile.am @@ -52,7 +52,6 @@ INCLUDES = \ -I$(includedir) EXTRA_DIST = \ - makefile.msc \ gimpmodule.def lib_LTLIBRARIES = libgimpmodule-2.0.la diff --git a/libgimpmodule/makefile.msc b/libgimpmodule/makefile.msc deleted file mode 100644 index bdd339f319..0000000000 --- a/libgimpmodule/makefile.msc +++ /dev/null @@ -1,78 +0,0 @@ -# autogenerated from automake.am with automake.py -# and slightly modified -TOP = ..\.. -PRJ_TOP = .. -PACKAGE = gimpmodule -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DDATADIR=\"\" -DSYSCONFDIR=\"\" \ - -DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\" - -top_srcdir = $(PRJ_TOP) -top_builddir = $(PRJ_TOP) -includedir = $(PRJ_TOP) -LT_RELEASE = $(PKG_VER) -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intl \ - -I../intl \ - $(GLIB_CFLAGS) \ - -I$(includedir) \ - -PKG_LINK = \ - $(GLIB_LIBS) $(INTL_LIBS) \ - ..\libgimpbase\gimpbase-$(PKG_VER).lib - -OBJECTS = \ - gimpmodule.obj \ - gimpmoduledb.obj \ - -lib_LTLIBRARIES = \ - libgimpmodule-2.0.la - -libgimpmodule_2_0_la_LIBADD = \ - $(GLIB_LIBS) - -libgimpmoduleincludedir = \ - $(includedir)/gimp-$(LT_RELEASE)/libgimpmodule - -EXTRA_DIST = \ - gimpversion.h.in \ - makefile.mingw \ - makefile.mingw.in \ - makefile.msc \ - gimpmodule.def - -libgimpmodule_2_0_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - -libgimpmoduleinclude_HEADERS = \ - gimpmoduletypes.h \ - gimpmodule.h - -all : \ - $(PRJ_TOP)\config.h \ - $(PACKAGE)-$(PKG_VER).dll - - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(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 - -$(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am index 2b07c0b0f4..07c157b72d 100644 --- a/libgimpthumb/Makefile.am +++ b/libgimpthumb/Makefile.am @@ -50,7 +50,6 @@ INCLUDES = \ -I$(includedir) EXTRA_DIST = \ - makefile.msc \ gimpthumb.def lib_LTLIBRARIES = libgimpthumb-2.0.la diff --git a/libgimpthumb/makefile.msc b/libgimpthumb/makefile.msc deleted file mode 100644 index c8ed0845a7..0000000000 --- a/libgimpthumb/makefile.msc +++ /dev/null @@ -1,56 +0,0 @@ -## Makefile for building the GIMP DLLs and LIBs with Microsoft C. -## Use: nmake -f makefile.msc - -TOP = ..\.. -PRJ_TOP = .. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -################################################################ - -# Nothing much configurable below - -INCLUDES = -I.. $(GDK_PIXBUF_CFLAGS) -# DEFINES = -DG_LOG_DOMAIN=\"LibGimpThump\" -DEPCFLAGS = \ - -FImsvc_recommended_pragmas.h \ - $(GLIB_CFLAGS) $(GTK2_CFLAGS) - -DEPLIBS = $(GLIB_LIBS) $(GDK_PIXBUF_LIBS) $(INTL_LIBS) \ - ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ - ..\libgimpmath\gimpmath-$(GIMP_VER).lib - -all : \ - ..\config.h \ - gimpthumb-$(GIMP_VER).dll - -..\config.h : ..\config.h.win32 - copy ..\config.h.win32 ..\config.h - -install : all - $(INSTALL) gimpcolor-$(GIMP_VER).dll $(BIN) - -OBJECTS = \ - gimpthumb-enums.obj \ - gimpthumb-error.obj \ - gimpthumb-utils.obj \ - gimpthumbnail.obj \ - gimp-thumbnail-list.obj \ - -!IFNDEF PERL -PERL = perl -!ENDIF - -gimpthumb-enums.c: gimpthumb-enums.h - $(PERL) ..\tools\gimp-mkenums \ - --fhead "#include \"config.h\"\n#include \n#include \"gimpthumb-enums.h\"" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "\nstatic const GEnumValue @enum_name@_enum_values[] =\n{" \ - --vprod " { @VALUENAME@, @valuedesc@, \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n};\n\nGType\n@enum_name@_get_type (void)\n{\n static GType enum_type = 0;\n\n if (!enum_type)\n enum_type = g_enum_register_static (\"@EnumName@\", @enum_name@_enum_values);\n\n return enum_type;\n}\n" \ - gimpthumb-enums.h > $@ -gimpthumb-$(GIMP_VER).dll : $(OBJECTS) gimpthumb.def - $(CC) $(CFLAGS) -LD -Fegimpthumb-$(GIMP_VER).dll $(OBJECTS) $(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpthumb.def - diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am index 1f17b0bab4..91f752e634 100644 --- a/libgimpwidgets/Makefile.am +++ b/libgimpwidgets/Makefile.am @@ -283,7 +283,6 @@ WILBER_VARIABLES = \ EXTRA_DIST = \ - makefile.msc \ gimpwidgets.def \ $(libgimpwidgets_2_0_la_extra_sources) \ $(WILBER_IMAGES) diff --git a/libgimpwidgets/makefile.msc b/libgimpwidgets/makefile.msc deleted file mode 100644 index 0ef4ad203b..0000000000 --- a/libgimpwidgets/makefile.msc +++ /dev/null @@ -1,126 +0,0 @@ -## Makefile for building the GIMP DLLs and LIBs with Microsoft C. -## Use: nmake -f makefile.msc - -TOP = ..\.. -PRJ_TOP = .. -!include $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -################################################################ - -# Nothing much configurable below - -INCLUDES = -I.. -# DEFINES = -DG_LOG_DOMAIN=\"LibGimpWidgets\" -DEPCFLAGS = \ - -FImsvc_recommended_pragmas.h \ - $(GLIB_CFLAGS) $(GTK2_CFLAGS) $(INTL_CFLAGS) -DEPLIBS = $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) - -all : \ - ..\config.h \ - gimp-wilber-pixbufs.h \ - gimpwidgetsmarshal.c \ - gimpwidgets-$(GIMP_VER).dll - -..\config.h : ..\config.h.win32 - copy ..\config.h.win32 ..\config.h - -install : all - $(INSTALL) gimpmath-$(GIMP_VER).dll $(BIN) - -OBJECTS = \ - gimpbrowser.obj \ - gimpbutton.obj \ - gimpcairo-utils.obj \ - gimpcellrenderercolor.obj \ - gimpcellrenderertoggle.obj \ - gimpchainbutton.obj \ - gimpcolorarea.obj \ - gimpcolorbutton.obj \ - gimpcolordisplay.obj \ - gimpcolordisplaystack.obj \ - gimpcolorhexentry.obj \ - gimpcolornotebook.obj \ - gimpcolorprofilecombobox.obj \ - gimpcolorprofilestore.obj \ - gimpcolorscale.obj \ - gimpcolorscales.obj \ - gimpcolorselect.obj \ - gimpcolorselection.obj \ - gimpcolorselector.obj \ - gimpcontroller.obj \ - gimpdialog.obj \ - gimpenumcombobox.obj \ - gimpenumlabel.obj \ - gimpenumstore.obj \ - gimpenumwidgets.obj \ - gimpfileentry.obj \ - gimpframe.obj \ - gimphelpui.obj \ - gimphintbox.obj \ - gimpintcombobox.obj \ - gimpintstore.obj \ - gimpmemsizeentry.obj \ - gimpnumberpairentry.obj \ - gimpoffsetarea.obj \ - gimpoldwidgets.obj \ - gimppageselector.obj \ - gimppatheditor.obj \ - gimppickbutton.obj \ - gimppixmap.obj \ - gimppreviewarea.obj \ - gimppreview.obj \ - gimppropwidgets.obj \ - gimpscrolledpreview.obj \ - gimpstringcombobox.obj \ - gimpquerybox.obj \ - gimpruler.obj \ - gimpscaleentry.obj \ - gimpsizeentry.obj \ - gimpstock.obj \ - gimpunitmenu.obj \ - gimpwidgets.obj \ - gimpzoommodel.obj \ - gimpwidgets-private.obj \ - gimpwidgetsenums.obj \ - 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 - -gimpwidgetsmarshal.c : gimpwidgetsmarshal.list gimpwidgetsmarshal.h - $(GLIB)\gobject\glib-genmarshal --prefix=_gimp_widgets_marshal gimpwidgetsmarshal.list --body >gimpwidgetsmarshal.c - -# questionable dependency between libgimpui/libgimpwidgets -gimpunit.obj : ..\app\gimpunit.c - $(CC) $(CFLAGS) -c ..\app\gimpunit.c - -gimpwidgets-$(GIMP_VER).dll : $(OBJECTS) gimpwidgets.def - $(CC) $(CFLAGS) -LD -Fegimpwidgets-$(GIMP_VER).dll $(OBJECTS) \ - ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ - ..\libgimpconfig\gimpconfig-$(GIMP_VER).lib \ - ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ - $(DEPLIBS) $(LDFLAGS) user32.lib /def:gimpwidgets.def - -# ..\app\gimp.lib \ -# ..\libgimp\gimpui-$(GIMP_VER).lib ..\libgimp\gimp-$(GIMP_VER).lib \ diff --git a/makefile.msc b/makefile.msc deleted file mode 100644 index 33766f8d57..0000000000 --- a/makefile.msc +++ /dev/null @@ -1,68 +0,0 @@ -TOP = .. -PRJ_TOP = . -PACKAGE = gimp -!INCLUDE $(TOP)\glib\build\win32\make.msc - -!INCLUDE $(PRJ_TOP)\gimpdefs.msc -PKG_VER = $(GIMP_VER) - -# in required build order -# ./themes gets extra handling below -SUBDIRS = \ - libgimpbase \ - libgimpcolor \ - libgimpmath \ - libgimpconfig \ - libgimpthumb \ - libgimpwidgets \ - libgimp \ - libgimpmodule \ - cursors \ - app \ -# plug-ins \ - modules \ - menus - -sub-all: - for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d - -sub-one: - cd $(THIS) - nmake -nologo -f makefile.msc $(TARGET) - cd .. - -clean :: sub-clean - -sub-clean: - for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=clean - -sub-themes: - cd cursors - nmake -nologo -f makefile.msc - cd .. - cd themes\Default\images - nmake -nologo -f makefile.msc - cd ..\..\.. - -all : \ - $(PRJ_TOP)\config.h \ - sub-themes \ - sub-all - -$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 - copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - -RESOURCE = $(PACKAGE).res - -$(PACKAGE).lib : $(OBJECTS) - lib /out:$(PACKAGE).lib $(OBJECTS) - -$(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 - $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res $(OBJECTS) $(PKG_LINK) \ - user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def - -.c.obj : - $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $< diff --git a/menus/Makefile.am b/menus/Makefile.am index 62da794503..1ad3e798ef 100644 --- a/menus/Makefile.am +++ b/menus/Makefile.am @@ -45,8 +45,7 @@ EXTRA_DIST = \ $(menudata_in_files) \ dialogs-menuitems.xml \ gtkuimanager.dtd \ - menus.xsl \ - makefile.msc + menus.xsl MAINTAINERCLEANFILES = $(menudata_built_files) diff --git a/menus/makefile.msc b/menus/makefile.msc deleted file mode 100644 index 86dc622c3b..0000000000 --- a/menus/makefile.msc +++ /dev/null @@ -1,33 +0,0 @@ -!IFNDEF XSLTPROC -XSLTPROC = xsltproc -!ENDIF - -menudata_in_files = \ - dockable-menu.xml.in \ - image-menu.xml.in - -menudata_built_files = $(menudata_in_files:.xml.in=.xml) - -MENUS = dockable image - -_MENUS = \ - brushes buffers channels colormap-editor documents \ - error-console file-open file-save fonts \ - gradient-editor gradients \ - images layers \ - palette-editor palettes patterns qmask \ - templates tool vectors - -EXTRA_DIST = \ - $(menudata_DATA) \ - $(menudata_in_files) \ - dialogs-menuitems.xml \ - gtkuimanager.dtd \ - menus.xsl - - -sub-menus : makefile.msc - for %d in ($(MENUS)) do $(XSLTPROC) -o %d-menu.xml --xinclude menus.xsl %d-menu.xml.in - -all : \ - sub-menus diff --git a/modules/Makefile.am b/modules/Makefile.am index ab476a3a2a..746a618c7e 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -17,9 +17,6 @@ INCLUDES = \ $(GTK_CFLAGS) \ -I$(includedir) -EXTRA_DIST = \ - makefile.msc - if HAVE_LCMS display_filter_lcms_module = libdisplay-filter-lcms.la display_filter_proof_module = libdisplay-filter-proof.la diff --git a/modules/makefile.msc b/modules/makefile.msc deleted file mode 100644 index e340c0d7cd..0000000000 --- a/modules/makefile.msc +++ /dev/null @@ -1,117 +0,0 @@ -## Makefile for building gimp modules with Microsoft C -## Use: nmake -f makefile.msc - -TOP = ..\.. - -################################################################ - -# Nothing much configurable below - -!INCLUDE $(TOP)\glib\build\win32\make.msc -!INCLUDE ..\gimpdefs.msc - -INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I.. - -DEFINES = -DHAVE_CONFIG_H -DMODULE_COMPILATION -DEPCFLAGS = $(INTL_CFLAGS) $(GLIB_CFLAGS) $(GTK2_CFLAGS) -DEPLIBS = $(INTL_LIBS) $(GLIB_LIBS) $(GTK2_LIBS) - -BIN = $(GIMP)\modules - -MODULES = \ - color-selector-water-$(GIMP_VER).dll \ - color-selector-wheel-$(GIMP_VER).dll \ - color-selector-cmyk-$(GIMP_VER).dll \ - display-filter-color-blind-$(GIMP_VER).dll \ - display-filter-gamma-$(GIMP_VER).dll \ - display-filter-high-contrast-$(GIMP_VER).dll \ -!IFDEF LCMS_CFLAGS - display-filter-lcms-$(GIMP_VER).dll \ - display-filter-proof-$(GIMP_VER).dll \ -!ENDIF - - -all : \ - $(MODULES) - -install : all - for %m in ($(MODULES)) do copy %m $(BIN) - -..\config.h : ..\config.h.win32 - copy ..\config.h.win32 ..\config.h - -color-selector-triangle-$(GIMP_VER).dll : color-selector-triangle.obj - $(CC) $(CFLAGS) -LD -Fe$@ color-selector-triangle.obj $(LDFLAGS) \ - ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ - ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ - ..\libgimpmodule\gimpmodule-$(GIMP_VER).lib \ - $(DEPLIBS) - -color-selector-water-$(GIMP_VER).dll : color-selector-water.obj - $(CC) $(CFLAGS) -LD -Fe$@ color-selector-water.obj $(LDFLAGS) \ - ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ - ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ - $(DEPLIBS) - -color-selector-wheel-$(GIMP_VER).dll : color-selector-wheel.obj - $(CC) $(CFLAGS) -LD -Fe$@ color-selector-wheel.obj $(LDFLAGS) \ - ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ - ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ - $(DEPLIBS) - -color-selector-cmyk-$(GIMP_VER).dll : color-selector-cmyk.obj - $(CC) $(CFLAGS) -LD -Fe$@ color-selector-cmyk.obj $(LDFLAGS) \ - ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ - ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ - $(DEPLIBS) - -display-filter-color-blind-$(GIMP_VER).dll : display-filter-color-blind.obj - $(CC) $(CFLAGS) -LD -Fe$@ display-filter-color-blind.obj $(LDFLAGS) \ - ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ - ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ - ..\libgimpmodule\gimpmodule-$(GIMP_VER).lib \ - $(DEPLIBS) - -display-filter-gamma-$(GIMP_VER).dll : display-filter-gamma.obj - $(CC) $(CFLAGS) -LD -Fe$@ display-filter-gamma.obj $(LDFLAGS) \ - ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ - ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ - $(DEPLIBS) - -display-filter-high-contrast-$(GIMP_VER).dll : display-filter-high-contrast.obj - $(CC) $(CFLAGS) -LD -Fe$@ display-filter-high-contrast.obj $(LDFLAGS) \ - ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ - ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ - $(DEPLIBS) - -display-filter-lcms-$(GIMP_VER).dll : display-filter-lcms.obj - $(CC) $(CFLAGS) $(LCMS_CFLAGS) -LD -Fe$@ display-filter-lcms.obj $(LDFLAGS) \ - ..\libgimpbase\gimpbase-$(GIMP_VER).lib \ - ..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ - ..\libgimpconfig\gimpconfig-$(GIMP_VER).lib \ - ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ - $(DEPLIBS) $(LCMS_LIBS) user32.lib gdi32.lib - -display-filter-proof-$(GIMP_VER).dll : display-filter-proof.obj - $(CC) $(CFLAGS) $(LCMS_CFLAGS) -LD -Fe$@ display-filter-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) $(LCMS_CFLAGS) -c $< - -clean:: - del *.dll - del *.lib - del *.obj - del *.exp - del *.err - del *.map - del *.sym - del *.pdb - del *.ilk diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am index 8c22e7bca4..0108fc8e12 100644 --- a/plug-ins/Makefile.am +++ b/plug-ins/Makefile.am @@ -1,9 +1,5 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = \ - makefile.msc - - if HAVE_WEBKIT help_browser = help-browser endif diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc deleted file mode 100644 index d535f5432d..0000000000 --- a/plug-ins/makefile.msc +++ /dev/null @@ -1,929 +0,0 @@ -# Makefile to build the GIMP plug-ins with Microsoft nmake and compiler - -# I don't want to use many hand-written makefiles, so this is quite complex. -# This same makefile is also included by sub-makes called as subroutines. -# Various parts of this file are used when makeing from the plug-ins directory, -# and when building individual plug-ins and the three plug-in libraries. - -INSTALL = copy - -# This is what I use as installation target, from where the installer-builder -# will pick it up. -GIMP = C:\install\gimp - -BIN = $(GIMP)\plug-ins - -!IFNDEF GIMPTOP -GIMPTOP = .. -!ENDIF - -TOP = ..\$(GIMPTOP) -!INCLUDE $(TOP)\glib\build\win32\make.msc -!INCLUDE $(GIMPTOP)\gimpdefs.msc - -!IFNDEF LIBRARY -!IFNDEF PLUGIN -!IFNDEF MODULE - -# This part is used when making from the plug-ins directory - -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 = alien-map align-layers animation-optimize animation-play antialias apply-canvas -COMMON1 = blinds blur-gauss-selective blur-gauss blur-motion blur border-average bump-map -COMMON2 = cartoon channel-mixer checkerboard cml-explorer color-cube-analyze color-enhance color-exchange color-to-alpha colorify colormap-remap compose contrast-normalize contrast-retinex contrast-stretch-hsv contrast-stretch convolution-matrix crop-auto crop-zealous cubism curve-bend -COMMON3 = decompose deinterlace depth-merge despeckle destripe diffraction displace edge-dog edge-laplace edge-neon edge-sobel edge emboss engrave -## file-aa file-mng file-pdf file-wmf file-xpm -COMMON4 = file-cel file-compressor file-csource file-desktop-link file-dicom file-gbr file-gif-load file-gif-save file-gih file-glob file-header file-html-table file-pat file-pcx file-pix file-png file-pnm file-ps file-psp file-raw file-sunras file-svg file-tga file-tiff-load file-tiff-save file-xbm file-xwd film filter-pack fractal-trace -## mail -COMMON5 = gee-zoom gee gradient-map grid guillotine hot illusion iwarp jigsaw lcms lens-apply lens-distortion lens-flare max-rgb mosaic newsprint nl-filter noise-hsv noise-randomize noise-rgb noise-solid noise-spread nova oilify photocopy pixelize plasma plugin-browser polar-coords procedure-browser qbist red-eye-removal ripple rotate -COMMON6 = sample-colorize screenshot semi-flatten sharpen shift sinus smooth-palette softglow sparkle sphere-designer -COMMON7 = threshold-alpha tile-glass tile-paper tile-seamless tile-small tile unit-editor unsharp-mask value-invert value-propagate van-gogh-lic video warp waves web-browser whirl-pinch wind - -# These have own subdirectories each -SEPARATE = lighting gfig gimpressionist imagemap maze metadata pagecurl twain print help -## help-browser -SEPARATE_DASH = color-rotate file-bmp file-faxg3 file-fits file-fli file-ico file-jpeg file-psd file-sgi file-uri file-xjt fractal-explorer gradient-flare ifs-compose map-object selection-to-path win-snap - -# These are unofficial, ie not in the CVS. To build these, you should -# get tml's source snapshot and copy this makefile to the -# ..\unofficial-plug-ins directory, go there, and do "nmake -f makefile.msc unofficial". - -UNOFFICIAL = Anamorphose DigitalSignature RGB_Displace gimp_ace guash sel_gauss magiceye user_filter - -# The main target - -all : ..\config.h libs-all common-plugins-all separate-plugins-all - -..\config.h : ..\config.h.win32 - copy ..\config.h.win32 ..\config.h - -install : libs-install common-plugins-install separate-plugins-install data-install - -unofficial: - for %d in ($(UNOFFICIAL)) do nmake -nologo -f makefile.msc sub-one-separate DIR=%d TARGET=install - -clean :: libs-clean common-plugins-clean separate-plugins-clean - -libs-all : - @nmake -nologo -f makefile.msc sub-libs TARGET=all - -libs-install : - @nmake -nologo -f makefile.msc sub-libs TARGET=install - -libs-clean : - @nmake -nologo -f makefile.msc sub-libs TARGET=clean - -sub-libs: - cd script-fu\tinyscheme - 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\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 - -common-plugins-install : - @nmake -nologo -f makefile.msc sub-common-plugins TARGET=install - -common-plugins-clean : - @nmake -nologo -f makefile.msc sub-one-common TARGET=clean - - - -sub-common-plugins : - for %d in ($(COMMON0)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET) - for %d in ($(COMMON1)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET) - for %d in ($(COMMON2)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET) - for %d in ($(COMMON3)) do nmake -nologo -f makefile.msc sub-one-common DIR=%d TARGET=$(TARGET) - 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 - @nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=$(DIR) $(TARGET) - - - -separate-plugins-all : - @nmake -nologo -f makefile.msc sub-separate-plugins TARGET=all - -separate-plugins-install : - @nmake -nologo -f makefile.msc sub-separate-plugins TARGET=install - -separate-plugins-clean : - @nmake -nologo -f makefile.msc sub-separate-plugins TARGET=clean - - - -sub-separate-plugins : - for %d in ($(SEPARATE)) do nmake -nologo -f makefile.msc sub-one-separate DIR=%d TARGET=$(TARGET) - for %d in ($(SEPARATE_DASH)) do nmake -nologo -f makefile.msc sub-one-separate-dash DIR=%d TARGET=$(TARGET) - - -sub-one-separate : - cd $(DIR) - nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=$(DIR) EXTRA_$(DIR)=1 $(TARGET) - -sub-one-separate-dash : - cd $(DIR) - nmake -nologo -f ..\makefile.msc GIMPTOP=..\.. PLUGIN=$(DIR) $(TARGET) - -data-install : gimpressionist-data-install guash-data-install - -md $(GIMP)\scripts - $(INSTALL) script-fu\scripts\*.scm $(GIMP)\scripts - $(INSTALL) script-fu\scripts\*.jpg $(GIMP)\scripts - $(INSTALL) FractalExplorer\fractalexplorer-examples\* $(GIMP)\fractalexplorer - del $(GIMP)\fractalexplorer\Makefile.am - -gimpressionist-data-install : - -md $(GIMP)\gimpressionist - -md $(GIMP)\gimpressionist\Brushes - -md $(GIMP)\gimpressionist\Paper - -md $(GIMP)\gimpressionist\Presets - $(INSTALL) gimpressionist\Brushes\*.pgm $(GIMP)\gimpressionist\Brushes - $(INSTALL) gimpressionist\Brushes\*.ppm $(GIMP)\gimpressionist\Brushes - $(INSTALL) gimpressionist\Paper\*.pgm $(GIMP)\gimpressionist\Paper - $(INSTALL) gimpressionist\Presets\* $(GIMP)\gimpressionist\Presets - del $(GIMP)\gimpressionist\Presets\Makefile.am - -guash-data-install : - - -!ENDIF -!ENDIF -!ENDIF - -!IFNDEF FROMPLUGINSDIR - -# This part is used when building individual plug-ins or one of -# the libraries. - -# If a plug-in has several object files, or needs extra libraries or -# compiler flags, these are in an EXTRA_xxx part. - -!IF "$(DIR)"=="color-rotate" -STOCK_IMAGES = \ - images/color-rotate-360.png \ - images/color-rotate-a-b.png \ - images/color-rotate-ccw.png \ - images/color-rotate-cw.png \ - -STOCK_VARS = \ - color_rotate_360 images/color-rotate-360.png \ - color_rotate_a_b images/color-rotate-a-b.png \ - color_rotate_ccw images/color-rotate-ccw.png \ - color_rotate_cw images/color-rotate-cw.png \ - -images/color-rotate-stock-pixbufs.h: $(STOCK_IMAGES) - gdk-pixbuf-csource --rle --build-list $(STOCK_VARS) > images/color-rotate-stock-pixbufs.h - -EXTRA_DEPS = images/color-rotate-stock-pixbufs.h - -OBJECTS = \ - color-rotate-callbacks.obj \ - color-rotate-dialog.obj \ - color-rotate-draw.obj \ - color-rotate-stock.obj \ - color-rotate-utils.obj \ - color-rotate.obj \ - -!ENDIF - -!IF "$(DIR)"=="fractal-explorer" -OBJECTS = \ - fractal-explorer-dialogs.obj \ - fractal-explorer.obj -!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 - -!IF "$(DIR)"=="map-object" -OBJECTS = \ - arcball.obj \ - map-object-apply.obj \ - map-object-image.obj \ - map-object-main.obj \ - map-object-preview.obj \ - map-object-shade.obj \ - map-object-ui.obj -OPTIMIZE = -!ENDIF - -!IF "$(DIR)"=="file-bmp" -OBJECTS = \ - bmp.obj \ - bmp-read.obj \ - bmp-write.obj -!ENDIF - -!IFDEF EXTRA_plugindetails -OBJECTS = \ - gimpprocbox.obj \ - gimpprocbrowser.obj \ - gimpprocview.obj \ - plugin-browser.obj -!ENDIF - -!IF "$(DIR)"=="file-faxg3" -OBJECTS = \ - faxg3.obj \ - g3.obj -!ENDIF - -!IF "$(DIR)"=="file-fits" -OBJECTS = \ - fits.obj \ - fits-io.obj -!ENDIF - -!IFDEF EXTRA_flame -OBJECTS = \ - cmap.obj \ - flame.obj \ - libifs.obj \ - rect.obj -!ENDIF - -!IF "$(DIR)"=="file-fli" -OBJECTS = \ - fli.obj \ - fli-gimp.obj -!ENDIF - -!IFDEF EXTRA_gfig -STOCK_VARS = \ - stock_bezier images/stock-bezier.png \ - stock_circle images/stock-circle.png \ - stock_copy_object images/stock-copy-object.png \ - stock_curve images/stock-curve.png \ - stock_delete_object images/stock-delete-object.png \ - stock_ellipse images/stock-ellipse.png \ - stock_line images/stock-line.png \ - stock_move_object images/stock-move-object.png \ - stock_move_point images/stock-move-point.png \ - stock_polygon images/stock-polygon.png \ - stock_rectangle images/stock-rectangle.png \ - stock_spiral images/stock-spiral.png \ - stock_star images/stock-star.png \ - stock_select_object images/stock-select-object.png \ - stock_show_all images/stock-show-all.png - -STOCK_IMAGES = \ - images/stock-bezier.png \ - images/stock-circle.png \ - images/stock-copy-object.png \ - images/stock-curve.png \ - images/stock-delete-object.png \ - images/stock-ellipse.png \ - images/stock-line.png \ - images/stock-move-object.png \ - images/stock-move-point.png \ - images/stock-polygon.png \ - images/stock-spiral.png \ - images/stock-star.png \ - images/stock-logo.png - -images/gfig-stock-pixbufs.h: $(STOCK_IMAGES) - gdk-pixbuf-csource --rle --build-list $(STOCK_VARS) > images/gfig-stock-pixbufs.h - -EXTRA_DEPS = images/gfig-stock-pixbufs.h - -OBJECTS = \ - gfig.obj \ - gfig-arc.obj \ - gfig-bezier.obj \ - gfig-circle.obj \ - gfig-dialog.obj \ - gfig-dobject.obj \ - gfig-ellipse.obj \ - gfig-grid.obj \ - gfig-line.obj \ - gfig-poly.obj \ - gfig-preview.obj \ - gfig-rectangle.obj \ - gfig-spiral.obj \ - gfig-star.obj \ - gfig-style.obj \ - gfig-stock.obj -!ENDIF - -!IF "$(DIR)"=="ifs-compose" -OBJECTS = \ - ifs-compose.obj \ - ifs-compose-storage.obj \ - ifs-compose-utils.obj -!ENDIF - -!IFDEF EXTRA_imagemap -STOCK_VARS = \ - stock_circle images/stock-circle.png \ - stock_coord images/stock-coord.png \ - stock_dimension images/stock-dimension.png \ - stock_java images/stock-java.png \ - stock_polygon images/stock-polygon.png \ - stock_rectangle images/stock-rectangle.png \ - stock_to_back images/stock-to-back.png \ - stock_to_front images/stock-to-front.png \ - -STOCK_IMAGES = \ - images/stock-circle.png \ - images/stock-coord.png \ - images/stock-dimension.png \ - images/stock-java.png \ - images/stock-polygon.png \ - images/stock-rectangle.png \ - images/stock-to-back.png \ - images/stock-to-front.png \ - - -images/imap-stock-pixbufs.h: $(STOCK_IMAGES) - gdk-pixbuf-csource --rle --build-list $(STOCK_VARS) > images/imap-stock-pixbufs.h - -EXTRA_DEPS = images/imap-stock-pixbufs.h - -OBJECTS = \ - imap_cmd_copy_object.obj \ - imap_about.obj \ - imap_browse.obj \ - imap_cern_lex.obj \ - imap_cern_parse.obj \ - imap_circle.obj \ - imap_cmd_clear.obj \ - imap_cmd_copy.obj \ - imap_cmd_create.obj \ - imap_cmd_cut.obj \ - imap_cmd_cut_object.obj \ - imap_cmd_delete.obj \ - imap_cmd_delete_point.obj \ - imap_cmd_edit_object.obj \ - imap_cmd_gimp_guides.obj \ - imap_cmd_guides.obj \ - imap_cmd_insert_point.obj \ - imap_cmd_move.obj \ - imap_cmd_move_down.obj \ - imap_cmd_move_sash.obj \ - imap_cmd_move_selected.obj \ - imap_cmd_move_to_front.obj \ - imap_cmd_move_up.obj \ - imap_cmd_object_down.obj \ - imap_cmd_object_move.obj \ - imap_cmd_object_up.obj \ - imap_cmd_paste.obj \ - imap_cmd_select.obj \ - imap_cmd_select_all.obj \ - imap_cmd_select_next.obj \ - imap_cmd_select_prev.obj \ - imap_cmd_select_region.obj \ - imap_cmd_send_to_back.obj \ - imap_cmd_unselect.obj \ - imap_cmd_unselect_all.obj \ - imap_command.obj \ - imap_csim_lex.obj \ - imap_csim_parse.obj \ - imap_default_dialog.obj \ - imap_edit_area_info.obj \ - imap_file.obj \ - imap_grid.obj \ - imap_main.obj \ - imap_menu.obj \ - imap_menu_funcs.obj \ - imap_misc.obj \ - imap_mru.obj \ - imap_ncsa_lex.obj \ - imap_ncsa_parse.obj \ - imap_object.obj \ - imap_object_popup.obj \ - imap_polygon.obj \ - imap_preferences.obj \ - imap_preview.obj \ - imap_rectangle.obj \ - imap_selection.obj \ - imap_settings.obj \ - imap_source.obj \ - imap_statusbar.obj \ - imap_stock.obj \ - imap_string.obj \ - imap_table.obj \ - imap_taglist.obj -# not changing the source which is lexed -EXTRACFLAGS = -FIstring.h -FIstdlib.h -DYY_NO_UNISTD_H -!ENDIF - -!IFDEF EXTRA_iwarp -OPTIMIZE = -!ENDIF - -!IF "$(DIR)"=="file-ico" -EXTRACFLAGS = $(PNG_CFLAGS) -EXTRALIBS = $(PNG_LIBS) -OBJECTS = \ - ico-dialog.obj \ - ico-load.obj \ - ico-save.obj \ - ico.obj -!ENDIF - -!IF "$(DIR)"=="file-jpeg" -EXTRACFLAGS = -I$(JPEG) \ -!IFDEF EXIF - $(EXIF_CFLAGS) -DHAVE_LIBEXIF -DHAVE_EXIF -DHAVE_EXIF_0_6 -!ENDIF - -EXTRALIBS = \ - $(JPEG)\libjpeg.lib \ -!IFDEF EXIF - $(EXIF_LIBS) -!ENDIF - -OBJECTS = \ - jpeg.obj \ - jpeg-exif.obj \ - jpeg-icc.obj \ - jpeg-load.obj \ - jpeg-quality.obj \ - jpeg-save.obj \ - jpeg-settings.obj \ -!IFDEF EXIF - gimpexif.obj -!ENDIF - -!ENDIF - -!IF "$(DIR)"=="file-uri" -OBJECTS = \ - gimpmountoperation.obj \ -# uri-backend-gnomevfs.obj \ - uri-backend-gvfs.obj \ -# uri-backend-libcurl.obj \ -# uri-backend-wget.obj \ - uri.obj -!ENDIF - -!IF "$(DIR)"=="lcms" -EXTRACFLAGS = $(LCMS_CFLAGS) -EXTRALIBS = $(LCMS_LIBS) -!ENDIF - -!IFDEF EXTRA_maze -OBJECTS = \ - maze-algorithms.obj \ - maze-dialog.obj \ - maze-utils.obj \ - maze.obj \ - -!ENDIF - -!IFDEF EXTRA_mpeg -EXTRACFLAGS = -I$(MPEG) -EXTRALIBS = $(MPEG)\release\libmpeg.lib -!ENDIF - -!IFDEF EXTRA_metadata -OBJECTS = \ - base64.obj \ - interface.obj \ - metadata.obj \ - xmp-encode.obj \ - xmp-model.obj \ - xmp-parse.obj \ - xmp-schemas.obj -!ENDIF - -!IFDEF EXTRA_pagecurl -STOCK_VARS = \ - curl0 curl0.png \ - curl1 curl1.png \ - curl2 curl2.png \ - curl3 curl3.png \ - curl4 curl4.png \ - curl5 curl5.png \ - curl6 curl6.png \ - curl7 curl7.png \ - -STOCK_IMAGES = \ - curl0.png \ - curl1.png \ - curl2.png \ - curl3.png \ - curl4.png \ - curl5.png \ - curl6.png \ - curl7.png \ - -pagecurl-icons.h: $(STOCK_IMAGES) - gdk-pixbuf-csource --rle --build-list $(STOCK_VARS) > pagecurl-icons.h - -EXTRA_DEPS = pagecurl-icons.h - -!ENDIF - -!IF "$(DIR)"=="file-png" -EXTRACFLAGS = $(PNG_CFLAGS) -EXTRALIBS = $(PNG_LIBS) -!ENDIF - -!IFDEF EXTRA_print -OBJECTS = \ - print.obj \ - print-draw-page.obj \ - print-page-layout.obj \ - print-preview.obj \ - print-settings.obj \ - print-page-setup.obj \ - print-utils.obj \ - -EXTRALIBS = $(CAIRO_LIBS) $(GTHREAD_LIBS) -!ENDIF - -!IF "$(DIR)"=="file-psp" -EXTRACFLAGS = $(ZLIB_CFLAGS) -EXTRALIBS = $(ZLIB_LIBS) -!ENDIF - -!IF "$(DIR)"=="file-psd" -EXTRACFLAGS = $(TIFF_CFLAGS) $(JPEG_CFLAGS) -EXTRALIBS = $(TIFF_LIBS) $(JPEG)\libjpeg.lib $(ZLIB_LIBS) user32.lib -OBJECTS = \ - psd-image-res-load.obj \ - psd-layer-res-load.obj \ - psd-load.obj \ -#2nd! psd-save.obj \ - psd-thumb-load.obj \ - psd-util.obj \ - psd.obj -!ENDIF - -!IF "$(DIR)"=="screenshot" -EXTRALIBS = user32.lib -!ENDIF - -!IF "$(DIR)"=="script-fu" -OBJECTS = \ - scheme-wrapper.obj \ - script-fu.obj \ - script-fu-console.obj \ - script-fu-scripts.obj \ - script-fu-text-console.obj \ - script-fu-interface.obj \ - script-fu-server.obj \ - script-fu-eval.obj \ - script-fu-regex.obj \ - script-fu-script.obj \ - script-fu-utils.obj \ - -EXTRALIBS = tinyscheme\tinyscheme.lib ftx\ftx.lib kernel32.lib wsock32.lib -EXTRACFLAGS = -DREGEX_MALLOC -DUSE_INTERFACE -DSTANDALONE=0 -#HAVE_RESOURCE = YES -!ENDIF - -!IF "$(DIR)"=="selection-to-path" -OBJECTS = \ - curve.obj \ - edge.obj \ - fit.obj \ - math.obj \ - pxl-outline.obj \ - spline.obj \ - selection-to-path-dialog.obj \ - selection-to-path.obj \ - spline.obj \ - vector.obj \ - -!ENDIF - -!IF "$(DIR)"=="file-sgi" -OBJECTS = \ - sgi.obj \ - sgi-lib.obj -!ENDIF - -!IF "$(DIR)"=="file-svg" -EXTRACFLAGS = $(RSVG_CFLAGS) -EXTRALIBS = $(RSVG_LIBS) -!ENDIF - -!IF "$(DIR)"=="file-tiff-load" || "$(DIR)"=="file-tiff-save" -EXTRACFLAGS = $(TIFF_CFLAGS) -EXTRALIBS = $(TIFF_LIBS) $(JPEG)\libjpeg.lib $(ZLIB_LIBS) user32.lib -!ENDIF - -!IFDEF EXTRA_gimp_ace -EXTRACFLAGS = -DGLACE_GIMP -OBJECTS = \ - gimp_ace.obj \ - glace.obj \ - glaceG.obj -!ENDIF - -!IFDEF EXTRA_gimpressionist - -EXTRALIBS = $(GTK2_LIBS) - -OBJECTS = \ - brush.obj \ - color.obj \ - general.obj \ - gimp.obj \ - gimpressionist.obj \ - globals.obj \ - orientation.obj \ - orientmap.obj \ - paper.obj \ - placement.obj \ - plasma.obj \ - ppmtool.obj \ - presets.obj \ - preview.obj \ - repaint.obj \ - size.obj \ - sizemap.obj \ - utils.obj -!ENDIF - -!IFDEF EXTRA_help -OBJECTS = \ - gimphelp.obj \ - gimphelpdomain.obj \ - gimphelpitem.obj \ - gimphelplocale.obj \ - gimphelpprogress.obj \ - help.obj \ - -TEST_OBJECTS = \ - gimp-help-lookup.obj -!ENDIF - -!IFDEF EXTRA_helpbrowser -OBJECTS = \ - gimpthrobber.obj \ - gimpthrobberaction.obj \ - helpbrowser.obj \ - dialog.obj \ - queue.obj \ - uri.obj -EXTRACFLAGS = $(GTKHTML2_CFLAGS) -EXTRALIBS = $(GTKHTML2_LIBS) user32.lib shell32.lib - -dialog.c : logo-pixbuf.h - -logo-pixbuf.h: wilber-reading.png - gdk-pixbuf-csource --raw --name=logo_data wilber-reading.png > logo-pixbuf.h - -!ENDIF - -!IFDEF EXTRA_guash -HAVE_RESOURCE = YES -!ENDIF - -!IFDEF EXTRA_magiceye -OBJECTS = \ - dialog.obj \ - magiceye.obj -!ENDIF - -!IFDEF EXTRA_user_filter - -uf_lexer.c : uf_lexer.l - flex -Cem -ouf_lexer.c uf_lexer.l -uf_parser.tab.c: uf_parser.y - bison --defines --verbose uf_parser.y - -OBJECTS = \ - libyywrap.obj \ - uf_eval.obj \ - uf_file.obj \ - uf_gui.obj \ - uf_lexer.obj \ - uf_main.obj \ - uf_parser.tab.obj -!ENDIF - -!IFDEF EXTRA_pmosaic -EXTRACFLAGS = -I$(JPEG) -EXTRALIBS = $(JPEG)\libjpeg.lib -OBJECTS = \ - pmosaic.obj \ - pmsc.obj -!ENDIF - -!IFDEF EXTRA_twain -OBJECTS = \ - tw_func.obj \ - tw_util.obj \ -!IFDEF DEBUG - tw_dump.obj \ -!ENDIF - tw_win.obj \ - twain.obj -EXTRALIBS = user32.lib -!ENDIF - -!IF "$(DIR)"=="web-browser" -EXTRALIBS = shell32.lib user32.lib -!ENDIF - -!IFDEF EXTRA_winprint -EXTRALIBS = user32.lib gdi32.lib comdlg32.lib -!ENDIF - -!IFDEF EXTRA_winclipboard -EXTRALIBS = user32.lib -!ENDIF - -!IFDEF EXTRA_winicon -EXTRACFLAGS = $(PNG_CFLAGS) -EXTRALIBS = $(PNG_LIBS) -OBJECTS = \ - icodialog.obj \ - icoload.obj \ - icosave.obj \ - main.obj -!ENDIF - -!IF "$(DIR)"=="win-snap" -OBJECTS = winsnap.obj -#HAVE_RESOURCE = YES -RESOURCE = winsnap.res -EXTRALIBS = user32.lib gdi32.lib -!ENDIF - -!IF "$(DIR)"=="file-xjt" -OBJECTS = \ - xjt.obj \ - xjpeg.obj -EXTRACFLAGS = $(JPEG_CFLAGS) -EXTRALIBS = $(JPEG_LIBS) -!ENDIF - -PLUGINDIR = $(GIMPTOP)\plug-ins - -!IFNDEF OPTIMIZE -!IFNDEF DEBUG -OPTIMIZE = -Ox -!ELSE -OPTIMIZE = -Zi -!ENDIF -!ENDIF - -!IFNDEF DEBUG -LINKDEBUG = -RTL = -MD -!ELSE -LINKDEBUG = /debug -RTL = -MDd -!ENDIF - -CC = cl -nologo -GF $(OPTIMIZE) $(RTL) -W2 -Zm400 - -CFLAGS = -FImsvc_recommended_pragmas.h \ - -DHAVE_CONFIG_H \ - -DLOCALEDIR=\"?\" \ - -I$(GIMPTOP) -I. -I$(PLUGINDIR) \ - $(EXTRACFLAGS) \ - $(GTK2_CFLAGS) $(INTL_CFLAGS) - -LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG) /NODEFAULTLIB:LIBC - -!IFDEF PLUGIN - -# This part is used when building individual plug-ins - -all : $(PLUGIN).exe - -install : all - $(INSTALL) $(PLUGIN).exe $(BIN) - -!IFNDEF OBJECTS -OBJECTS = $(PLUGIN).obj -!ENDIF - -!IFDEF HAVE_RESOURCE -# We have our own resource file (just an icon, usually) -RESOURCE = $(PLUGIN).res -!ELSE -# Use the Wilber icon otherwise. If gimp.exe eventually gets more resources, -# this will have to be changed. -RESOURCE = ..\..\app\gimp.res -!ENDIF - -$(PLUGIN).exe : $(EXTRA_DEPS) $(OBJECTS) $(RESOURCE) - $(CC) $(CFLAGS) -Fe$(PLUGIN).exe $(OBJECTS) $(RESOURCE) \ - ..\..\libgimp\gimp-$(GIMP_VER).lib ..\..\libgimp\gimpui-$(GIMP_VER).lib \ - ..\..\libgimpbase\gimpbase-$(GIMP_VER).lib \ - ..\..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \ - ..\..\libgimpconfig\gimpconfig-$(GIMP_VER).lib \ - ..\..\libgimpmath\gimpmath-$(GIMP_VER).lib \ - ..\..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \ - $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) $(EXTRALIBS) $(LDFLAGS) - -$(PLUGIN).res : $(PLUGIN).rc - rc -r -fo $(PLUGIN).res $(PLUGIN).rc - -!ENDIF - -!IFDEF LIBRARY - -# This part is used when building a library - -all : $(LIBRARY).lib - -install : all - -!IFNDEF OBJECTS -OBJECTS = $(LIBRARY).obj -!ENDIF - -$(LIBRARY).lib : $(OBJECTS) - lib /out:$(LIBRARY).lib $(OBJECTS) - -!ENDIF - -!IFDEF MODULE - -# This part is used when building a module - -# Allow building libraries with specific extensions -!IFNDEF MODULE_EXT -MODULE_EXT = dll -!ELSE -EXTRA_EXPORT = /export:init$(MODULE) -!ENDIF - -all : $(MODULE).$(MODULE_EXT) - -install : all - -!IFNDEF OBJECTS -OBJECTS = $(MODULE).obj -!ENDIF - -$(MODULE).$(MODULE_EXT) : $(OBJECTS) - $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(LDFLAGS) $(EXTRALIBS) \ - $(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 : - $(CC) $(CFLAGS) -c $< - -clean :: - erase *.obj - erase *.lib - erase *.exp - erase *.exe - erase *.pdb - erase *.ilk - -!ENDIF diff --git a/plug-ins/pygimp/Makefile.am b/plug-ins/pygimp/Makefile.am index c436ce2bd8..72b0c0126b 100644 --- a/plug-ins/pygimp/Makefile.am +++ b/plug-ins/pygimp/Makefile.am @@ -156,8 +156,7 @@ uninstall-local: EXTRA_DIST = \ $(pygimp_DATA) \ - $(codegen_files) \ - makefile.msc + $(codegen_files) gimpui.c: gimpui.defs gimpui.override gimpcolor-types.defs gimpenums-types.defs diff --git a/plug-ins/pygimp/makefile.msc b/plug-ins/pygimp/makefile.msc deleted file mode 100644 index 3e0b22b7d6..0000000000 --- a/plug-ins/pygimp/makefile.msc +++ /dev/null @@ -1,87 +0,0 @@ -!IFNDEF MODULE - -MODULES = gimp _gimpenums gimpcolor _gimpui - -all : sub-all - -sub-all: - for %d in ($(MODULES)) do @nmake -nologo -f makefile.msc sub-one THIS=%d - -sub-one: - nmake -nologo -f makefile.msc all MODULE=$(THIS) OBJ_$(THIS)=1 - -!ELSE - -MODULE=$(MODULE) -#OPTIMIZE = -Od -Op -#DEBUG=1 - -!IFDEF OBJ_gimp -OBJECTS = \ - gimpmodule.obj \ - pygimp-image.obj \ - pygimp-drawable.obj \ - pygimp-tile.obj \ - pygimp-display.obj \ - pygimp-parasite.obj \ - pygimp-pdb.obj \ - pygimp-vectors.obj -!ENDIF - -!IFDEF OBJ__gimpenums -OBJECTS = \ - gimpenumsmodule.obj -!ENDIF - -!IFDEF OBJ_gimpcolor -OBJECTS = \ - gimpcolormodule.obj \ - pygimp-colors.obj -!ENDIF - -!IFDEF OBJ__gimpui -OBJECTS = \ - 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 -!ELSE -EXTRALIBS = $(PYTHON)\libs\python23_d.lib user32.lib -!ENDIF - -EXTRACFLAGS = -I$(PYTHON)\include $(PYGOBJECT_CFLAGS) $(PYGTK_CFLAGS) -GIMPTOP=..\.. - -# Lib Extension is -MODULE_EXT = pyd - -!include ..\makefile.msc - -!ENDIF - -clean:: - del *.obj *.pyd *.lib *.ilk *.pdb *.exp - del gimpui.c - - - \ No newline at end of file diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index a2a5ee99e0..bf854d26ef 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -370,9 +370,7 @@ EXTRA_DIST = \ $(CORE_IMAGES) \ $(STOCK_IMAGES) \ $(WILBER_IMAGES) \ - gimp-dialog-icons.xcf.gz\ - makefile.msc - + gimp-dialog-icons.xcf.gz noinst_DATA = \ gimp-core-pixbufs.h \ diff --git a/themes/Default/images/makefile.msc b/themes/Default/images/makefile.msc deleted file mode 100644 index e41b412f41..0000000000 --- a/themes/Default/images/makefile.msc +++ /dev/null @@ -1,349 +0,0 @@ -# TOP = ..\..\.. -# !INCLUDE $(TOP)\glib\build\win32\make.msc - -STOCK_VARIABLES = \ - stock_anchor_16 stock-anchor-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 \ - stock_center_16 stock-center-16.png \ - stock_center_24 stock-center-24.png \ - stock_channel_16 stock-channel-16.png \ - stock_channel_24 stock-channel-24.png \ - stock_channel_32 stock-channel-32.png \ - stock_channel_48 stock-channel-48.png \ - stock_channel_alpha_16 stock-channel-alpha-16.png \ - stock_channel_alpha_24 stock-channel-alpha-24.png \ - stock_channel_alpha_32 stock-channel-alpha-32.png \ - stock_channel_alpha_48 stock-channel-alpha-48.png \ - stock_channel_blue_16 stock-channel-blue-16.png \ - stock_channel_blue_24 stock-channel-blue-24.png \ - stock_channel_blue_32 stock-channel-blue-32.png \ - stock_channel_blue_48 stock-channel-blue-48.png \ - stock_channel_gray_16 stock-channel-gray-16.png \ - stock_channel_gray_24 stock-channel-gray-24.png \ - stock_channel_gray_32 stock-channel-gray-32.png \ - stock_channel_gray_48 stock-channel-gray-48.png \ - stock_channel_green_16 stock-channel-green-16.png \ - stock_channel_green_24 stock-channel-green-24.png \ - stock_channel_green_32 stock-channel-green-32.png \ - stock_channel_green_48 stock-channel-green-48.png \ - stock_channel_indexed_16 stock-channel-indexed-16.png \ - stock_channel_indexed_24 stock-channel-indexed-24.png \ - stock_channel_indexed_32 stock-channel-indexed-32.png \ - stock_channel_indexed_48 stock-channel-indexed-48.png \ - stock_channel_red_16 stock-channel-red-16.png \ - stock_channel_red_24 stock-channel-red-24.png \ - stock_channel_red_32 stock-channel-red-32.png \ - stock_channel_red_48 stock-channel-red-48.png \ - stock_channels_16 stock-channels-16.png \ - stock_channels_24 stock-channels-24.png \ - stock_char_picker_22 stock-char-picker-22.png \ - stock_close_12 stock-close-12.png \ - stock_color_pick_from_screen_16 stock-color-pick-from-screen-16.png \ - stock_color_picker_black_18 stock-color-picker-black-18.png \ - stock_color_picker_gray_18 stock-color-picker-gray-18.png \ - stock_color_picker_white_18 stock-color-picker-white-18.png \ - 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 \ - stock_cursor_16 stock-cursor-16.png \ - stock_cursor_24 stock-cursor-24.png \ - stock_curve_free_16 stock-curve-free-16.png \ - stock_curve_smooth_16 stock-curve-smooth-16.png \ - stock_default_colors_12 stock-default-colors-12.png \ - stock_device_status_16 stock-device-status-16.png \ - 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_dynamics_16 stock-dynamics-16.png \ - stock_dynamics_22 stock-dynamics-22.png \ - stock_edit_16 stock-edit-16.png \ - stock_error_64 stock-error-64.png \ - stock_eye_12 stock-eye-12.png \ - stock_eye_20 stock-eye-20.png \ - stock_flip_horizontal_16 stock-flip-horizontal-16.png \ - stock_flip_vertical_16 stock-flip-vertical-16.png \ - stock_floating_selection_16 stock-floating-selection-16.png \ - stock_floating_selection_24 stock-floating-selection-24.png \ - stock_floating_selection_32 stock-floating-selection-32.png \ - stock_floating_selection_48 stock-floating-selection-48.png \ - stock_frame_64 stock-frame-64.png \ - stock_gegl_16 stock-gegl-16.png \ - stock_gegl_22 stock-gegl-22.png \ - stock_gradient_bilinear_16 stock-gradient-bilinear-16.png \ - stock_gradient_conical_asymmetric_16 stock-gradient-conical-asymmetric-16.png \ - stock_gradient_conical_symmetric_16 stock-gradient-conical-symmetric-16.png \ - stock_gradient_linear_16 stock-gradient-linear-16.png \ - stock_gradient_radial_16 stock-gradient-radial-16.png \ - stock_gradient_shapeburst_angular_16 stock-gradient-shapeburst-angular-16.png \ - stock_gradient_shapeburst_dimpled_16 stock-gradient-shapeburst-dimpled-16.png \ - stock_gradient_shapeburst_spherical_16 stock-gradient-shapeburst-spherical-16.png \ - stock_gradient_spiral_anticlockwise_16 stock-gradient-spiral-anticlockwise-16.png \ - stock_gradient_spiral_clockwise_16 stock-gradient-spiral-clockwise-16.png \ - stock_gradient_square_16 stock-gradient-square-16.png \ - stock_gravity_east_24 stock-gravity-east-24.png \ - stock_gravity_north_24 stock-gravity-north-24.png \ - stock_gravity_north_east_24 stock-gravity-north-east-24.png \ - stock_gravity_north_west_24 stock-gravity-north-west-24.png \ - stock_gravity_south_24 stock-gravity-south-24.png \ - stock_gravity_south_east_24 stock-gravity-south-east-24.png \ - stock_gravity_south_west_24 stock-gravity-south-west-24.png \ - stock_gravity_west_24 stock-gravity-west-24.png \ - stock_grid_16 stock-grid-16.png \ - stock_hcenter_24 stock-hcenter-24.png \ - stock_histogram_16 stock-histogram-16.png \ - stock_histogram_22 stock-histogram-22.png \ - stock_histogram_linear_16 stock-histogram-linear-16.png \ - stock_histogram_logarithmic_16 stock-histogram-logarithmic-16.png \ - stock_hchain_24 stock-hchain-24.png \ - stock_hchain_broken_24 stock-hchain-broken-24.png \ - stock_image_16 stock-image-16.png \ - stock_image_24 stock-image-24.png \ - stock_image_32 stock-image-32.png \ - stock_image_48 stock-image-48.png \ - stock_images_16 stock-images-16.png \ - stock_images_24 stock-images-24.png \ - stock_info_16 stock-info-16.png \ - stock_info_24 stock-info-24.png \ - stock_info_64 stock-info-64.png \ - stock_invert_16 stock-invert-16.png \ - stock_join_bevel_16 stock-join-bevel-16.png \ - stock_join_miter_16 stock-join-miter-16.png \ - stock_join_round_16 stock-join-round-16.png \ - stock_landscape_16 stock-landscape-16.png \ - stock_layer_16 stock-layer-16.png \ - stock_layer_24 stock-layer-24.png \ - stock_layer_32 stock-layer-32.png \ - stock_layer_48 stock-layer-48.png \ - stock_layer_mask_16 stock-layer-mask-16.png \ - stock_layer_mask_24 stock-layer-mask-24.png \ - stock_layer_mask_32 stock-layer-mask-32.png \ - stock_layer_mask_48 stock-layer-mask-48.png \ - stock_layer_to_imagesize_16 stock-layer-to-imagesize-16.png \ - stock_layers_16 stock-layers-16.png \ - stock_layers_24 stock-layers-24.png \ - stock_letter_spacing_22 stock-letter-spacing-22.png \ - stock_line_spacing_22 stock-line-spacing-22.png \ - stock_linked_12 stock-linked-12.png \ - stock_linked_20 stock-linked-20.png \ - stock_list_16 stock-list-16.png \ - stock_menu_left_12 stock-menu-left-12.png \ - stock_menu_right_12 stock-menu-right-12.png \ - stock_merge_down_16 stock-merge-down-16.png \ - stock_move_to_screen_16 stock-move-to-screen-16.png \ - stock_move_to_screen_24 stock-move-to-screen-24.png \ - stock_navigation_16 stock-navigation-16.png \ - stock_paste_as_new_16 stock-paste-as-new-16.png \ - stock_paste_into_16 stock-paste-into-16.png \ - stock_path_16 stock-path-16.png \ - stock_path_22 stock-path-22.png \ - stock_path_stroke_16 stock-path-stroke-16.png \ - stock_paths_16 stock-paths-16.png \ - stock_paths_22 stock-paths-22.png \ - stock_plugin_16 stock-plugin-16.png \ - stock_portrait_16 stock-portrait-16.png \ - stock_print_resolution_16 stock-print-resolution-16.png \ - stock_print_resolution_24 stock-print-resolution-24.png \ - stock_quick_mask_off_12 stock-quick-mask-off-12.png \ - stock_quick_mask_on_12 stock-quick-mask-on-12.png \ - stock_question_64 stock-question-64.png \ - stock_reset_16 stock-reset-16.png \ - stock_reshow_filter_16 stock-reshow-filter-16.png \ - stock_resize_16 stock-resize-16.png \ - stock_rotate_180_16 stock-rotate-180-16.png \ - stock_rotate_270_16 stock-rotate-270-16.png \ - stock_rotate_90_16 stock-rotate-90-16.png \ - stock_sample_point_16 stock-sample-point-16.png \ - stock_sample_point_24 stock-sample-point-24.png \ - stock_scale_16 stock-scale-16.png \ - stock_selection_16 stock-selection-16.png \ - stock_selection_add_16 stock-selection-add-16.png \ - stock_selection_all_16 stock-selection-all-16.png \ - stock_selection_border_16 stock-selection-border-16.png \ - stock_selection_grow_16 stock-selection-grow-16.png \ - stock_selection_intersect_16 stock-selection-intersect-16.png \ - stock_selection_none_16 stock-selection-none-16.png \ - stock_selection_replace_16 stock-selection-replace-16.png \ - stock_selection_shrink_16 stock-selection-shrink-16.png \ - stock_selection_stroke_16 stock-selection-stroke-16.png \ - stock_selection_subtract_16 stock-selection-subtract-16.png \ - stock_selection_to_channel_16 stock-selection-to-channel-16.png \ - stock_selection_to_path_16 stock-selection-to-path-16.png \ - stock_shape_circle_16 stock-shape-circle-16.png \ - stock_shape_diamond_16 stock-shape-diamond-16.png \ - stock_shape_square_16 stock-shape-square-16.png \ - stock_swap_colors_12 stock-swap-colors-12.png \ - stock_template_16 stock-template-16.png \ - stock_template_24 stock-template-24.png \ - stock_text_dir_ltr_24 stock-text-dir-ltr-24.png \ - stock_text_dir_rtl_24 stock-text-dir-rtl-24.png \ - stock_text_layer_16 stock-text-layer-16.png \ - stock_text_layer_24 stock-text-layer-24.png \ - stock_text_layer_32 stock-text-layer-32.png \ - stock_text_layer_48 stock-text-layer-48.png \ - stock_texture_64 stock-texture-64.png \ - stock_toilet_paper_16 stock-toilet-paper-16.png \ - stock_toilet_paper_24 stock-toilet-paper-24.png \ - stock_tool_options_16 stock-tool-options-16.png \ - stock_tool_preset_16 stock-tool-preset-16.png \ - stock_tool_preset_22 stock-tool-preset-22.png \ - stock_tool_options_24 stock-tool-options-24.png \ - stock_tools_16 stock-tools-16.png \ - stock_tools_24 stock-tools-24.png \ - stock_transparency_16 stock-transparency-16.png \ - stock_transparency_24 stock-transparency-24.png \ - stock_undo_history_16 stock-undo-history-16.png \ - stock_undo_history_24 stock-undo-history-24.png \ - stock_user_manual_16 stock-user-manual-16.png \ - stock_user_manual_32 stock-user-manual-32.png \ - stock_user_manual_64 stock-user-manual-64.png \ - stock_vcenter_24 stock-vcenter-24.png \ - stock_vchain_24 stock-vchain-24.png \ - stock_vchain_broken_24 stock-vchain-broken-24.png \ - stock_video_16 stock-video-16.png \ - stock_video_24 stock-video-24.png \ - stock_warning_16 stock-warning-16.png \ - stock_warning_24 stock-warning-24.png \ - stock_warning_64 stock-warning-64.png \ - stock_web_16 stock-web-16.png \ - stock_web_24 stock-web-24.png \ - \ - stock_zoom_follow_window_12 stock-zoom-follow-window-12.png - -STOCK_TOOL_VARIABLES = \ - stock_tool_airbrush_16 tools/stock-tool-airbrush-16.png \ - stock_tool_airbrush_22 tools/stock-tool-airbrush-22.png \ - stock_tool_align_16 tools/stock-tool-align-16.png \ - stock_tool_align_22 tools/stock-tool-align-22.png \ - stock_tool_blend_16 tools/stock-tool-blend-16.png \ - stock_tool_blend_22 tools/stock-tool-blend-22.png \ - stock_tool_blur_16 tools/stock-tool-blur-16.png \ - stock_tool_blur_22 tools/stock-tool-blur-22.png \ - stock_tool_brightness_contrast_16 tools/stock-tool-brightness-contrast-16.png \ - stock_tool_brightness_contrast_22 tools/stock-tool-brightness-contrast-22.png \ - stock_tool_bucket_fill_16 tools/stock-tool-bucket-fill-16.png \ - stock_tool_bucket_fill_22 tools/stock-tool-bucket-fill-22.png \ - stock_tool_by_color_select_16 tools/stock-tool-by-color-select-16.png \ - stock_tool_by_color_select_22 tools/stock-tool-by-color-select-22.png \ - stock_tool_cage_16 tools/stock-tool-cage-16.png \ - stock_tool_cage_22 tools/stock-tool-cage-22.png \ - stock_tool_clone_16 tools/stock-tool-clone-16.png \ - stock_tool_clone_22 tools/stock-tool-clone-22.png \ - stock_tool_color_balance_16 tools/stock-tool-color-balance-16.png \ - stock_tool_color_balance_22 tools/stock-tool-color-balance-22.png \ - stock_tool_color_picker_16 tools/stock-tool-color-picker-16.png \ - stock_tool_color_picker_22 tools/stock-tool-color-picker-22.png \ - stock_tool_colorize_16 tools/stock-tool-colorize-16.png \ - stock_tool_colorize_22 tools/stock-tool-colorize-22.png \ - stock_tool_crop_16 tools/stock-tool-crop-16.png \ - stock_tool_crop_22 tools/stock-tool-crop-22.png \ - stock_tool_curves_16 tools/stock-tool-curves-16.png \ - stock_tool_curves_22 tools/stock-tool-curves-22.png \ - stock_tool_dodge_16 tools/stock-tool-dodge-16.png \ - stock_tool_dodge_22 tools/stock-tool-dodge-22.png \ - stock_tool_ellipse_select_16 tools/stock-tool-ellipse-select-16.png \ - stock_tool_ellipse_select_22 tools/stock-tool-ellipse-select-22.png \ - stock_tool_eraser_16 tools/stock-tool-eraser-16.png \ - stock_tool_eraser_22 tools/stock-tool-eraser-22.png \ - stock_tool_flip_16 tools/stock-tool-flip-16.png \ - stock_tool_flip_22 tools/stock-tool-flip-22.png \ - stock_tool_foreground_select_16 tools/stock-tool-foreground-select-16.png \ - stock_tool_foreground_select_22 tools/stock-tool-foreground-select-22.png \ - stock_tool_free_select_16 tools/stock-tool-free-select-16.png \ - stock_tool_free_select_22 tools/stock-tool-free-select-22.png \ - stock_tool_fuzzy_select_16 tools/stock-tool-fuzzy-select-16.png \ - stock_tool_fuzzy_select_22 tools/stock-tool-fuzzy-select-22.png \ - stock_tool_heal_16 tools/stock-tool-heal-16.png \ - stock_tool_heal_22 tools/stock-tool-heal-22.png \ - stock_tool_hue_saturation_16 tools/stock-tool-hue-saturation-16.png \ - stock_tool_hue_saturation_22 tools/stock-tool-hue-saturation-22.png \ - stock_tool_ink_16 tools/stock-tool-ink-16.png \ - stock_tool_ink_22 tools/stock-tool-ink-22.png \ - stock_tool_iscissors_16 tools/stock-tool-iscissors-16.png \ - stock_tool_iscissors_22 tools/stock-tool-iscissors-22.png \ - stock_tool_levels_16 tools/stock-tool-levels-16.png \ - stock_tool_levels_22 tools/stock-tool-levels-22.png \ - stock_tool_measure_16 tools/stock-tool-measure-16.png \ - stock_tool_measure_22 tools/stock-tool-measure-22.png \ - stock_tool_move_16 tools/stock-tool-move-16.png \ - stock_tool_move_22 tools/stock-tool-move-22.png \ - stock_tool_paintbrush_16 tools/stock-tool-paintbrush-16.png \ - stock_tool_paintbrush_22 tools/stock-tool-paintbrush-22.png \ - stock_tool_path_16 tools/stock-tool-path-16.png \ - stock_tool_path_22 tools/stock-tool-path-22.png \ - stock_tool_pencil_16 tools/stock-tool-pencil-16.png \ - stock_tool_pencil_22 tools/stock-tool-pencil-22.png \ - stock_tool_perspective_16 tools/stock-tool-perspective-16.png \ - stock_tool_perspective_22 tools/stock-tool-perspective-22.png \ - stock_tool_perspective_clone_16 tools/stock-tool-perspective-clone-16.png \ - stock_tool_perspective_clone_22 tools/stock-tool-perspective-clone-22.png \ - stock_tool_posterize_16 tools/stock-tool-posterize-16.png \ - stock_tool_posterize_22 tools/stock-tool-posterize-22.png \ - stock_tool_rect_select_16 tools/stock-tool-rect-select-16.png \ - stock_tool_rect_select_22 tools/stock-tool-rect-select-22.png \ - stock_tool_rotate_16 tools/stock-tool-rotate-16.png \ - stock_tool_rotate_22 tools/stock-tool-rotate-22.png \ - stock_tool_scale_16 tools/stock-tool-scale-16.png \ - stock_tool_scale_22 tools/stock-tool-scale-22.png \ - stock_tool_shear_16 tools/stock-tool-shear-16.png \ - stock_tool_shear_22 tools/stock-tool-shear-22.png \ - stock_tool_smudge_16 tools/stock-tool-smudge-16.png \ - stock_tool_smudge_22 tools/stock-tool-smudge-22.png \ - stock_tool_text_16 tools/stock-tool-text-16.png \ - stock_tool_text_22 tools/stock-tool-text-22.png \ - stock_tool_threshold_16 tools/stock-tool-threshold-16.png \ - stock_tool_threshold_22 tools/stock-tool-threshold-22.png \ - stock_tool_zoom_16 tools/stock-tool-zoom-16.png \ - stock_tool_zoom_22 tools/stock-tool-zoom-22.png \ - -WILBER_VARIABLES = \ - stock_wilber_16 stock-wilber-16.png \ - stock_wilber_22 stock-wilber-22.png \ -# stock_wilber_48 stock-wilber-48.png \ - stock_wilber_64 stock-wilber-64.png \ - stock_wilber_eek_64 stock-wilber-eek-64.png \ - -CORE_VARIABLES = \ - stock_question_64 stock-question-64.png - - -all: \ - gimp-core-pixbufs.h \ - gimp-stock-pixbufs.h \ - gimp-wilber-pixbufs.h - -gimp-core-pixbufs.h : $(CORE_IMAGES) makefile.msc - gdk-pixbuf-csource --raw --build-list $(CORE_VARIABLES) > gimp-core-pixbufs.h - -gimp-stock-pixbufs.h: $(STOCK_IMAGES) makefile.msc - gdk-pixbuf-csource --raw --build-list $(STOCK_VARIABLES) > gimp-stock-pixbufs.h - gdk-pixbuf-csource --raw --build-list $(STOCK_TOOL_VARIABLES) >> gimp-stock-pixbufs.h - gdk-pixbuf-csource --raw --build-list $(WILBER_VARIABLES) >> gimp-stock-pixbufs.h - -gimp-wilber-pixbufs.h: $(WILBER_IMAGES) makefile.msc - gdk-pixbuf-csource --raw --build-list $(WILBER_VARIABLES) > gimp-wilber-pixbufs.h