[banshee] build: Pass -define:GTK3 to gmcs so we can start porting
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] build: Pass -define:GTK3 to gmcs so we can start porting
- Date: Fri, 8 Apr 2011 21:56:44 +0000 (UTC)
commit 5b79df805fb8bc80594b3060461fe238be4bb988
Author: Gabriel Burt <gabriel burt gmail com>
Date: Fri Apr 8 16:47:43 2011 -0500
build: Pass -define:GTK3 to gmcs so we can start porting
And fix tabs in gtk-sharp.m4
build/build.rules.mk | 6 +++++-
build/m4/banshee/gtk-sharp.m4 | 8 ++++----
2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 9b2be41..78f25fe 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -22,6 +22,10 @@ if ENABLE_TESTS
ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
endif
+if HAVE_GTK3
+ GTK3_FLAG = "-define:GTK3"
+endif
+
if ENABLE_ATK
ENABLE_ATK_FLAG = "-define:ENABLE_ATK"
endif
@@ -69,7 +73,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
-nowarn:0278 -nowarn:0078 $$warn \
-define:HAVE_GTK_2_10 -define:NET_2_0 \
-debug -target:$(TARGET) -out:$@ \
- $(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(ENABLE_ATK_FLAG) $(LEGACY_IPOD_FLAG) \
+ $(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(GTK3_FLAG) $(ENABLE_ATK_FLAG) $(LEGACY_IPOD_FLAG) \
$(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
@if [ -e $(srcdir)/$(notdir $ config) ]; then \
cp $(srcdir)/$(notdir $ config) $(top_builddir)/bin; \
diff --git a/build/m4/banshee/gtk-sharp.m4 b/build/m4/banshee/gtk-sharp.m4
index f5e5948..45660b2 100644
--- a/build/m4/banshee/gtk-sharp.m4
+++ b/build/m4/banshee/gtk-sharp.m4
@@ -11,13 +11,13 @@ AC_DEFUN([BANSHEE_CHECK_GTK_SHARP],
PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-3.0 >= $GTKSHARP3_REQUIRED)
AC_SUBST(GLIBSHARP_LIBS)
- gtk_version=3
+ gtk_version=3
AM_CONDITIONAL(HAVE_GTK3, true)
- HAVE_GLIBSHARP_2_12_7=yes
+ HAVE_GLIBSHARP_2_12_7=yes
AM_CONDITIONAL(HAVE_GLIBSHARP_2_12_7, true)
- gtksharp_with_a11y=yes
+ gtksharp_with_a11y=yes
AM_CONDITIONAL(ENABLE_ATK, true)
else
dnl Fall back to gtk-sharp-2.0
@@ -38,6 +38,6 @@ AC_DEFUN([BANSHEE_CHECK_GTK_SHARP],
AM_CONDITIONAL(ENABLE_ATK, test "x$gtksharp_with_a11y" = "xyes")
AM_CONDITIONAL(HAVE_GTK3, false)
- gtk_version="2"
+ gtk_version="2"
fi
])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]