Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-21 23:00:06 +02:00
Code Issues Releases Wiki Activity

Merge pull request #20 from lllucius/master

Browse Source 
VS2013 includes the log2() function, so prevent Nyquist from defining it...
This commit is contained in:
Leland Lucius 2015-04-08 11:32:02 -05:00
commit 0658751bea
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib-src/audacity-patches.txt
View File

@ -63,6 +63,7 @@ Digital Audio scripting language, with our own library interface added to it
Version in Audacity SVN: 3.09 Version in Audacity SVN: 3.09
nyquist.patch Fix for a couple of memory leaks nyquist.patch Fix for a couple of memory leaks
xlisp.patch Fix build in Windows xlisp.patch Fix build in Windows
sound.patch Fix build when using VS2013 (log2 is included in VS2013)
libogg libogg
------ ------

2
lib-src/libnyquist/nyquist/nyqsrc/sound.c
View File

@ -1588,6 +1588,7 @@ double step_to_hz(double steps)
} }
#ifdef WIN32 #ifdef WIN32
#ifndef _MSC_VER < 1800
#define RECIP_LOG_2 1.44269504088895364453 #define RECIP_LOG_2 1.44269504088895364453
double log2(double x) double log2(double x)
@ -1595,6 +1596,7 @@ double log2(double x)
return log(x) * RECIP_LOG_2; return log(x) * RECIP_LOG_2;
} }
#endif #endif
#endif
/* /*
* from old stuff... * from old stuff...

20
lib-src/libnyquist/sound.patch Normal file
View 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...