From 04a2f994c099d12f32ab61e7cee41b5c6089cdee Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 19 Apr 2005 00:17:37 +0000 Subject: updated to build on a plain MacOSX setup svn path=/trunk/externals/unauthorized/; revision=2783 --- Makefile | 16 ++++++++++------ blinkenlights/blinkenlights.c | 2 +- cooled~/cooled~.c | 6 ++++++ countund/countund.c | 2 +- formant~/formant~.c | 2 +- mp3amp~/mp3amp~.c | 1 + mp3cast~/mp3cast~.c | 2 +- mp3live~/mp3streamout~.c | 2 +- mp3write~/mp3write~.c | 2 +- randomblock~/randomblock~.c | 2 +- samplebox~/samplebox~.c | 2 +- scratcher~/scratcher~.c | 6 ++++++ sonogram~/sonogram~-joge.c | 2 +- sonogram~/sonogram~-yves.c | 2 +- sonogram~/sonogram~.c | 6 ++++++ speex~/speexout~.c | 2 +- 16 files changed, 40 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index ad37932..47ae867 100644 --- a/Makefile +++ b/Makefile @@ -87,14 +87,18 @@ pd_darwin: $(TARGETS) # I added these defines since Darwin doesn't have this signals. I do # not know whether the objects will work, but they will compile. -# -D__APPLE__ -DMSG_NOSIGNAL=0 -DSOL_TCP=0 +# -DMSG_NOSIGNAL=0 -DSOL_TCP=0 # I got this from here: http://www.holwegner.com/forum/viewtopic.php?t=4 # -DARWINCFLAGS = -DPD -DUNIX -DMACOSX -DICECAST \ - -D__APPLE__ -DMSG_NOSIGNAL=0 -DSOL_TCP=0 \ - -O2 -Wall -W -Wshadow -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch - -DARWINLINKFLAGS = -bundle -undefined suppress -flat_namespace +DARWINCFLAGS = -DPD -DUNIX -DICECAST -DMSG_NOSIGNAL=0 -DSOL_TCP=0 \ + -O2 -Wall -W -Wshadow -Wstrict-prototypes -Wno-unused -Wno-parentheses \ + -Wno-switch + +## if you point the linker to the pd binary, then it can check the symbols, +## and therefore allow for a two-level namespace, and that makes Darwin happy +## but this doesn't work for some of the files yet. +#DARWINLINKFLAGS = -bundle -bundle_loader ../../pd/bin/pd +DARWINLINKFLAGS = -bundle -undefined suppress -flat_namespace DARWININCLUDE = -I../../src -I../../pd/src -I/sw/include diff --git a/blinkenlights/blinkenlights.c b/blinkenlights/blinkenlights.c index b99d57d..3aca7cd 100644 --- a/blinkenlights/blinkenlights.c +++ b/blinkenlights/blinkenlights.c @@ -35,7 +35,7 @@ #include #include #include -#ifndef MACOSX +#ifndef __APPLE__ #include #endif #include diff --git a/cooled~/cooled~.c b/cooled~/cooled~.c index 18dc6ea..87b5a68 100644 --- a/cooled~/cooled~.c +++ b/cooled~/cooled~.c @@ -36,7 +36,13 @@ #include #include #include + +#ifdef __APPLE__ +#include +#else #include +#endif + #include #include #ifdef UNIX diff --git a/countund/countund.c b/countund/countund.c index 0d554a2..976f79c 100644 --- a/countund/countund.c +++ b/countund/countund.c @@ -32,7 +32,7 @@ #include #include #include -#ifndef MACOSX +#ifndef __APPLE__ #include #endif #include diff --git a/formant~/formant~.c b/formant~/formant~.c index b327a8b..686974b 100644 --- a/formant~/formant~.c +++ b/formant~/formant~.c @@ -34,7 +34,7 @@ #include #include #include -#ifndef MACOSX +#ifndef __APPLE__ #include #endif #include diff --git a/mp3amp~/mp3amp~.c b/mp3amp~/mp3amp~.c index bf93d98..8eaebdb 100644 --- a/mp3amp~/mp3amp~.c +++ b/mp3amp~/mp3amp~.c @@ -28,6 +28,7 @@ #include #include "m_imp.h" #include "g_canvas.h" +#include "s_stuff.h" #include "pthread.h" #include diff --git a/mp3cast~/mp3cast~.c b/mp3cast~/mp3cast~.c index 5d7609f..11c3d19 100644 --- a/mp3cast~/mp3cast~.c +++ b/mp3cast~/mp3cast~.c @@ -35,7 +35,7 @@ #include #include #include -#ifndef MACOSX +#ifndef __APPLE__ #include #endif #include diff --git a/mp3live~/mp3streamout~.c b/mp3live~/mp3streamout~.c index 8208f38..9c9a024 100644 --- a/mp3live~/mp3streamout~.c +++ b/mp3live~/mp3streamout~.c @@ -36,7 +36,7 @@ #include #include #include -#ifndef MACOSX +#ifndef __APPLE__ #include #endif #include diff --git a/mp3write~/mp3write~.c b/mp3write~/mp3write~.c index ea42040..e11eddd 100644 --- a/mp3write~/mp3write~.c +++ b/mp3write~/mp3write~.c @@ -35,7 +35,7 @@ #include #include #include -#ifndef MACOSX +#ifndef __APPLE__ #include #endif #include diff --git a/randomblock~/randomblock~.c b/randomblock~/randomblock~.c index 9fbbc2c..34d2411 100644 --- a/randomblock~/randomblock~.c +++ b/randomblock~/randomblock~.c @@ -32,7 +32,7 @@ #include #include #include -#ifndef MACOSX +#ifndef __APPLE__ #include #endif #include diff --git a/samplebox~/samplebox~.c b/samplebox~/samplebox~.c index b5abed6..64e656c 100644 --- a/samplebox~/samplebox~.c +++ b/samplebox~/samplebox~.c @@ -36,7 +36,7 @@ #include #include #include -#ifndef MACOSX +#ifndef __APPLE__ #include #endif #include diff --git a/scratcher~/scratcher~.c b/scratcher~/scratcher~.c index 129579f..4448389 100644 --- a/scratcher~/scratcher~.c +++ b/scratcher~/scratcher~.c @@ -37,7 +37,13 @@ #include #include #include + +#ifdef __APPLE__ +#include +#else #include +#endif + #include #include #include diff --git a/sonogram~/sonogram~-joge.c b/sonogram~/sonogram~-joge.c index dc6e6b6..4216c4d 100644 --- a/sonogram~/sonogram~-joge.c +++ b/sonogram~/sonogram~-joge.c @@ -37,7 +37,7 @@ #include #include #include -#ifndef MACOSX +#ifndef __APPLE__ #include #endif #include diff --git a/sonogram~/sonogram~-yves.c b/sonogram~/sonogram~-yves.c index df957b1..59cbeed 100644 --- a/sonogram~/sonogram~-yves.c +++ b/sonogram~/sonogram~-yves.c @@ -37,7 +37,7 @@ #include #include #include -#ifndef MACOSX +#ifndef __APPLE__ #include #endif #include diff --git a/sonogram~/sonogram~.c b/sonogram~/sonogram~.c index ff70ae1..fedf88c 100644 --- a/sonogram~/sonogram~.c +++ b/sonogram~/sonogram~.c @@ -37,7 +37,13 @@ #include #include #include + +#ifdef __APPLE__ +#include +#else #include +#endif + #include #include #ifdef UNIX diff --git a/speex~/speexout~.c b/speex~/speexout~.c index d6b71c6..c6968d9 100644 --- a/speex~/speexout~.c +++ b/speex~/speexout~.c @@ -43,7 +43,7 @@ #include #include #include -#ifndef MACOSX +#ifndef __APPLE__ #include #endif #include -- cgit v1.2.1