Commit 4c1cab8d authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

build with Cairo dependency. The patch to acually use Cairo on win32 will

2005-02-05  Hans Breuer  <hans@breuer.org>

	* 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
parent c0454cf6
2005-02-05 Hans Breuer <hans@breuer.org>
* 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 <yosh@gimp.org> Fri Feb 4 14:16:31 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkaccelgroup.c (substitute_underscores): remove unused * gtk/gtkaccelgroup.c (substitute_underscores): remove unused
......
2005-02-05 Hans Breuer <hans@breuer.org>
* 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 <yosh@gimp.org> Fri Feb 4 14:16:31 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkaccelgroup.c (substitute_underscores): remove unused * gtk/gtkaccelgroup.c (substitute_underscores): remove unused
......
2005-02-05 Hans Breuer <hans@breuer.org>
* 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 <yosh@gimp.org> Fri Feb 4 14:16:31 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkaccelgroup.c (substitute_underscores): remove unused * gtk/gtkaccelgroup.c (substitute_underscores): remove unused
......
...@@ -41,14 +41,14 @@ PERL = perl ...@@ -41,14 +41,14 @@ PERL = perl
!ENDIF !ENDIF
CFLAGS = -FImsvc_recommended_pragmas.h -I . -I .. \ 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 \ $(G_DEBUGGING) -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN \
-DGDK_VERSION=\"$(GTK_VER)\" \ -DGDK_VERSION=\"$(GTK_VER)\" \
-DG_LOG_DOMAIN=\"Gdk\" -DG_LOG_DOMAIN=\"Gdk\"
EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \ EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \
..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \ ..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
$(PANGOWIN32_LIBS) $(INTL_LIBS) $(PANGOWIN32_LIBS) $(INTL_LIBS) $(CAIRO_LIBS)
gdk-win32-backend : gdk-win32-backend :
cd win32 cd win32
......
...@@ -14,7 +14,7 @@ TOP = ../../.. ...@@ -14,7 +14,7 @@ TOP = ../../..
GTK_VER=2.0 GTK_VER=2.0
CFLAGS = -FImsvc_recommended_pragmas.h \ 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) \ -I$(WTKIT)\include -I$(GLIB) \
$(G_DEBUGGING) -DHAVE_CONFIG_H -DINSIDE_GDK_WIN32 -DGDK_VERSION=\"$(GTK_VER)\" $(G_DEBUGGING) -DHAVE_CONFIG_H -DINSIDE_GDK_WIN32 -DGDK_VERSION=\"$(GTK_VER)\"
......
...@@ -27,7 +27,7 @@ AWK = gawk ...@@ -27,7 +27,7 @@ AWK = gawk
INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk -I ../gdk-pixbuf INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk -I ../gdk-pixbuf
DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \ DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \
$(INTL_CFLAGS) $(ATK_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS)
LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG) LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG)
# Some files use near as an identifier # Some files use near as an identifier
# Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only # Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only
...@@ -160,6 +160,7 @@ gtk_OBJECTS = \ ...@@ -160,6 +160,7 @@ gtk_OBJECTS = \
gtkmenutoolbutton.obj \ gtkmenutoolbutton.obj \
gtkmessagedialog.obj \ gtkmessagedialog.obj \
gtkmisc.obj \ gtkmisc.obj \
gtkmnemonichash.obj \
gtkmodules.obj \ gtkmodules.obj \
gtknotebook.obj \ gtknotebook.obj \
gtkobject.obj \ gtkobject.obj \
...@@ -443,7 +444,7 @@ GENERATED = \ ...@@ -443,7 +444,7 @@ GENERATED = \
generated : $(GENERATED) generated : $(GENERATED)
$(TOUCH) generated $(TOUCH) generated
gtk.def: gtk.symbols gtk.def: gtk.symbols makefile.msc
echo EXPORTS > gtk.def echo EXPORTS > gtk.def
cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gtk.symbols >> gtk.def cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gtk.symbols >> gtk.def
...@@ -500,8 +501,8 @@ gtk-win32.res : gtk-win32.rc ...@@ -500,8 +501,8 @@ gtk-win32.res : gtk-win32.rc
# #
libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def gtk-win32.res libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def gtk-win32.res
$(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) gtk-win32.res \ $(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) gtk-win32.res \
$(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) \ $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) \
gdi32.lib user32.lib advapi32.lib wsock32.lib shell32.lib \ gdi32.lib user32.lib advapi32.lib wsock32.lib shell32.lib ole32.lib \
$(LDFLAGS) /implib:gtk-win32-$(GTK_VER).lib /def:gtk.def $(LDFLAGS) /implib:gtk-win32-$(GTK_VER).lib /def:gtk.def
gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS) gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS)
......
...@@ -94,6 +94,8 @@ VARIABLES = \ ...@@ -94,6 +94,8 @@ VARIABLES = \
stock_media_rewind_24 stock_media_rewind_24.png \ stock_media_rewind_24 stock_media_rewind_24.png \
stock_media_stop_16 stock_media_stop_16.png \ stock_media_stop_16 stock_media_stop_16.png \
stock_media_stop_24 stock_media_stop_24.png \ stock_media_stop_24 stock_media_stop_24.png \
VARIABLES2 = \
stock_network_16 stock_network_16.png \ stock_network_16 stock_network_16.png \
stock_network_24 stock_network_24.png \ stock_network_24 stock_network_24.png \
stock_new_16 stock_new_16.png \ stock_new_16 stock_new_16.png \
...@@ -180,4 +182,5 @@ all: \ ...@@ -180,4 +182,5 @@ all: \
gtkstockpixbufs.h gtkstockpixbufs.h
gtkstockpixbufs.h : makefile.msc gtkstockpixbufs.h : makefile.msc
..\..\gdk-pixbuf\gdk-pixbuf-csource --rle --build-list $(VARIABLES) > gtkstockpixbufs.h ..\..\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 $(VARIABLES2) >> gtkstockpixbufs.h
...@@ -18,7 +18,7 @@ GTK_LIBS = ../gtk/gtk-win32-$(GTK_VER).lib ...@@ -18,7 +18,7 @@ GTK_LIBS = ../gtk/gtk-win32-$(GTK_VER).lib
GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib GDK_PIXBUF_LIBS = ../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf -I ../gtk 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) LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
DEFINES = -DG_LOG_DOMAIN=\"GtkTest\" -DGTK_VERSION=\"$(GTK_VER)\" DEFINES = -DG_LOG_DOMAIN=\"GtkTest\" -DGTK_VERSION=\"$(GTK_VER)\"
...@@ -40,7 +40,7 @@ all : \ ...@@ -40,7 +40,7 @@ all : \
# #
TESTAPPS = \ TESTAPPS = \
testabi testactions \ testabi testactions \
testcalendar testcombo testcombochange \ testcairo testcalendar testcombo testcombochange \
testdnd \ testdnd \
testentrycompletion \ testentrycompletion \
testfilechooser \ testfilechooser \
...@@ -68,6 +68,10 @@ one-test-app: ...@@ -68,6 +68,10 @@ one-test-app:
!ELSE !ELSE
!IFDEF EXTRA_testcairo
EXTRA_LIBS = $(CAIRO_LIBS)
!ENDIF
!IFDEF EXTRA_testgtk !IFDEF EXTRA_testgtk
EXTRA_OBJETCS = prop-editor.obj EXTRA_OBJETCS = prop-editor.obj
!ENDIF !ENDIF
......
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