ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2009-07-12 Mike Kestner <mkestner@novell.com>

Browse source 
* 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
This commit is contained in:
Mike Kestner 2009-07-12 21:24:13 +00:00
parent 0f10232e71
commit e21bb039f9
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-07-12 Mike Kestner <mkestner@novell.com>
* 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 <mkestner@novell.com>
* generator/ObjectBase.cs: add CallByName overload with ownership.

2
sample/GtkDemo/Makefile.am
View file

@ -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)

4
sample/Makefile.am
View file

@ -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