aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Bullock <jamie@jamiebullock.com>2014-11-11 17:45:15 +0000
committerJamie Bullock <jamie@jamiebullock.com>2014-11-11 17:45:15 +0000
commit195b7c7db8a9e9980386d0e8247f20015c7c7711 (patch)
tree1b8bd964a14554c6c221f4ad5c0c696c5a3043c3
parentc8317ed6210ebc7fa5dbb1951f9e8dd4038af8b6 (diff)
downloadLibXtract-195b7c7db8a9e9980386d0e8247f20015c7c7711.tar.gz
LibXtract-195b7c7db8a9e9980386d0e8247f20015c7c7711.tar.bz2
LibXtract-195b7c7db8a9e9980386d0e8247f20015c7c7711.zip
Define USE_OOURA if not on "Darwin"
- Should fix build issue on Linux
-rw-r--r--src/Make.config2
-rw-r--r--src/fft.h5
-rw-r--r--src/init.c6
3 files changed, 2 insertions, 11 deletions
diff --git a/src/Make.config b/src/Make.config
index 75d5abe..57f23cd 100644
--- a/src/Make.config
+++ b/src/Make.config
@@ -4,4 +4,6 @@ FLAGS := -I../include
ifeq ($(PLATFORM), Darwin)
LDFLAGS = -framework Accelerate
+else
+ FLAGS += -DUSE_OOURA
endif
diff --git a/src/fft.h b/src/fft.h
index 790ebe0..20fedcd 100644
--- a/src/fft.h
+++ b/src/fft.h
@@ -24,12 +24,7 @@
#ifndef FFT_H
#define FFT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef _MSC_VER
- #define USE_OOURA
#ifndef __cplusplus
typedef int bool;
#define false 0
diff --git a/src/init.c b/src/init.c
index 4a0467c..879337f 100644
--- a/src/init.c
+++ b/src/init.c
@@ -23,10 +23,6 @@
/* init.c: defines initialisation and free functions. Also contains library constructor routine. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
@@ -38,8 +34,6 @@
#define DEFINE_GLOBALS
#include "xtract_globals_private.h"
-
-
#ifdef USE_OOURA
void xtract_init_ooura_data(xtract_ooura_data *ooura_data, unsigned int N)
{