Commit 9a1d5f34 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

**/makefile.msc app/gimpcore.def : updated so it compiles and links

2008-01-04  Hans Breuer  <hans@breuer.org>

	**/makefile.msc app/gimpcore.def : updated so it compiles and links
	(almost, see bug #507298)

svn path=/trunk/; revision=24533
parent 08582c36
2008-01-04 Hans Breuer <hans@breuer.org>
**/makefile.msc app/gimpcore.def : updated so it compiles and links
(almost, see bug #507298)
2008-01-04 Sven Neumann <sven@gimp.org>
Merged from gimp-2-4 branch:
......
......@@ -9,7 +9,7 @@ PKG_VER = $(GIMP_VER)
PKG_LINK = \
$(GLIB_LIBS) $(GTK_PIXBUF_LIBS) $(INTL_LIBS) $(LIBART_LIBS) \
$(PANGOWIN32_LIBS) $(GDK_PIXBUF_LIBS) \
$(PANGOWIN32_LIBS) $(GDK_PIXBUF_LIBS) $(GEGL_LIBS) \
# $(PANGOFT2_LIBS) \
\
..\..\regexrepl\regexrepl.lib \
......@@ -68,6 +68,7 @@ OBJECTS = \
gimpcontext.obj \
gimpcoords.obj \
gimpcurve.obj \
gimpcurve-load.obj \
gimpcurve-save.obj \
gimpdashpattern.obj \
gimpdata.obj \
......@@ -84,6 +85,7 @@ OBJECTS = \
gimpdrawable-invert.obj \
gimpdrawable-levels.obj \
gimpdrawable-offset.obj \
gimpdrawable-operation.obj \
gimpdrawable-preview.obj \
gimpdrawable-stroke.obj \
gimpdrawable-transform.obj \
......@@ -191,6 +193,7 @@ INCLUDES = \
-I$(PRJ_TOP)/app \
$(GTK2_CFLAGS) \
$(LIBART_CFLAGS) \
$(GEGL_CFLAGS)
DEFINES = \
-DGIMP_COMPILATION \
......
......@@ -13,7 +13,7 @@ INCLUDES = \
-FImsvc_recommended_pragmas.h \
-I$(PRJ_TOP) \
-I$(PRJ_TOP)/app \
$(GTK2_CFLAGS) \
$(GTK2_CFLAGS)
DEFINES = \
-DG_LOG_DOMAIN=\"Gimp-Display\"
......
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
INCLUDES = \
-FImsvc_recommended_pragmas.h \
-I$(PRJ_TOP) \
-I$(PRJ_TOP)/app \
$(GTK2_CFLAGS) \
$(GEGL_CFLAGS)
DEFINES = \
-DGIMP_COMPILATION \
-DGIMP_APP_VERSION=\"2.4\" \
-DG_LOG_DOMAIN=\"Gimp-Gegl\"
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) $<
......@@ -512,7 +512,6 @@ EXPORTS
gimp_projection_flush_now
gimp_projection_get_bytes
gimp_projection_get_image_type
gimp_projection_get_opacity
gimp_projection_get_tiles
gimp_rc_get_type
gimp_rc_new
......@@ -927,3 +926,7 @@ gimp_curve_move_point
gimp_curve_set_curve
gimp_curve_set_curve_type
gimp_curve_get_closest_point
gimp_gegl_init
gimp_image_get_guides
gimp_image_get_sample_points
gimp_plug_in_manager_get_menu_branches
......@@ -46,6 +46,7 @@ GIMP_CORE_OBJECTS = \
config/appconfig.lib \
core/appcore.lib \
file/appfile.lib \
gegl/appgegl.lib \
paint/apppaint.lib \
paint-funcs/apppaint-funcs.lib \
pdb/apppdb.lib \
......@@ -72,6 +73,7 @@ PKG_LINK = \
$(LIBART_LIBS) \
$(PANGOWIN32_LIBS) \
$(PANGOCAIRO_LIBS) \
$(GEGL_LIBS) $(BABL_LIBS) \
!IFNDEF PANGO_WIN32_EXTENDED
$(PANGOFT2_LIBS) \
$(FREETYPE2_LIBS) \
......@@ -87,6 +89,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK2_CFLAGS) \
$(GEGL_CFLAGS) \
!IFNDEF PANGO_WIN32_EXTENDED
$(FONTCONFIG_CFLAGS) \
$(FREETYPE2_CFLAGS) \
......
......@@ -80,6 +80,7 @@ OBJECTS = \
vectors_cmds.obj \
\
gimppdb.obj \
gimppdb-utils.obj \
gimppdberror.obj \
\
gimp-pdb-compat.obj \
......
......@@ -114,6 +114,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK2_CFLAGS) $(FREETYPE2_CFLAGS) \
$(GEGL_CFLAGS) \
-I$(includedir)
all : \
......
......@@ -35,7 +35,6 @@ OBJECTS = \
gimpbrushfactoryview.obj \
gimpbrushselect.obj \
gimpbufferview.obj \
gimpcairo-utils.obj \
gimpcellrendererdashes.obj \
gimpcellrendererviewable.obj \
gimpchanneltreeview.obj \
......
......@@ -17,7 +17,7 @@ INCLUDES = -I..
DEPCFLAGS = \
-FImsvc_recommended_pragmas.h \
$(GLIB_CFLAGS) $(GTK2_CFLAGS) $(INTL_CFLAGS)
DEPLIBS = $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS)
DEPLIBS = $(GLIB_LIBS) $(GTK2_LIBS) $(INTL_LIBS) $(CAIRO_LIBS)
all : \
..\config.h \
......@@ -34,6 +34,7 @@ install : all
OBJECTS = \
gimpbrowser.obj \
gimpbutton.obj \
gimpcairo-utils.obj \
gimpcellrenderercolor.obj \
gimpcellrenderertoggle.obj \
gimpchainbutton.obj \
......
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