shithub: sox

Info  •  Files  •  Log  •  Branches

Skip compiling ffmpeg.c if !HAVE_FFMPEG. Skip compiling wavpack.c if !HAVE_WAVPACK_H && !HAVE_WAVPACK. If HAVE_WAVPACK_H is set, look for <wavpack.h> (source location), otherwise look for <wavpack/wavpack.h> (installed location). Does not affect existing code, but allows MSVC compiles to more easily build against the wavpack source distribution.

--- a/src/ffmpeg.c

+++ b/src/ffmpeg.c

@@ -42,6 +42,8 @@

 #include "sox_i.h"

+#ifdef HAVE_FFMPEG

+

 #include <assert.h>

 #include <stdio.h>

 #include <string.h>

@@ -500,3 +502,5 @@

   return &handler;

 }

+

+#endif /* HAVE_FFMPEG */

--- a/src/wavpack.c

+++ b/src/wavpack.c

@@ -16,8 +16,19 @@

  */

 #include "sox_i.h"

-#include "wavpack/wavpack.h"

+#ifdef HAVE_WAVPACK_H

+#define HAVE_WAVPACK 1

+#endif

+

+#ifdef HAVE_WAVPACK

+

+#ifdef HAVE_WAVPACK_H

+#include <wavpack.h>

+#else

+#include <wavpack/wavpack.h>

+#endif

+

 typedef struct {

   WavpackContext * codec;

   size_t first_block_size;

@@ -177,3 +188,5 @@

   };

   return &handler;

 }

+

+#endif /* HAVE_WAVPACK */