shithub: aubio

Info  •  Files  •  Log  •  Branches

wscript, src/io/*.c: use custom defines instead of __APPLE__

--- a/src/io/sink.c

+++ b/src/io/sink.c

@@ -23,9 +23,9 @@

 #include "fvec.h"

 #include "fmat.h"

 #include "io/sink.h"

-#ifdef __APPLE__

+#ifdef HAVE_SINK_APPLE_AUDIO

 #include "io/sink_apple_audio.h"

-#endif /* __APPLE__ */

+#endif /* HAVE_SINK_APPLE_AUDIO */

 #ifdef HAVE_SNDFILE

 #include "io/sink_sndfile.h"

 #endif

@@ -56,7 +56,7 @@

 aubio_sink_t * new_aubio_sink(char_t * uri, uint_t samplerate) {

   aubio_sink_t * s = AUBIO_NEW(aubio_sink_t);

-#ifdef __APPLE__

+#ifdef HAVE_SINK_APPLE_AUDIO

   s->sink = (void *)new_aubio_sink_apple_audio(uri, samplerate);

   if (s->sink) {

     s->s_do = (aubio_sink_do_t)(aubio_sink_apple_audio_do);

@@ -69,7 +69,7 @@

     s->s_del = (del_aubio_sink_t)(del_aubio_sink_apple_audio);

     return s;

   }

-#endif /* __APPLE__ */

+#endif /* HAVE_SINK_APPLE_AUDIO */

 #if HAVE_SNDFILE

   s->sink = (void *)new_aubio_sink_sndfile(uri, samplerate);

   if (s->sink) {

--- a/src/io/sink_apple_audio.c

+++ b/src/io/sink_apple_audio.c

@@ -20,7 +20,7 @@

 #include "config.h"

-#ifdef __APPLE__

+#ifdef HAVE_SINK_APPLE_AUDIO

 #include "aubio_priv.h"

 #include "fvec.h"

@@ -266,4 +266,4 @@

   return;

 }

-#endif /* __APPLE__ */

+#endif /* HAVE_SINK_APPLE_AUDIO */

--- a/src/io/source.c

+++ b/src/io/source.c

@@ -26,9 +26,9 @@

 #ifdef HAVE_LIBAV

 #include "io/source_avcodec.h"

 #endif /* HAVE_LIBAV */

-#ifdef __APPLE__

+#ifdef HAVE_SOURCE_APPLE_AUDIO

 #include "io/source_apple_audio.h"

-#endif /* __APPLE__ */

+#endif /* HAVE_SOURCE_APPLE_AUDIO */

 #ifdef HAVE_SNDFILE

 #include "io/source_sndfile.h"

 #endif /* HAVE_SNDFILE */

@@ -70,7 +70,7 @@

     return s;

   }

 #endif /* HAVE_LIBAV */

-#ifdef __APPLE__

+#ifdef HAVE_SOURCE_APPLE_AUDIO

   s->source = (void *)new_aubio_source_apple_audio(uri, samplerate, hop_size);

   if (s->source) {

     s->s_do = (aubio_source_do_t)(aubio_source_apple_audio_do);

@@ -82,7 +82,7 @@

     s->s_del = (del_aubio_source_t)(del_aubio_source_apple_audio);

     return s;

   }

-#endif /* __APPLE__ */

+#endif /* HAVE_SOURCE_APPLE_AUDIO */

 #if HAVE_SNDFILE

   s->source = (void *)new_aubio_source_sndfile(uri, samplerate, hop_size);

   if (s->source) {

--- a/src/io/source_apple_audio.c

+++ b/src/io/source_apple_audio.c

@@ -18,8 +18,10 @@

 */

-#ifdef __APPLE__

 #include "config.h"

+

+#ifdef HAVE_SOURCE_APPLE_AUDIO

+

 #include "aubio_priv.h"

 #include "fvec.h"

 #include "fmat.h"

@@ -302,4 +304,4 @@

   return s->channels;

 }

-#endif /* __APPLE__ */

+#endif /* HAVE_SOURCE_APPLE_AUDIO */

--- a/src/io/utils_apple_audio.c

+++ b/src/io/utils_apple_audio.c

@@ -1,5 +1,7 @@

-#ifdef __APPLE__

+#include "config.h"

+#if defined(HAVE_SOURCE_APPLE_AUDIO) || defined(HAVE_SINK_APPLE_AUDIO)

+

 // CFURLRef, CFURLCreateWithFileSystemPath, ...

 #include <CoreFoundation/CoreFoundation.h>

 // ExtAudioFileRef, AudioStreamBasicDescription, AudioBufferList, ...

@@ -52,4 +54,4 @@

     return str;

 }

-#endif /* __APPLE__ */

+#endif /* defined(HAVE_SOURCE_APPLE_AUDIO) || defined(HAVE_SINK_APPLE_AUDIO) */

--- a/wscript

+++ b/wscript

@@ -105,13 +105,15 @@

     if target_platform == 'darwin':

         ctx.env.CFLAGS += ['-arch', 'i386', '-arch', 'x86_64']

         ctx.env.LINKFLAGS += ['-arch', 'i386', '-arch', 'x86_64']

+

+    if target_platform in [ 'darwin', 'ios', 'iosimulator']:

         ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox', 'Accelerate']

+        ctx.define('HAVE_SOURCE_APPLE_AUDIO', 1)

+        ctx.define('HAVE_SINK_APPLE_AUDIO', 1)

         ctx.define('HAVE_ACCELERATE', 1)

     if target_platform in [ 'ios', 'iosimulator' ]:

-        ctx.define('HAVE_ACCELERATE', 1)

         ctx.define('TARGET_OS_IPHONE', 1)

-        ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox', 'Accelerate']

         SDKVER="7.0"

         MINSDKVER="6.1"

         ctx.env.CFLAGS += ['-std=c99']