From 44337cf4e6ed49c291762017d591fc538ab5abcb Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 16 Nov 2005 22:48:22 +0000 Subject: various tweaks and hacks to get things compiling with MinGW; Some still don't compile, like net*, ogg*, comport, and shell svn path=/trunk/; revision=3947 --- externals/build/src/bdiag~.c | 1 + externals/build/src/bfft~.c | 8 ++++++++ externals/build/src/ibfft~.c | 8 ++++++++ externals/build/src/junction~.c | 8 ++++++++ externals/build/src/knob.c | 7 ++++++- externals/build/src/mtx_rowrfft.c | 8 ++++++++ externals/build/src/mtx_rowrifft.c | 8 ++++++++ externals/build/src/shell.c | 6 ++++++ 8 files changed, 53 insertions(+), 1 deletion(-) diff --git a/externals/build/src/bdiag~.c b/externals/build/src/bdiag~.c index 8a3b46fb..1f15f40f 100644 --- a/externals/build/src/bdiag~.c +++ b/externals/build/src/bdiag~.c @@ -3,4 +3,5 @@ #else #include "../../creb/include/extlib_util.h" #endif + #include "../../creb/modules/bdiag.c" diff --git a/externals/build/src/bfft~.c b/externals/build/src/bfft~.c index e37e2685..6e888755 100644 --- a/externals/build/src/bfft~.c +++ b/externals/build/src/bfft~.c @@ -1 +1,9 @@ +/* + * hack to work around my lack of Windows linking knowledge + * + */ +#ifdef WIN32 +#include "../../../pd/src/d_mayer_fft.c" +#endif + #include "../../creb/modules/bfft.c" diff --git a/externals/build/src/ibfft~.c b/externals/build/src/ibfft~.c index e37e2685..6e888755 100644 --- a/externals/build/src/ibfft~.c +++ b/externals/build/src/ibfft~.c @@ -1 +1,9 @@ +/* + * hack to work around my lack of Windows linking knowledge + * + */ +#ifdef WIN32 +#include "../../../pd/src/d_mayer_fft.c" +#endif + #include "../../creb/modules/bfft.c" diff --git a/externals/build/src/junction~.c b/externals/build/src/junction~.c index f2b2ea69..2fe27f15 100644 --- a/externals/build/src/junction~.c +++ b/externals/build/src/junction~.c @@ -1 +1,9 @@ +/* + * hack to work around my lack of Windows linking knowledge + * + */ +#ifdef WIN32 +#include "../../../pd/src/d_mayer_fft.c" +#endif + #include "../../creb/modules/junction.c" diff --git a/externals/build/src/knob.c b/externals/build/src/knob.c index 317ccec4..35853636 100644 --- a/externals/build/src/knob.c +++ b/externals/build/src/knob.c @@ -1,3 +1,8 @@ - +/* + * On MinGW, it dies here: + * knob.o(.text+0x1a58):knob.c: undefined reference to `sys_noloadbang' + */ +#ifndef WIN32 #include <../../footils/knob/knob.c> +#endif diff --git a/externals/build/src/mtx_rowrfft.c b/externals/build/src/mtx_rowrfft.c index 40c56d56..6fc2554c 100644 --- a/externals/build/src/mtx_rowrfft.c +++ b/externals/build/src/mtx_rowrfft.c @@ -1,3 +1,11 @@ +/* + * hack to work around my lack of Windows linking knowledge + * + */ +#ifdef WIN32 +#include "../../../pd/src/d_mayer_fft.c" +#endif + #include "../../iem/iemmatrix/src/mtx_matrix.c" #include "../../iem/iemmatrix/src/mtx_rowrfft.c" void iemmatrix_sources_setup(void) diff --git a/externals/build/src/mtx_rowrifft.c b/externals/build/src/mtx_rowrifft.c index 5d2ffa7a..174333e6 100644 --- a/externals/build/src/mtx_rowrifft.c +++ b/externals/build/src/mtx_rowrifft.c @@ -1,3 +1,11 @@ +/* + * hack to work around my lack of Windows linking knowledge + * + */ +#ifdef WIN32 +#include "../../../pd/src/d_mayer_fft.c" +#endif + #include "../../iem/iemmatrix/src/mtx_matrix.c" #include "../../iem/iemmatrix/src/mtx_rowrifft.c" void iemmatrix_sources_setup(void) diff --git a/externals/build/src/shell.c b/externals/build/src/shell.c index 7c4a537f..916ae287 100644 --- a/externals/build/src/shell.c +++ b/externals/build/src/shell.c @@ -1 +1,7 @@ +/* + * this doesn't work for Windows, but it should be possible with MinGW or + * Cygwin + */ +#ifndef WIN32 #include "../../ggee/control/shell.c" +#endif -- cgit v1.2.1