From 191f4ac31479c7ea771e4b0043aec27897a79a88 Mon Sep 17 00:00:00 2001
From: Miller Puckette <msp@ucsd.edu>
Date: Fri, 19 Sep 2008 13:22:12 -0700
Subject: [PATCH] NT compile stuff
---
extra/sigmund~/sigmund~.c | 9 +++++++--
src/g_editor.c | 2 +-
src/makefile.nt | 3 ++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/extra/sigmund~/sigmund~.c b/extra/sigmund~/sigmund~.c
index b58a327a8..03e4ab550 100644
--- a/extra/sigmund~/sigmund~.c
+++ b/extra/sigmund~/sigmund~.c
@@ -13,6 +13,9 @@
and usable in other contexts. The one external requirement is a real
single-precision FFT, invoked as in the Mayer one: */
+#ifdef NT
+__declspec(dllimport) extern
+#endif
void mayer_realfft(int npoints, float *buf);
/* this routine is passed a buffer of npoints values, and returns the
@@ -23,7 +26,7 @@ for example, defines this in the file d_fft_mayer.c or d_fft_fftsg.c. */
#include <math.h>
#include <stdio.h>
#include <string.h>
-#ifdef MSW
+#ifdef NT
#include <malloc.h>
#else
#include <alloca.h>
@@ -577,7 +580,7 @@ static void notefinder_doit(t_notefinder *x, float freq, float power,
x->n_hist[x->n_histphase].h_power = power;
x->n_age++;
*note = 0;
-#if 1
+#if 0
if (loud)
{
post("stable %d, age %d, vibmultiple %f, powerthresh %f, hifreq %f",
@@ -715,9 +718,11 @@ static void notefinder_doit(t_notefinder *x, float freq, float power,
if (x->n_hist[k].h_power > maxpow)
maxpow = x->n_hist[k].h_power;
}
+#if 0
if (loud)
post("freq %.2g testfhi %.2g testflo %.2g maxpow %.2g",
freq, testfhi, testflo, maxpow);
+#endif
if (testflo > 0 && testfhi <= vibmultiple * testflo
&& maxpow > powerthresh)
{
diff --git a/src/g_editor.c b/src/g_editor.c
index 90404f433..c4bfd4566 100644
--- a/src/g_editor.c
+++ b/src/g_editor.c
@@ -739,8 +739,8 @@ int glist_amreloadingabstractions = 0;
/* call canvas_doreload on everyone */
void canvas_reload(t_symbol *name, t_symbol *dir, t_gobj *except)
{
- glist_amreloadingabstractions = 1;
t_canvas *x;
+ glist_amreloadingabstractions = 1;
/* find all root canvases */
for (x = canvas_list; x; x = x->gl_next)
glist_doreload(x, name, dir, except);
diff --git a/src/makefile.nt b/src/makefile.nt
index 1f2822ba5..cda842f2b 100644
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -20,7 +20,8 @@ LIB = /NODEFAULTLIB:libcmt /NODEFAULTLIB:oldnames /NODEFAULTLIB:libc \
GLIB = $(LIB) ..\bin\tcl84.lib ..\bin\tk84.lib
CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \
- -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -D__i386__ -DPA19
+ -DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -D__i386__ -DPA19 \
+ -D_CRT_SECURE_NO_WARNINGS
LFLAGS = /nologo
SYSSRC = s_audio_pa.c s_audio_pablio.c s_audio_paring.c \
--
GitLab