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
This commit is contained in:
Hans Breuer 2004-02-07 23:01:33 +00:00 committed by Hans Breuer
parent 6ca7ef5647
commit 5cbb416a91
32 changed files with 173 additions and 130 deletions

View File

@ -1,3 +1,9 @@
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> 2004-02-07 Pedro Gimeno <pggimeno@wanadoo.es>
* app/core/gimpimage-convert.c (median_cut_pass2_no_dither_rgb): * app/core/gimpimage-convert.c (median_cut_pass2_no_dither_rgb):

View File

@ -56,6 +56,7 @@ EXTRA_DIST = \
gimp.spec.in \ gimp.spec.in \
gimp.spec \ gimp.spec \
gimp-zip.in \ gimp-zip.in \
gimpdefs.msc \
gimptool-win32.c.in \ gimptool-win32.c.in \
intltool-extract.in \ intltool-extract.in \
intltool-merge.in \ intltool-merge.in \

View File

@ -1,11 +1,13 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
# and slightly modified # and slightly modified
PACKAGE = appbase
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = appbase !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
PKG_LINK = \ PKG_LINK = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \

View File

@ -1,9 +1,11 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = appcomposite
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = appcomposite !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP) top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP) top_builddir = $(PRJ_TOP)

View File

@ -1,11 +1,14 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
# and slightly modified # and slightly modified
PACKAGE = appconfig
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = appconfig !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
PKG_LINK = \ PKG_LINK = \
# ..\base\appbase-$(PKG_VER).lib \ # ..\base\appbase-$(PKG_VER).lib \

View File

@ -1,9 +1,11 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = appcore
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = appcore !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
PKG_LINK = \ PKG_LINK = \
$(GLIB_LIBS) $(GTK_PIXBUF_LIBS) $(INTL_LIBS) $(LIBART_LIBS) \ $(GLIB_LIBS) $(GTK_PIXBUF_LIBS) $(INTL_LIBS) $(LIBART_LIBS) \

View File

@ -1,10 +1,13 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
# and slightly modified # and slightly modified
PACKAGE = appdisplay
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = appdisplay !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
INCLUDES = \ INCLUDES = \
-FImsvc_recommended_pragmas.h \ -FImsvc_recommended_pragmas.h \
@ -32,6 +35,7 @@ OBJECTS = \
gimpdisplayshell-callbacks.obj \ gimpdisplayshell-callbacks.obj \
gimpdisplayshell-cursor.obj \ gimpdisplayshell-cursor.obj \
gimpdisplayshell-dnd.obj \ gimpdisplayshell-dnd.obj \
gimpdisplayshell-draw.obj \
gimpdisplayshell-filter.obj \ gimpdisplayshell-filter.obj \
gimpdisplayshell-filter-dialog.obj \ gimpdisplayshell-filter-dialog.obj \
gimpdisplayshell-handlers.obj \ gimpdisplayshell-handlers.obj \

View File

@ -1,9 +1,12 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = appfile
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = appfile !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
OBJECTS = \ OBJECTS = \
file-open.obj \ file-open.obj \

View File

@ -1,9 +1,12 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = appgui
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = appgui !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP) top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP) top_builddir = $(PRJ_TOP)

View File

@ -1,16 +1,19 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
# and slightly modified # and slightly modified
PACKAGE = gimp
TOP = ..\.. TOP = ..\..
PRJ_TOP = .. PRJ_TOP = ..
PACKAGE = gimp !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP) top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP) top_builddir = $(PRJ_TOP)
includedir = $(PRJ_TOP) includedir = $(PRJ_TOP)
LT_RELEASE = $(PKG_VER) LT_RELEASE = $(PKG_VER)
SUBDIRS = composite paint-funcs base config xcf core file text \ SUBDIRS = composite paint-funcs base config xcf core file text \
display paint vectors pdb plug-in tools widgets gui display paint vectors pdb plug-in tools widgets gui

View File

@ -1,9 +1,11 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = apppaint-funcs
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = apppaint-funcs !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP) top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP) top_builddir = $(PRJ_TOP)
@ -32,8 +34,9 @@ INCLUDES = \
all : \ all : \
$(PRJ_TOP)\config.h \ $(PRJ_TOP)\config.h \
$(PACKAGE).lib \ $(PACKAGE).lib \
!IFDEF DLLGIMP
$(PACKAGE)-$(PKG_VER).dll $(PACKAGE)-$(PKG_VER).dll
!ENDIF
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h

View File

