Changeset 06dba46

Timestamp:

Dec 10, 2013, 2:39:47 PM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

df5eab4

Parents:

a7343ffe

Message:

wscript: small tweaks to with mingw32

Signed-off-by: Paul Brossier <​piem@piem.org>

Files:

• src/wscript_build (modified) (1 diff)
• tests/utils_tests.h (modified) (2 diffs)
• wscript (modified) (2 diffs)

src/wscript_build

@@ -22 +22 @@
 if ctx.env['DEST_OS'] in ['ios', 'iosimulator']:
     build_features = ['cstlib']
+elif ctx.env['DEST_OS'] in ['win32', 'win64']:
+    build_features = ['cshlib']
 else: #linux, darwin, android, mingw, ...
     build_features = ['cshlib', 'cstlib']

tests/utils_tests.h

@@ -4 +4 @@
 #include <math.h>
 #include <assert.h>
+#include "config.h"
 
 #define PRINT_ERR(format, args...)   fprintf(stderr, "AUBIO-TESTS ERROR: " format , ##args)
@@ -9 +10 @@
 #define PRINT_DBG(format, args...)   fprintf(stderr, format , ##args)
 #define PRINT_WRN(format, args...)   fprintf(stderr, "AUBIO-TESTS WARNING: " format, ##args)
+
+#ifdef HAVE_WIN_HACKS
+// http://en.wikipedia.org/wiki/Linear_congruential_generator
+// no srandom/random on win32
+
+uint_t srandom_seed = 1029;
+
+void srandom(uint_t new_seed) {
+    srandom_seed = new_seed;
+}
+
+uint_t random(void) {
+    srandom_seed = 1664525 * srandom_seed + 1013904223;
+    return srandom_seed;
+}
+#endif
 
 void utils_init_random () {

wscript

@@ -85 +85 @@
     ctx.load('waf_unit_test')
     ctx.load('gnu_dirs')
-    ctx.env.CFLAGS += ['-g', '-Wall', '-Wextra', '-fPIC']
+
+    ctx.env.CFLAGS += ['-g', '-Wall', '-Wextra']
 
     target_platform = Options.platform
@@ -92 +93 @@
     ctx.env['DEST_OS'] = target_platform
 
-    if target_platform == 'win32':
-        ctx.env['shlib_PATTERN'] = 'lib%s.dll'
+    if target_platform not in ['win32', 'win64']:
+        ctx.env.CFLAGS += ['-fPIC']
+    else:
+        ctx.define('HAVE_WIN_HACKS', 1)
+        ctx.env['cshlib_PATTERN'] = 'lib%s.dll'
 
     if target_platform == 'darwin':