[banshee/gtk3: 1/8] First changes in makefiles to link to gtk-sharp 3.x



commit 97e14d3bd7f844c74a9a0f87b0506bbf2ddd4ffc
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Thu Apr 21 19:21:48 2011 +0200

    First changes in makefiles to link to gtk-sharp 3.x
    
    This adds also some temporary things that will be reverted back when
    the port is in shape.

 .gitmodules                          |    2 +-
 build/build.environment.mk           |    2 +-
 configure.ac                         |    5 +++--
 src/Core/Banshee.Widgets/Makefile.am |    3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 7a550da..58d5e15 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/Hyena"]
 	path = src/Hyena
-	url = git://git.gnome.org/hyena
+	url = git://github.com/knocte/hyena-gtk3.git
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 177764b..0d39398 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:Mono.Cairo
+LINK_CAIRO = -r:/opt/mono-2.10/lib/mono/gtk-sharp-3.0/cairo-sharp.dll
 LINK_MONO_POSIX = -r:Mono.Posix
 LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
 LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
diff --git a/configure.ac b/configure.ac
index 92dc9c0..0ab83b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,6 @@ SHAMROCK_CHECK_MONO_MODULE(1.9.1)
 SHAMROCK_FIND_MONO_2_0_COMPILER
 SHAMROCK_FIND_MONO_RUNTIME
 SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([	
-	Mono.Cairo
 	Mono.Posix
 	ICSharpCode.SharpZipLib
 ])
@@ -228,8 +227,10 @@ AC_SUBST(ENABLE_RELEASE)
 if test "x$enable_release" = "xyes"; then
 	GMCS_FLAGS="-define:RELEASE"
 else
-	GMCS_FLAGS="-warnaserror"
+	GMCS_FLAGS=""
 fi
+#FIXME: add "-warnaserror" back above!
+
 AC_SUBST(GMCS_FLAGS)
 
 AM_CONDITIONAL(HYENA_PKG_CONFIG, false)
diff --git a/src/Core/Banshee.Widgets/Makefile.am b/src/Core/Banshee.Widgets/Makefile.am
index a752190..96a0d7a 100644
--- a/src/Core/Banshee.Widgets/Makefile.am
+++ b/src/Core/Banshee.Widgets/Makefile.am
@@ -1,6 +1,7 @@
 ASSEMBLY = Banshee.Widgets
 TARGET = library
-ASSEMBLY_BUILD_FLAGS = -unsafe
+#FIXME: not hardcode cairo-sharp here!
+ASSEMBLY_BUILD_FLAGS = -unsafe -r:/usr/lib/mono/gtk-sharp-3.0/cairo-sharp.dll
 LINK = $(REF_BANSHEE_WIDGETS)
 SOURCES =  \
 	Banshee.Widgets/CustomActionProxy.cs \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]