From 4c1cab8dff511c795e382e9ac7afaf4272c36486 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Mon, 7 Feb 2005 20:22:05 +0000 Subject: [PATCH] build with Cairo dependency. The patch to acually use Cairo on win32 will 2005-02-05 Hans Breuer * gdk/makefile.msc gdk/win32/makefile.msc gtk/makefile.msc.in : build with Cairo dependency. The patch to acually use Cairo on win32 will be on gtk-devel-list soon. * tests/makefile.msc : add testcairo building * gtk/stock-icons/makefile.msc : split command line into two to work with the shells default --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gdk/makefile.msc | 4 ++-- gdk/win32/makefile.msc | 2 +- gtk/makefile.msc.in | 9 +++++---- gtk/stock-icons/makefile.msc | 5 ++++- tests/makefile.msc | 8 ++++++-- 8 files changed, 48 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c7681bd30..7d989873da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-02-05 Hans Breuer + + * gdk/makefile.msc gdk/win32/makefile.msc gtk/makefile.msc.in : + build with Cairo dependency. The patch to acually use Cairo + on win32 will be on gtk-devel-list soon. + * tests/makefile.msc : add testcairo building + + * gtk/stock-icons/makefile.msc : split command line into two to + work with the shells default + Fri Feb 4 14:16:31 2005 Manish Singh * gtk/gtkaccelgroup.c (substitute_underscores): remove unused diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6c7681bd30..7d989873da 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2005-02-05 Hans Breuer + + * gdk/makefile.msc gdk/win32/makefile.msc gtk/makefile.msc.in : + build with Cairo dependency. The patch to acually use Cairo + on win32 will be on gtk-devel-list soon. + * tests/makefile.msc : add testcairo building + + * gtk/stock-icons/makefile.msc : split command line into two to + work with the shells default + Fri Feb 4 14:16:31 2005 Manish Singh * gtk/gtkaccelgroup.c (substitute_underscores): remove unused diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6c7681bd30..7d989873da 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +2005-02-05 Hans Breuer + + * gdk/makefile.msc gdk/win32/makefile.msc gtk/makefile.msc.in : + build with Cairo dependency. The patch to acually use Cairo + on win32 will be on gtk-devel-list soon. + * tests/makefile.msc : add testcairo building + + * gtk/stock-icons/makefile.msc : split command line into two to + work with the shells default + Fri Feb 4 14:16:31 2005 Manish Singh * gtk/gtkaccelgroup.c (substitute_underscores): remove unused diff --git a/gdk/makefile.msc b/gdk/makefile.msc index fee146e148..e376c515ad 100644 --- a/gdk/makefile.msc +++ b/gdk/makefile.msc @@ -41,14 +41,14 @@ PERL = perl !ENDIF CFLAGS = -FImsvc_recommended_pragmas.h -I . -I .. \ - $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I ../gdk-pixbuf \ + $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) -I ../gdk-pixbuf \ $(G_DEBUGGING) -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN \ -DGDK_VERSION=\"$(GTK_VER)\" \ -DG_LOG_DOMAIN=\"Gdk\" EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \ ..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \ - $(PANGOWIN32_LIBS) $(INTL_LIBS) + $(PANGOWIN32_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) gdk-win32-backend : cd win32 diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc index ac5779615d..9274ad4cd1 100644 --- a/gdk/win32/makefile.msc +++ b/gdk/win32/makefile.msc @@ -14,7 +14,7 @@ TOP = ../../.. GTK_VER=2.0 CFLAGS = -FImsvc_recommended_pragmas.h \ - -I. -I.. -I..\.. $(GLIB_CFLAGS) $(PANGO_CFLAGS) \ + -I. -I.. -I..\.. $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) \ -I$(WTKIT)\include -I$(GLIB) \ $(G_DEBUGGING) -DHAVE_CONFIG_H -DINSIDE_GDK_WIN32 -DGDK_VERSION=\"$(GTK_VER)\" diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index 523354af36..3381c2c6d7 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -27,7 +27,7 @@ AWK = gawk INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk -I ../gdk-pixbuf DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \ - $(INTL_CFLAGS) $(ATK_CFLAGS) + $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS) LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG) # Some files use near as an identifier # Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only @@ -160,6 +160,7 @@ gtk_OBJECTS = \ gtkmenutoolbutton.obj \ gtkmessagedialog.obj \ gtkmisc.obj \ + gtkmnemonichash.obj \ gtkmodules.obj \ gtknotebook.obj \ gtkobject.obj \ @@ -443,7 +444,7 @@ GENERATED = \ generated : $(GENERATED) $(TOUCH) generated -gtk.def: gtk.symbols +gtk.def: gtk.symbols makefile.msc echo EXPORTS > gtk.def cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gtk.symbols >> gtk.def @@ -500,8 +501,8 @@ gtk-win32.res : gtk-win32.rc # libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def gtk-win32.res $(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) gtk-win32.res \ - $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) \ - gdi32.lib user32.lib advapi32.lib wsock32.lib shell32.lib \ + $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) \ + gdi32.lib user32.lib advapi32.lib wsock32.lib shell32.lib ole32.lib \ $(LDFLAGS) /implib:gtk-win32-$(GTK_VER).lib /def:gtk.def gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS) diff --git a/gtk/stock-icons/makefile.msc b/gtk/stock-icons/makefile.msc index a78166afb0..3382ff3c02 100644 --- a/gtk/stock-icons/makefile.msc +++ b/gtk/stock-icons/makefile.msc @@ -94,6 +94,8 @@ VARIABLES = \ stock_media_rewind_24 stock_media_rewind_24.png \ stock_media_stop_16 stock_media_stop_16.png \ stock_media_stop_24 stock_media_stop_24.png \ + +VARIABLES2 = \ stock_network_16 stock_network_16.png \ stock_network_24 stock_network_24.png \ stock_new_16 stock_new_16.png \ @@ -180,4 +182,5 @@ all: \ gtkstockpixbufs.h gtkstockpixbufs.h : makefile.msc - ..\..\gdk-pixbuf\gdk-pixbuf-csource --rle --build-list $(VARIABLES) > gtkstockpixbufs.h \ No newline at end of file + ..\..\gdk-pixbuf\gdk-pixbuf-csource --rle --build-list $(VARIABLES) > gtkstockpixbufs.h + ..\..\gdk-pixbuf\gdk-pixbuf-csource --rle --build-list $(VARIABLES2) >> gtkstockpixbufs.h diff --git a/tests/makefile.msc b/tests/makefile.msc index bc469cbaad..39d31afc8c 100644 --- a/tests/makefile.msc +++ b/tests/makefile.msc @@ -18,7 +18,7 @@ GTK_LIBS = ../gtk/gtk-win32-$(GTK_VER).lib GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf -I ../gtk -DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) +DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS) LDFLAGS = /link /machine:ix86 $(LINKDEBUG) DEFINES = -DG_LOG_DOMAIN=\"GtkTest\" -DGTK_VERSION=\"$(GTK_VER)\" @@ -40,7 +40,7 @@ all : \ # TESTAPPS = \ testabi testactions \ - testcalendar testcombo testcombochange \ + testcairo testcalendar testcombo testcombochange \ testdnd \ testentrycompletion \ testfilechooser \ @@ -68,6 +68,10 @@ one-test-app: !ELSE +!IFDEF EXTRA_testcairo +EXTRA_LIBS = $(CAIRO_LIBS) +!ENDIF + !IFDEF EXTRA_testgtk EXTRA_OBJETCS = prop-editor.obj !ENDIF