@ -1,9 +1,12 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = apppaint
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = apppaint !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP) top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP) top_builddir = $(PRJ_TOP)

View File

@ -1,9 +1,12 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = apppdb
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = apppdb !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP) top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP) top_builddir = $(PRJ_TOP)
@ -53,7 +56,6 @@ OBJECTS = \
layer_cmds.obj \ layer_cmds.obj \
message_cmds.obj \ message_cmds.obj \
misc_cmds.obj \ misc_cmds.obj \
misc_tools_cmds.obj \
paint_tools_cmds.obj \ paint_tools_cmds.obj \
palette_cmds.obj \ palette_cmds.obj \
palettes_cmds.obj \ palettes_cmds.obj \

View File

@ -1,9 +1,12 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = appplug-in
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = appplug-in !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
PKG_LINK = \ PKG_LINK = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \

View File

@ -1,9 +1,12 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = apptext
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = apptext !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
PKG_LINK = \ PKG_LINK = \
$(GLIB_LIBS) $(PANGOFT2_LIBS) \ $(GLIB_LIBS) $(PANGOFT2_LIBS) \

View File

@ -1,9 +1,12 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = apptools
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = apptools !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP) top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP) top_builddir = $(PRJ_TOP)

View File

@ -1,9 +1,12 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = appvectors
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = appvectors !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
PKG_LINK = \ PKG_LINK = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \

View File

@ -1,9 +1,12 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = appwidgets
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = appwidgets !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP) top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP) top_builddir = $(PRJ_TOP)
@ -45,6 +48,7 @@ OBJECTS = \
gimpcontainerview.obj \ gimpcontainerview.obj \
gimpcontainerview-utils.obj \ gimpcontainerview-utils.obj \
gimpcursor.obj \ gimpcursor.obj \
gimpdasheditor.obj \
gimpdataeditor.obj \ gimpdataeditor.obj \
gimpdatafactoryview.obj \ gimpdatafactoryview.obj \
gimpdeviceinfo.obj \ gimpdeviceinfo.obj \

View File

@ -1,9 +1,11 @@
# autogenerated from automake.am with automake.py # autogenerated from automake.am with automake.py
PACKAGE = xcf
TOP = ..\..\.. TOP = ..\..\..
PRJ_TOP = ..\.. PRJ_TOP = ..\..
PACKAGE = xcf !include $(TOP)\glib\build\win32\make.msc
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(PRJ_TOP)\gimpdefs.msc
PKG_VER = $(GIMP_VER)
top_srcdir = $(PRJ_TOP) top_srcdir = $(PRJ_TOP)
top_builddir = $(PRJ_TOP) top_builddir = $(PRJ_TOP)

15
gimpdefs.msc Normal file
View File

@ -0,0 +1,15 @@
# 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

View File

@ -1,19 +1,9 @@
## Makefile for building the GIMP DLLs and LIBs with Microsoft C. ## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc ## 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 = ..\.. TOP = ..\..
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(TOP)\glib\build\win32\make.msc
!INCLUDE ..\gimpdefs.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)
################################################################ ################################################################
@ -66,7 +56,6 @@ PDB_WRAPPERS_O = \
gimplayer_pdb.obj \ gimplayer_pdb.obj \
gimpmessage_pdb.obj \ gimpmessage_pdb.obj \
gimpmisc_pdb.obj \ gimpmisc_pdb.obj \
gimpmisctools_pdb.obj \
gimppainttools_pdb.obj \ gimppainttools_pdb.obj \
gimppalette_pdb.obj \ gimppalette_pdb.obj \
gimppalettes_pdb.obj \ gimppalettes_pdb.obj \
@ -110,10 +99,11 @@ gimp_OBJECTS = \
# gimphelp.obj \ # gimphelp.obj \
gimpimage.obj \ gimpimage.obj \
gimplayer.obj \ gimplayer.obj \
gimpmisc.obj \
gimppatternselect.obj \ gimppatternselect.obj \
gimppixelfetcher.obj \
gimppixelrgn.obj \ gimppixelrgn.obj \
gimpproceduraldb.obj \ gimpproceduraldb.obj \
gimpregioniterator.obj \
gimpselection.obj \ gimpselection.obj \
gimptile.obj \ gimptile.obj \
gimpunitcache.obj \ gimpunitcache.obj \
@ -140,7 +130,6 @@ gimpui_OBJECTS = \
gimpmenu.obj \ gimpmenu.obj \
gimppatternmenu.obj \ gimppatternmenu.obj \
gimpexport.obj \ gimpexport.obj \
gimpmiscui.obj \
# gimppatheditor.obj \ # gimppatheditor.obj \
gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def

