From: Graham Percival <graham@percival-music.ca>
Date: Sun, 11 Dec 2005 18:08:55 +0000 (+0000)
Subject: Johannes Schindlin's OSX compatibility patch.
X-Git-Tag: release/2.7.23~15
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2dec849eecb8d2376174599aeb9cd5d4fda26828;p=lilypond.git

Johannes Schindlin's OSX compatibility patch.
---

diff --git a/ChangeLog b/ChangeLog
index 19abb838ee..3b81c34a05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-11  Graham Percival  <gpermus@gmail.com>
+
+	* stepmake/stepmake/generic-vars.make: define DARWIN_BUILD.
+
+	* stepmake/stepmake/python-modules-vars.make: define
+	SHARED_FLAGS for OSX.  Thanks Johannes Schindelin!
+
+	* THANKS: added Johannes Schindelin.
+
 2005-12-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* python/midi.c (pymidi_parse): use memcmp() iso. strcmp().
diff --git a/THANKS b/THANKS
index 6a8d315dec..e7956267cd 100644
--- a/THANKS
+++ b/THANKS
@@ -16,6 +16,7 @@ Bruce Fairchild
 Cameron Horsburgh
 Heikki Junes
 Joe Neeman
+Johannes Schindelin
 Nicolas Sceaux
 Sven Axelsson
 Werner Lemberg
diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index fc7e89e2f5..8f8e2362f6 100644
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -111,3 +111,6 @@ endif
 ifeq ($(HOST_ARCH),i386-mingw32)
 MINGW_BUILD = yes
 endif
+ifeq ($(HOST_ARCH),ppc-darwin)
+DARWIN_BUILD = yes
+endif
diff --git a/stepmake/stepmake/python-module-vars.make b/stepmake/stepmake/python-module-vars.make
index cde4c2d405..d982177587 100644
--- a/stepmake/stepmake/python-module-vars.make
+++ b/stepmake/stepmake/python-module-vars.make
@@ -13,6 +13,9 @@ ifneq ($(MINGW_BUILD),)
 SHARED_MODULE_SUFFIX = .dll
 endif
 endif
+ifneq ($(DARWIN_BUILD),)
+SHARED_FLAGS = -bundle -flat_namespace -framework Python
+endif
 OUT_SO_MODULES = $(addprefix $(outdir)/, $(C_FILES:.c=$(SHARED_MODULE_SUFFIX)))
 EXTRA_DIST_FILES += $(PY_MODULES_IN)