ref: aa50ceed3bcc5b4d669ef6d7b0b570ed5c3ad659
parent: 136d865c38e394fd0d97b5340bf5bc395d3a1b25
author: Alan W Black <awb@cs.cmu.edu>
date: Fri Jul 3 05:00:09 EDT 2020
fix warnings
--- a/config/common_make_rules
+++ b/config/common_make_rules
@@ -108,12 +108,12 @@
$(CC) $(SHFLAGS) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
$(OBJDIR)/.build_lib: $(FULLOBJS)
- @ (cd $(OBJDIR) && $(AR) cruv ../../../$(LIBDIR)/lib$(LIBNAME).a $(OBJS))
+ @ (cd $(OBJDIR) && $(AR) crv ../../../$(LIBDIR)/lib$(LIBNAME).a $(OBJS))
@ $(RANLIB) $(LIBDIR)/lib$(LIBNAME).a
@ touch $(OBJDIR)/.build_lib
$(OBJDIR)/.build_so: $(FULLSHOBJS)
- @ (cd $(OBJDIR) && $(AR) cruv ../../../$(LIBDIR)/lib$(LIBNAME).shared.a $(SOOBJS))
+ @ (cd $(OBJDIR) && $(AR) crv ../../../$(LIBDIR)/lib$(LIBNAME).shared.a $(SOOBJS))
@ $(RANLIB) $(LIBDIR)/lib$(LIBNAME).shared.a
@ touch $(OBJDIR)/.build_so
--- a/src/wavesynth/cst_units.c
+++ b/src/wavesynth/cst_units.c
@@ -585,12 +585,13 @@
void add_residual_pulse(int targ_size, unsigned char *targ_residual,
int unit_size, const unsigned char *unit_residual)
{- int p,i,m;
+ int i,m;
+ long long p;
/* Unit residual isn't a pointer its a number, the power for the
the sts, yes this is hackily casting the address to a number */
/* Need voiced and unvoiced model */
- p = (int)unit_residual; /* I know the compiler will complain about this */
+ p = (long long)unit_residual; /* I know the compiler will complain about this */
if (p > 7000) /* voiced */
{--- a/testsuite/Makefile
+++ b/testsuite/Makefile
@@ -48,10 +48,10 @@
lpc_test2_main.c combine_waves_main.c \
bin2ascii_main.c record_in_noise_main.c \
compare_wave_main.c rfc_main.c lpc_resynth_main.c \
- by_word_main.c multi_thread_main.c flite_test_main.c \
+ by_word_main.c flite_test_main.c \
dcoffset_wave_main.c tris1_main.c
FC = us.flitecheck indic_hin.flitecheck indic_tam.flitecheck
-OTHERS = kal_test_main.c
+OTHERS = kal_test_main.c multi_thread_main.c
FILES = Makefile $(SRCS) $(DATAFILES) $(OTHERS) $(FC)
@@ -68,7 +68,7 @@
#kal_test_LIBS = -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex \
# /home/awb/src/malloc/gmalloc.o
-ALL = $(MAIN_EXECS)
+ALL = $(MAIN_EXECS) multi_thread
LOCAL_CLEAN = $(MAIN_EXECS)
include $(TOP)/config/common_make_rules
@@ -76,7 +76,7 @@
MAIN_O = $(SRCS:%=%_main.o)
$(MAIN_O) : %_main.o : %_main.c
$(CC) $(CFLAGS) -o $@ $<
-$(ALL) : %$(EXEEXT) : %_main.o $(FLITELIBS)
+$(MAIN_EXECS) : %$(EXEEXT) : %_main.o $(FLITELIBS)
$(CC) $(CFLAGS) -o $@ $@_main.o $($(@:=_LIBS)) $(FLITELIBFLAGS) $(LDFLAGS)
multi_thread: multi_thread_main.c