View File

@ -3,12 +3,11 @@
TOP = ..\.. TOP = ..\..
PRJ_TOP = .. PRJ_TOP = ..
PACKAGE = gimpbase PACKAGE = gimpbase
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(TOP)\glib\build\win32\make.msc
# The name of the directory in your %HOME% where the GIMP's personal settings !INCLUDE $(PRJ_TOP)\gimpdefs.msc
# and stuff is saved. PKG_VER = $(GIMP_VER)
GIMPDIR = _gimp$(PKG_VER)
DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DDATADIR=\"\" -DSYSCONFDIR=\"\" \ DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DDATADIR=\"\" -DSYSCONFDIR=\"\" \
-DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\" -DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\"

View File

@ -1,18 +1,12 @@
## Makefile for building the GIMP DLLs and LIBs with Microsoft C. ## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc ## 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 = ..\.. TOP = ..\..
PRJ_TOP = ..
!include $(TOP)\glib\build\win32\make.msc !include $(TOP)\glib\build\win32\make.msc
GIMP_VER = 1.3 !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$(GIMP_VER)
################################################################ ################################################################

View File

@ -1,18 +1,12 @@
## Makefile for building the GIMP DLLs and LIBs with Microsoft C. ## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc ## 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 = ..\.. TOP = ..\..
PRJ_TOP = ..
!include $(TOP)\glib\build\win32\make.msc !include $(TOP)\glib\build\win32\make.msc
GIMP_VER = 1.3 !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$(GIMP_VER)
################################################################ ################################################################

View File

@ -3,12 +3,11 @@
TOP = ..\.. TOP = ..\..
PRJ_TOP = .. PRJ_TOP = ..
PACKAGE = gimpmodule 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=\"\" \ DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DDATADIR=\"\" -DSYSCONFDIR=\"\" \
-DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\" -DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\"

View File

@ -1,18 +1,12 @@
## Makefile for building the GIMP DLLs and LIBs with Microsoft C. ## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc ## 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 = ..\.. TOP = ..\..
PRJ_TOP = ..
!include $(TOP)\glib\build\win32\make.msc !include $(TOP)\glib\build\win32\make.msc
GIMP_VER = 1.3 !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$(GIMP_VER)
################################################################ ################################################################

View File

@ -1,18 +1,12 @@
## Makefile for building the GIMP DLLs and LIBs with Microsoft C. ## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
## Use: nmake -f makefile.msc ## 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 = ..\.. TOP = ..\..
PRJ_TOP = ..
!include $(TOP)\glib\build\win32\make.msc !include $(TOP)\glib\build\win32\make.msc
GIMP_VER = 1.3 !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$(GIMP_VER)
################################################################ ################################################################

View File

@ -1,9 +1,11 @@
TOP = .. TOP = ..
PRJ_TOP = . PRJ_TOP = .
PACKAGE = gimp 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)
# in required build order # in required build order
# ./themes gets extra handling below # ./themes gets extra handling below
SUBDIRS = \ SUBDIRS = \

View File

