[hyena/gtk3] build: Don't hardcode path to cairo-sharp.dll
- From: Bertrand Lorentz <blorentz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [hyena/gtk3] build: Don't hardcode path to cairo-sharp.dll
- Date: Sun, 12 Jun 2011 21:55:49 +0000 (UTC)
commit 1493b7620d044d7cda4eba08ca061305aaf98562
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Sun Jun 12 23:52:19 2011 +0200
build: Don't hardcode path to cairo-sharp.dll
The reference to cairo-sharp.dll is given by the main gtk-sharp
pkg-config file, so we don't need to hardcode it.
If cairo-sharp is merged back into mono itself, we'll just have to
re-add the references to Mono.Cairo.
Hyena.Gui/Makefile.am | 3 +--
configure.ac | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/Hyena.Gui/Makefile.am b/Hyena.Gui/Makefile.am
index 12cfbfc..e8767ee 100644
--- a/Hyena.Gui/Makefile.am
+++ b/Hyena.Gui/Makefile.am
@@ -1,8 +1,7 @@
ASSEMBLY = Hyena.Gui
ASSEMBLY_BUILD_FLAGS = -unsafe
TARGET = library
-#FIXME: not hardcode path to cairo-sharp
-LINK = -r:ICSharpCode.SharpZipLib -r:Mono.Posix -r:System -r:System.Core -r:/usr/lib/mono/gtk-sharp-3.0/cairo-sharp.dll \
+LINK = -r:ICSharpCode.SharpZipLib -r:Mono.Posix -r:System -r:System.Core \
$(GTKSHARP_LIBS) $(GLIBSHARP_LIBS) \
-r:$(DIR_BIN)/Hyena.dll
SOURCES = \
diff --git a/configure.ac b/configure.ac
index 172922a..f84d07f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,8 +56,7 @@ SHAMROCK_FIND_MONO_RUNTIME
SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
Mono.Posix
ICSharpCode.SharpZipLib
-])dnl FIXME:seems like cairo-sharp hasn't got .pc files yet: cairo-sharp
-
+])
dnl package checks, common for all configs
PKG_CHECK_MODULES([GTKSHARP], [gtk-sharp-3.0])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]