From e21bb039f9fd376a58790052ad46b7a231595670 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Sun, 12 Jul 2009 21:24:13 +0000 Subject: [PATCH] 2009-07-12 Mike Kestner * sample/Makefile.am: fix for cairo conflicts related to the switch to gmcs. * sample/GtkDemo/Makefile.am: fix for cairo conflicts related to the switch to gmcs. svn path=/trunk/gtk-sharp/; revision=137755 --- ChangeLog | 5 +++++ sample/GtkDemo/Makefile.am | 2 +- sample/Makefile.am | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9c37b94c..935dea5ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-07-12 Mike Kestner + + * sample/Makefile.am: fix for cairo conflicts related to the switch to gmcs. + * sample/GtkDemo/Makefile.am: fix for cairo conflicts related to the switch to gmcs. + 2009-07-12 Mike Kestner * generator/ObjectBase.cs: add CallByName overload with ownership. diff --git a/sample/GtkDemo/Makefile.am b/sample/GtkDemo/Makefile.am index 0c1e5f1cd..977734551 100644 --- a/sample/GtkDemo/Makefile.am +++ b/sample/GtkDemo/Makefile.am @@ -9,7 +9,7 @@ assemblies = \ $(top_builddir)/pango/pango-sharp.dll $(top_builddir)/atk/atk-sharp.dll \ $(top_builddir)/gdk/gdk-sharp.dll $(top_builddir)/gtk/gtk-sharp.dll $(local_mono_cairo) -references = $(addprefix /r:, $(assemblies)) @MONO_CAIRO_LIBS@ +references = $(addprefix /r:, $(assemblies)) /r:Mono.Cairo TARGETS = GtkDemo.exe DEBUGS = $(addsuffix .mdb, $(TARGETS)) CLEANFILES = $(TARGETS) $(DEBUGS) diff --git a/sample/Makefile.am b/sample/Makefile.am index 87f07ee99..0d9357502 100755 --- a/sample/Makefile.am +++ b/sample/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = test GtkDemo pixmaps valtest opaquetest gio gtk-gio if ENABLE_MONO_CAIRO cairo_ref=-r:$(top_builddir)/cairo/Mono.Cairo.dll else -cairo_ref=$(MONO_CAIRO_LIBS) +cairo_ref=-r:Mono.Cairo endif if ENABLE_GLADE @@ -80,7 +80,7 @@ glade-viewer.exe: $(srcdir)/GladeViewer.cs $(assemblies) $(CSC) /out:glade-viewer.exe $(references) $(srcdir)/GladeViewer.cs glade-test.exe: $(srcdir)/GladeTest.cs $(srcdir)/test.glade $(assemblies) - $(CSC) /resource:$(srcdir)/test.glade,test.glade /out:glade-test.exe $(references) $(srcdir)/GladeTest.cs + $(CSC) /resource:$(srcdir)/test.glade /out:glade-test.exe $(references) $(srcdir)/GladeTest.cs cairo-sample.exe: $(srcdir)/CairoSample.cs $(assemblies) $(CSC) /out:cairo-sample.exe $(references) $(cairo_ref) $(srcdir)/CairoSample.cs