@ -1,11 +1,6 @@
## Makefile for building gimp modules with Microsoft C ## Makefile for building gimp modules with Microsoft C
## Use: nmake -f makefile.msc ## 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 = ..\.. TOP = ..\..
################################################################ ################################################################
@ -13,8 +8,7 @@ TOP = ..\..
# Nothing much configurable below # Nothing much configurable below
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(TOP)\glib\build\win32\make.msc
!INCLUDE ..\gimpdefs.msc
GIMP_VER = 1.3
INCLUDES = \ INCLUDES = \
-FImsvc_recommended_pragmas.h \ -FImsvc_recommended_pragmas.h \
@ -30,6 +24,7 @@ MODULES = \
# colorsel_gtk-$(GIMP_VER).dll \ # colorsel_gtk-$(GIMP_VER).dll \
colorsel_triangle-$(GIMP_VER).dll \ colorsel_triangle-$(GIMP_VER).dll \
colorsel_water-$(GIMP_VER).dll \ colorsel_water-$(GIMP_VER).dll \
colorsel_cmyk-$(GIMP_VER).dll \
cdisplay_colorblind-$(GIMP_VER).dll \ cdisplay_colorblind-$(GIMP_VER).dll \
cdisplay_gamma-$(GIMP_VER).dll \ cdisplay_gamma-$(GIMP_VER).dll \
cdisplay_highcontrast-$(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 \ ..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
$(DEPLIBS) $(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 cdisplay_colorblind-$(GIMP_VER).dll : cdisplay_colorblind.obj
$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_colorblind.obj $(LDFLAGS) ..\app\gimp.lib \ $(CC) $(CFLAGS) -LD -Fe$@ cdisplay_colorblind.obj $(LDFLAGS) ..\app\gimp.lib \
..\libgimpbase\gimpbase-$(GIMP_VER).lib \ ..\libgimpbase\gimpbase-$(GIMP_VER).lib \

View File

@ -19,6 +19,7 @@ GIMPTOP = ..
TOP = ..\$(GIMPTOP) TOP = ..\$(GIMPTOP)
!INCLUDE $(TOP)\glib\build\win32\make.msc !INCLUDE $(TOP)\glib\build\win32\make.msc
!INCLUDE $(GIMPTOP)\gimpdefs.msc
!IFNDEF LIBRARY !IFNDEF LIBRARY
!IFNDEF PLUGIN !IFNDEF PLUGIN
@ -472,8 +473,12 @@ OBJECTS = \
!IFDEF EXTRA_gimpressionist !IFDEF EXTRA_gimpressionist
gimpressionist.c: logo-pixbuf.h
logo-pixbuf.h: logo.png
gdk-pixbuf-csource --raw --name=logo_data logo.png > $(@F)
OBJECTS = \ OBJECTS = \
about.obj \
brush.obj \ brush.obj \
color.obj \ color.obj \
general.obj \ general.obj \
@ -573,8 +578,6 @@ EXTRACFLAGS = $(JPEG_CFLAGS)
EXTRALIBS = $(JPEG_LIBS) EXTRALIBS = $(JPEG_LIBS)
!ENDIF !ENDIF
GIMP_VER = 1.3
PLUGINDIR = $(GIMPTOP)\plug-ins PLUGINDIR = $(GIMPTOP)\plug-ins
!IFNDEF OPTIMIZE !IFNDEF OPTIMIZE
@ -593,7 +596,7 @@ LINKDEBUG = /debug
RTL = -MDd RTL = -MDd
!ENDIF !ENDIF
CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200 CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm400
CFLAGS = -FImsvc_recommended_pragmas.h \ CFLAGS = -FImsvc_recommended_pragmas.h \
-DHAVE_CONFIG_H $(EXTRACFLAGS) \ -DHAVE_CONFIG_H $(EXTRACFLAGS) \

View File

@ -4,14 +4,8 @@
TOP = ..\.. TOP = ..\..
PRJ_TOP = .. PRJ_TOP = ..
PACKAGE = regexrepl PACKAGE = regexrepl
PKG_VER = 1.3
!INCLUDE $(TOP)\glib\build\win32\make.msc !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 .. PKG_CFLAGS = -I ..
OBJECTS = \ OBJECTS = \

View File

@ -59,6 +59,10 @@ STOCK_VARIABLES = \
stock_channel_green_24 stock-channel-green-24.png \ stock_channel_green_24 stock-channel-green-24.png \
stock_channel_green_32 stock-channel-green-32.png \ stock_channel_green_32 stock-channel-green-32.png \
stock_channel_green_48 stock-channel-green-48.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_16 stock-channel-red-16.png \
stock_channel_red_24 stock-channel-red-24.png \ stock_channel_red_24 stock-channel-red-24.png \
stock_channel_red_32 stock-channel-red-32.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_24 stock-layer-24.png \
stock_layer_32 stock-layer-32.png \ stock_layer_32 stock-layer-32.png \
stock_layer_48 stock-layer-48.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_layer_to_imagesize_16 stock-layer-to-imagesize-16.png \
stock_layers_16 stock-layers-16.png \ stock_layers_16 stock-layers-16.png \
stock_layers_24 stock-layers-24.png \ stock_layers_24 stock-layers-24.png \
@ -194,6 +202,7 @@ STOCK_VARIABLES = \
stock_selection_16 stock-selection-16.png \ stock_selection_16 stock-selection-16.png \
stock_selection_add_16 stock-selection-add-16.png \ stock_selection_add_16 stock-selection-add-16.png \
stock_selection_all_16 stock-selection-all-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_grow_16 stock-selection-grow-16.png \
stock_selection_intersect_16 stock-selection-intersect-16.png \ stock_selection_intersect_16 stock-selection-intersect-16.png \
stock_selection_none_16 stock-selection-none-16.png \ stock_selection_none_16 stock-selection-none-16.png \