Merge from default branch

2024-01-31 17:32:07 +00:00
parent 888eed2faa f0d702e15d
commit 0d100127f6
14 changed files with 243 additions and 16 deletions
--- a/rubberband/RubberBandStretcher.h
+++ b/rubberband/RubberBandStretcher.h
@@ -30,7 +30,9 @@

 #undef RUBBERBAND_DLLEXPORT
 #ifdef _MSC_VER
+#ifndef RUBBERBAND_STATIC
 #define RUBBERBAND_DLLEXPORT __declspec(dllexport)
+#endif
 #else
 #define RUBBERBAND_DLLEXPORT
 #endif
--- a/rubberband/rubberband-c.h
+++ b/rubberband/rubberband-c.h
@@ -35,7 +35,9 @@ extern "C" {

 #undef RB_EXTERN
 #ifdef _MSC_VER
+#ifndef RUBBERBAND_STATIC
 #define RB_EXTERN extern __declspec(dllexport)
+#endif
 #else
 #define RB_EXTERN extern
 #endif