From 5e2f3e7cae43498bdf648a61e91d0c22c36d0546 Mon Sep 17 00:00:00 2001
From: Takuya Nishimoto <nishimotz@gmail.com>
Date: Sat, 15 Oct 2011 21:52:31 +0900
Subject: [PATCH] nmake (Windows SDK v7, setenv /x86)

---
 Makefile.mak      | 46 ++++++++++++++++++++++++++--------------------
 lib/HTS_vocoder.c |  9 ++++++++-
 lib/Makefile.mak  |  8 +++++---
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/Makefile.mak b/Makefile.mak
index 7cdf241..7604060 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -1,32 +1,38 @@
+# for Windows SDK Ver.7
+# > setenv /x86
+# > nmake -f Makefile.mak
 
-INSTALLDIR = C:\hts_engine_API
+CC = cl
+LIB = lib
+
+#INSTALLDIR = C:\hts_engine_API
 
 all:
 	cd lib
 	nmake /f Makefile.mak
 	cd ..
-	cd bin
-	nmake /f Makefile.mak
-	cd ..
+	rem cd bin
+	rem nmake /f Makefile.mak
+	rem cd ..
 
 clean:
 	cd lib
 	nmake /f Makefile.mak clean
 	cd ..
-	cd bin
-	nmake /f Makefile.mak clean
-	cd ..
+	rem cd bin
+	rem nmake /f Makefile.mak clean
+	rem cd ..
 
-install::
-	@if not exist "$(INSTALLDIR)\lib" mkdir "$(INSTALLDIR)\lib"
-	cd lib
-	copy *.lib $(INSTALLDIR)\lib
-	cd ..
-	@if not exist "$(INSTALLDIR)\bin" mkdir "$(INSTALLDIR)\bin"
-	cd bin
-	copy *.exe $(INSTALLDIR)\bin
-	cd ..
-	@if not exist "$(INSTALLDIR)\include" mkdir "$(INSTALLDIR)\include"
-	cd include
-	copy *.h $(INSTALLDIR)\include
-	cd ..
+#install::
+#	@if not exist "$(INSTALLDIR)\lib" mkdir "$(INSTALLDIR)\lib"
+#	cd lib
+#	copy *.lib $(INSTALLDIR)\lib
+#	cd ..
+#	@if not exist "$(INSTALLDIR)\bin" mkdir "$(INSTALLDIR)\bin"
+#	cd bin
+#	copy *.exe $(INSTALLDIR)\bin
+#	cd ..
+#	@if not exist "$(INSTALLDIR)\include" mkdir "$(INSTALLDIR)\include"
+#	cd include
+#	copy *.h $(INSTALLDIR)\include
+#	cd ..
diff --git a/lib/HTS_vocoder.c b/lib/HTS_vocoder.c
index b6ef333..7dcb725 100644
--- a/lib/HTS_vocoder.c
+++ b/lib/HTS_vocoder.c
@@ -719,12 +719,16 @@ void HTS_Vocoder_initialize(HTS_Vocoder * v, const int m, const int stage,
    v->p1 = -1.0;
    v->sw = 0;
    v->x = 0x55555555;
+#if 0
    /* open audio device */
    if (0 < buff_size && buff_size <= 48000) {
       v->audio = (HTS_Audio *) HTS_calloc(1, sizeof(HTS_Audio));
       HTS_Audio_open(v->audio, rate, buff_size);
    } else
       v->audio = NULL;
+#else
+   v->audio = NULL;
+#endif
    /* init buffer */
    v->freqt_buff = NULL;
    v->freqt_size = 0;
@@ -853,9 +857,10 @@ void HTS_Vocoder_synthesize(HTS_Vocoder * v, const int m, double lf0,
          xs = (short) x;
       if (rawdata)
          rawdata[rawidx++] = xs;
+#if 0
       if (v->audio)
          HTS_Audio_write(v->audio, xs);
-
+#endif
       if (!--i) {
          for (i = 0; i <= m; i++)
             v->c[i] += v->cinc[i];
@@ -933,11 +938,13 @@ void HTS_Vocoder_clear(HTS_Vocoder * v)
          v->c = NULL;
       }
       /* close audio device */
+#if 0
       if (v->audio != NULL) {
          HTS_Audio_close(v->audio);
          HTS_free(v->audio);
          v->audio = NULL;
       }
+#endif
       if (v->pulse_list != NULL)
          HTS_free(v->pulse_list);
    }
diff --git a/lib/Makefile.mak b/lib/Makefile.mak
index c9a16ad..cd6de27 100644
--- a/lib/Makefile.mak
+++ b/lib/Makefile.mak
@@ -1,15 +1,17 @@
 
-CC = cl
+CC = $(CC)
+LIB = $(LIB)
 
 CFLAGS = /O2 /Ob2 /Oi /Ot /Oy /GT /GL /TC /I ..\include
 LFLAGS = /LTCG
 
-CORES = HTS_audio.obj HTS_engine.obj HTS_gstream.obj HTS_label.obj HTS_misc.obj HTS_model.obj HTS_pstream.obj HTS_sstream.obj HTS_vocoder.obj
+CORES = HTS_engine.obj HTS_gstream.obj HTS_label.obj HTS_misc.obj HTS_model.obj HTS_pstream.obj HTS_sstream.obj HTS_vocoder.obj
+# HTS_audio.obj removed
 
 all: hts_engine_API.lib
 
 hts_engine_API.lib: $(CORES)
-	lib $(LFLAGS) /OUT:$@ $(CORES)
+	$(LIB) $(LFLAGS) /OUT:$@ $(CORES)
 
 .c.obj:
 	$(CC) $(CFLAGS) /c $<