Commit 5cbb416a authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

new file to keep common definitions for the msc build use common

2004-02-07  Hans Breuer  <hans@breuer.org>

	* gimpdefs.msc : new file to keep common definitions for the msc build
	* **/makefile.msc : use common defintions, e.g. GIMP_VER
	* Makefile.am : add the former to EXTRA_DIST
parent 6ca7ef56
2004-02-07 Hans Breuer <hans@breuer.org>
* gimpdefs.msc : new file to keep common definitions for the msc build
* **/makefile.msc : use common defintions, e.g. GIMP_VER
* Makefile.am : add the former to EXTRA_DIST
2004-02-07 Pedro Gimeno <pggimeno@wanadoo.es>
* app/core/gimpimage-convert.c (median_cut_pass2_no_dither_rgb):
......@@ -56,6 +56,7 @@ EXTRA_DIST = \
gimp.spec.in \
gimp.spec \
gimp-zip.in \
gimpdefs.msc \
gimptool-win32.c.in \
intltool-extract.in \
intltool-merge.in \
......
# autogenerated from automake.am with automake.py
# and slightly modified
PACKAGE = appbase
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appbase
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
PKG_LINK = \
$(GLIB_LIBS) \
......
# autogenerated from automake.am with automake.py
PACKAGE = appcomposite
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appcomposite
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
......
# autogenerated from automake.am with automake.py
# and slightly modified
PACKAGE = appconfig
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appconfig
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
PKG_LINK = \
# ..\base\appbase-$(PKG_VER).lib \
......
# autogenerated from automake.am with automake.py
PACKAGE = appcore
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appcore
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!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) \
......
# autogenerated from automake.am with automake.py
# and slightly modified
PACKAGE = appdisplay
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appdisplay
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
INCLUDES = \
-FImsvc_recommended_pragmas.h \
......@@ -32,6 +35,7 @@ OBJECTS = \
gimpdisplayshell-callbacks.obj \
gimpdisplayshell-cursor.obj \
gimpdisplayshell-dnd.obj \
gimpdisplayshell-draw.obj \
gimpdisplayshell-filter.obj \
gimpdisplayshell-filter-dialog.obj \
gimpdisplayshell-handlers.obj \
......
# autogenerated from automake.am with automake.py
PACKAGE = appfile
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appfile
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
OBJECTS = \
file-open.obj \
......
# autogenerated from automake.am with automake.py
PACKAGE = appgui
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appgui
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
......
# autogenerated from automake.am with automake.py
# and slightly modified
PACKAGE = gimp
TOP = ..\..
PRJ_TOP = ..
PACKAGE = gimp
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!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 \
display paint vectors pdb plug-in tools widgets gui
......
# autogenerated from automake.am with automake.py
PACKAGE = apppaint-funcs
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = apppaint-funcs
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
......@@ -32,8 +34,9 @@ INCLUDES = \
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
......
# autogenerated from automake.am with automake.py
PACKAGE = apppaint
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = apppaint
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
......
# autogenerated from automake.am with automake.py
PACKAGE = apppdb
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = apppdb
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
......@@ -53,7 +56,6 @@ OBJECTS = \
layer_cmds.obj \
message_cmds.obj \
misc_cmds.obj \
misc_tools_cmds.obj \
paint_tools_cmds.obj \
palette_cmds.obj \
palettes_cmds.obj \
......
# autogenerated from automake.am with automake.py
PACKAGE = appplug-in
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appplug-in
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
PKG_LINK = \
$(GLIB_LIBS) \
......
# autogenerated from automake.am with automake.py
PACKAGE = apptext
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = apptext
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
PKG_LINK = \
$(GLIB_LIBS) $(PANGOFT2_LIBS) \
......
# autogenerated from automake.am with automake.py
PACKAGE = apptools
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = apptools
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
......
# autogenerated from automake.am with automake.py
PACKAGE = appvectors
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appvectors
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
PKG_LINK = \
$(GLIB_LIBS) \
......
# autogenerated from automake.am with automake.py
PACKAGE = appwidgets
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = appwidgets
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
......@@ -45,6 +48,7 @@ OBJECTS = \
gimpcontainerview.obj \
gimpcontainerview-utils.obj \
gimpcursor.obj \
gimpdasheditor.obj \
gimpdataeditor.obj \
gimpdatafactoryview.obj \
gimpdeviceinfo.obj \
......
# autogenerated from automake.am with automake.py
PACKAGE = xcf
TOP = ..\..\..
PRJ_TOP = ..\..
PACKAGE = xcf
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
......
# 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 the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
# 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 The Gimp
# Tries to not depend on ft2
#PANGO_WIN32_EXTENDED = 1
## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc
# Change this to wherever you want to install the DLLs. This directory
# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
# only, it probably is best to keep them in the GIMP's bin directory.
BIN = C:\install\gimp\bin
TOP = ..\..
!INCLUDE $(TOP)\glib\build\win32\make.msc
GIMP_VER = 1.3
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
!INCLUDE ..\gimpdefs.msc
################################################################
......@@ -66,7 +56,6 @@ PDB_WRAPPERS_O = \
gimplayer_pdb.obj \
gimpmessage_pdb.obj \
gimpmisc_pdb.obj \
gimpmisctools_pdb.obj \
gimppainttools_pdb.obj \
gimppalette_pdb.obj \
gimppalettes_pdb.obj \
......@@ -110,10 +99,11 @@ gimp_OBJECTS = \
# gimphelp.obj \
gimpimage.obj \
gimplayer.obj \
gimpmisc.obj \
gimppatternselect.obj \
gimppixelfetcher.obj \
gimppixelrgn.obj \
gimpproceduraldb.obj \
gimpregioniterator.obj \
gimpselection.obj \
gimptile.obj \
gimpunitcache.obj \
......@@ -140,7 +130,6 @@ gimpui_OBJECTS = \
gimpmenu.obj \
gimppatternmenu.obj \
gimpexport.obj \
gimpmiscui.obj \
# gimppatheditor.obj \
gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def
......
......@@ -3,12 +3,11 @@
TOP = ..\..
PRJ_TOP = ..
PACKAGE = gimpbase
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(PKG_VER)
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DDATADIR=\"\" -DSYSCONFDIR=\"\" \
-DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\"
......
## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc
# Change this to wherever you want to install the DLLs. This directory
# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
# only, it probably is best to keep them in the GIMP's bin directory.
BIN = C:\install\gimp\bin
TOP = ..\..
PRJ_TOP = ..
!include $(TOP)\glib\build\win32\make.msc
GIMP_VER = 1.3
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
################################################################
......
## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc
# Change this to wherever you want to install the DLLs. This directory
# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
# only, it probably is best to keep them in the GIMP's bin directory.
BIN = C:\install\gimp\bin
TOP = ..\..
PRJ_TOP = ..
!include $(TOP)\glib\build\win32\make.msc
GIMP_VER = 1.3
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
################################################################
......
......@@ -3,12 +3,11 @@
TOP = ..\..
PRJ_TOP = ..
PACKAGE = gimpmodule
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
!include $(TOP)\glib\build\win32\make.msc
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(PKG_VER)
DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DDATADIR=\"\" -DSYSCONFDIR=\"\" \
-DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\"
......
## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc
# Change this to wherever you want to install the DLLs. This directory
# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
# only, it probably is best to keep them in the GIMP's bin directory.
BIN = C:\install\gimp\bin
TOP = ..\..
PRJ_TOP = ..
!include $(TOP)\glib\build\win32\make.msc
GIMP_VER = 1.3
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
################################################################
......
## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc
# Change this to wherever you want to install the DLLs. This directory
# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
# only, it probably is best to keep them in the GIMP's bin directory.
BIN = C:\install\gimp\bin
TOP = ..\..
PRJ_TOP = ..
!include $(TOP)\glib\build\win32\make.msc
GIMP_VER = 1.3
# The name of the directory in your %HOME% where the GIMP's personal settings
# and stuff is saved.
GIMPDIR = _gimp$(GIMP_VER)
!INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
################################################################
......
TOP = ..
PRJ_TOP = .
PACKAGE = gimp
PKG_VER = 1.3
!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 = \
......
## Makefile for building gimp modules with Microsoft C
## Use: nmake -f makefile.msc
# Change this to wherever you install gimp.
# This is what I use as installation target, from where the installer-builder
# will pick it up.
GIMP = \install\gimp
TOP = ..\..
################################################################
......@@ -13,8 +8,7 @@ TOP = ..\..
# Nothing much configurable below
!INCLUDE $(TOP)\glib\build\win32\make.msc
GIMP_VER = 1.3
!INCLUDE ..\gimpdefs.msc
INCLUDES = \
-FImsvc_recommended_pragmas.h \
......@@ -30,6 +24,7 @@ MODULES = \
# colorsel_gtk-$(GIMP_VER).dll \
colorsel_triangle-$(GIMP_VER).dll \
colorsel_water-$(GIMP_VER).dll \
colorsel_cmyk-$(GIMP_VER).dll \
cdisplay_colorblind-$(GIMP_VER).dll \
cdisplay_gamma-$(GIMP_VER).dll \
cdisplay_highcontrast-$(GIMP_VER).dll
......@@ -65,6 +60,13 @@ colorsel_water-$(GIMP_VER).dll : colorsel_water.obj
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(DEPLIBS)
colorsel_cmyk-$(GIMP_VER).dll : colorsel_cmyk.obj
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_cmyk.obj $(LDFLAGS) \
..\app\gimp.lib \
..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(DEPLIBS)
cdisplay_colorblind-$(GIMP_VER).dll : cdisplay_colorblind.obj
$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_colorblind.obj $(LDFLAGS) ..\app\gimp.lib \
..\libgimpbase\gimpbase-$(GIMP_VER).lib \
......
......@@ -19,6 +19,7 @@ GIMPTOP = ..
TOP = ..\$(GIMPTOP)
!INCLUDE $(TOP)\glib\build\win32\make.msc
!INCLUDE $(GIMPTOP)\gimpdefs.msc
!IFNDEF LIBRARY
!IFNDEF PLUGIN
......@@ -472,8 +473,12 @@ OBJECTS = \
!IFDEF EXTRA_gimpressionist
gimpressionist.c: logo-pixbuf.h
logo-pixbuf.h: logo.png
gdk-pixbuf-csource --raw --name=logo_data logo.png > $(@F)
OBJECTS = \
about.obj \
brush.obj \
color.obj \
general.obj \
......@@ -573,8 +578,6 @@ EXTRACFLAGS = $(JPEG_CFLAGS)
EXTRALIBS = $(JPEG_LIBS)
!ENDIF
GIMP_VER = 1.3
PLUGINDIR = $(GIMPTOP)\plug-ins
!IFNDEF OPTIMIZE
......@@ -593,7 +596,7 @@ LINKDEBUG = /debug
RTL = -MDd
!ENDIF
CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200
CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm400
CFLAGS = -FImsvc_recommended_pragmas.h \
-DHAVE_CONFIG_H $(EXTRACFLAGS) \
......
......@@ -4,14 +4,8 @@
TOP = ..\..
PRJ_TOP = ..
PACKAGE = regexrepl
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc
top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP)
includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER)
PKG_CFLAGS = -I ..
OBJECTS = \
......
......@@ -59,6 +59,10 @@ STOCK_VARIABLES = \
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 \
......@@ -138,6 +142,10 @@ STOCK_VARIABLES = \
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 \
......@@ -194,6 +202,7 @@ STOCK_VARIABLES = \
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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment