mirror of
https://github.com/cookiengineer/audacity
synced 2025-04-30 15:49:41 +02:00
VS2013 includes the log2() function, so prevent Nyquist from defining it.
This commit is contained in:
parent
5b4b3e3c53
commit
ae7a7e67fb
@ -63,6 +63,7 @@ Digital Audio scripting language, with our own library interface added to it
|
||||
Version in Audacity SVN: 3.09
|
||||
nyquist.patch Fix for a couple of memory leaks
|
||||
xlisp.patch Fix build in Windows
|
||||
sound.patch Fix build when using VS2013 (log2 is included in VS2013)
|
||||
|
||||
libogg
|
||||
------
|
||||
|
@ -1588,6 +1588,7 @@ double step_to_hz(double steps)
|
||||
}
|
||||
|
||||
#ifdef WIN32
|
||||
#ifndef _MSC_VER < 1800
|
||||
#define RECIP_LOG_2 1.44269504088895364453
|
||||
|
||||
double log2(double x)
|
||||
@ -1595,6 +1596,7 @@ double log2(double x)
|
||||
return log(x) * RECIP_LOG_2;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* from old stuff...
|
||||
|
20
lib-src/libnyquist/sound.patch
Normal file
20
lib-src/libnyquist/sound.patch
Normal file
@ -0,0 +1,20 @@
|
||||
diff --git a/lib-src/libnyquist/nyquist/nyqsrc/sound.c b/lib-src/libnyquist/nyquist/nyqsrc/sound.c
|
||||
index 35de780..d81beb5 100644
|
||||
--- a/lib-src/libnyquist/nyquist/nyqsrc/sound.c
|
||||
+++ b/lib-src/libnyquist/nyquist/nyqsrc/sound.c
|
||||
@@ -1588,6 +1588,7 @@ double step_to_hz(double steps)
|
||||
}
|
||||
|
||||
#ifdef WIN32
|
||||
+#ifndef _MSC_VER < 1800
|
||||
#define RECIP_LOG_2 1.44269504088895364453
|
||||
|
||||
double log2(double x)
|
||||
@@ -1595,6 +1596,7 @@ double log2(double x)
|
||||
return log(x) * RECIP_LOG_2;
|
||||
}
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* from old stuff...
|
Loading…
x
Reference in New Issue
Block a user