Mercurial > hg > libxtract

changeset 271:2d749a837036

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define USE_OOURA if not on "Darwin" - Should fix build issue on Linux
author Jamie Bullock <jamie@jamiebullock.com>
date Tue, 11 Nov 2014 17:45:15 +0000
parents 3d0fa7347500
children e88e42cf3208
files src/Make.config src/fft.h src/init.c
diffstat 3 files changed, 2 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make.config	Tue Nov 11 17:30:31 2014 +0000
+++ b/src/Make.config	Tue Nov 11 17:45:15 2014 +0000
@@ -4,4 +4,6 @@
 
 ifeq ($(PLATFORM), Darwin)
     LDFLAGS = -framework Accelerate
+else
+    FLAGS += -DUSE_OOURA
 endif
--- a/src/fft.h	Tue Nov 11 17:30:31 2014 +0000
+++ b/src/fft.h	Tue Nov 11 17:45:15 2014 +0000
@@ -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
--- a/src/init.c	Tue Nov 11 17:30:31 2014 +0000
+++ b/src/init.c	Tue Nov 11 17:45:15 2014 +0000
@@ -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)
 {