[banshee/gtk3] build: Remove hardcoded references to cairo-sharp.dll
- From: Bertrand Lorentz <blorentz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/gtk3] build: Remove hardcoded references to cairo-sharp.dll
- Date: Sun, 12 Jun 2011 22:23:55 +0000 (UTC)
commit 80f4d6c88f40d616e625527fd365d11ea570e1b0
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Mon Jun 13 00:20:08 2011 +0200
build: Remove hardcoded references to cairo-sharp.dll
cairo-sharp is included in the main gtk-sharp-3.0 pkg-config file, so we
don't need to reference it explicitly.
If cairo-sharp is merged back into the mono tree, we'll just have to
re-add the references to Mono.Cairo.
build/build.environment.mk | 2 +-
src/Core/Banshee.Widgets/Makefile.am | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 8c6dd27..84c0d86 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -9,7 +9,7 @@ EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
-LINK_CAIRO = -r:/opt/mono-2.10/lib/mono/gtk-sharp-3.0/cairo-sharp.dll
+#LINK_CAIRO = -r:Mono.Cairo uncomment if cairo-sharp is merged back into the mono tree
LINK_MONO_POSIX = -r:Mono.Posix
LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
diff --git a/src/Core/Banshee.Widgets/Makefile.am b/src/Core/Banshee.Widgets/Makefile.am
index 96a0d7a..a752190 100644
--- a/src/Core/Banshee.Widgets/Makefile.am
+++ b/src/Core/Banshee.Widgets/Makefile.am
@@ -1,7 +1,6 @@
ASSEMBLY = Banshee.Widgets
TARGET = library
-#FIXME: not hardcode cairo-sharp here!
-ASSEMBLY_BUILD_FLAGS = -unsafe -r:/usr/lib/mono/gtk-sharp-3.0/cairo-sharp.dll
+ASSEMBLY_BUILD_FLAGS = -unsafe
LINK = $(REF_BANSHEE_WIDGETS)
SOURCES = \
Banshee.Widgets/CustomActionProxy.cs \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]