Browse Source

Fix fftw win32 build; Bump version

tags/v1.0
falkTX 4 years ago
parent
commit
c3cdefbe7f
4 changed files with 8 additions and 6 deletions
  1. +1
    -1
      .travis.yml
  2. +2
    -2
      .travis/script.sh
  3. +1
    -1
      VERSION
  4. +4
    -2
      patches/fftw/01_static-planner-thread-safe.patch

+ 1
- 1
.travis.yml View File

@@ -13,7 +13,7 @@ cache:

env:
global:
- BOOTSTRAP_VERSION=12
- BOOTSTRAP_VERSION=13

jobs:
include:


+ 2
- 2
.travis/script.sh View File

@@ -13,9 +13,9 @@ else
LAST_BOOTSTRAP_VERSION=0
fi

PLUGINS_BASE="abgate artyfx caps die-plugins distrho-ports-drowaudio fomp mda"
PLUGINS_BASE="abgate artyfx caps die-plugins fomp mda"
PLUGINS_CROSS="blop dpf-plugins"
PLUGINS_DISTRHO="distrho-ports-arctican distrho-ports-tal-plugins"
PLUGINS_DISTRHO="distrho-ports-arctican distrho-ports-drowaudio distrho-ports-tal-plugins"

# TODO
# ninjas2: need to put http://kxstudio.sf.net/ns/lv2ext/props#NonAutomable spec somewhere


+ 1
- 1
VERSION View File

@@ -1 +1 @@
0.1.0
1.0.0

+ 4
- 2
patches/fftw/01_static-planner-thread-safe.patch View File

@@ -1,8 +1,8 @@
diff --git a/api/apiplan.c b/api/apiplan.c
index b8642a9..d63f2e4 100644
index b8642a9..c7df958 100644
--- a/api/apiplan.c
+++ b/api/apiplan.c
@@ -20,7 +20,48 @@
@@ -20,7 +20,50 @@
#include "api/api.h"
@@ -13,6 +13,8 @@ index b8642a9..d63f2e4 100644
+ definition into another name unlikely to cause a conflict */
+#define INT magnus_ab_INTegro_seclorum_nascitur_ordo
+#include <windows.h>
+#include <process.h>
+#include <intrin.h>
+#undef INT
+
+/* windows does not have statically-initialized mutexes---fake a


Loading…
Cancel
Save