Unified · Split
| @@ -108,12 +108,12 @@ $(OBJDIR)/%.os : %.c · 107 unmodified lines | |||
| 108 | $(CC) $(SHFLAGS) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ | 108 | $(CC) $(SHFLAGS) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ |
| 109 | 109 | ||
| 110 | $(OBJDIR)/.build_lib: $(FULLOBJS) | 110 | $(OBJDIR)/.build_lib: $(FULLOBJS) |
| 111 | @ (cd $(OBJDIR) && $(AR) cruv ../../../$(LIBDIR)/lib$(LIBNAME).a $(OBJS)) | 111 | @ (cd $(OBJDIR) && $(AR) crv ../../../$(LIBDIR)/lib$(LIBNAME).a $(OBJS)) |
| 112 | @ $(RANLIB) $(LIBDIR)/lib$(LIBNAME).a | 112 | @ $(RANLIB) $(LIBDIR)/lib$(LIBNAME).a |
| 113 | @ touch $(OBJDIR)/.build_lib | 113 | @ touch $(OBJDIR)/.build_lib |
| 114 | 114 | ||
| 115 | $(OBJDIR)/.build_so: $(FULLSHOBJS) | 115 | $(OBJDIR)/.build_so: $(FULLSHOBJS) |
| 116 | @ (cd $(OBJDIR) && $(AR) cruv ../../../$(LIBDIR)/lib$(LIBNAME).shared.a $(SOOBJS)) | 116 | @ (cd $(OBJDIR) && $(AR) crv ../../../$(LIBDIR)/lib$(LIBNAME).shared.a $(SOOBJS)) |
| 117 | @ $(RANLIB) $(LIBDIR)/lib$(LIBNAME).shared.a | 117 | @ $(RANLIB) $(LIBDIR)/lib$(LIBNAME).shared.a |
| 118 | @ touch $(OBJDIR)/.build_so | 118 | @ touch $(OBJDIR)/.build_so |
| 119 | 119 | ||
| @@ -585,12 +585,13 @@ void add_residual_vuv(int targ_size, unsigned char *targ_residual, · 584 unmodified lines | |||
| 585 | void add_residual_pulse(int targ_size, unsigned char *targ_residual, | 585 | void add_residual_pulse(int targ_size, unsigned char *targ_residual, |
| 586 | int unit_size, const unsigned char *unit_residual) | 586 | int unit_size, const unsigned char *unit_residual) |
| 587 | { | 587 | { |
| 588 | int p,i,m; | 588 | int i,m; |
| 589 | long long p; | ||
| 589 | /* Unit residual isn't a pointer its a number, the power for the | 590 | /* Unit residual isn't a pointer its a number, the power for the |
| 590 | the sts, yes this is hackily casting the address to a number */ | 591 | the sts, yes this is hackily casting the address to a number */ |
| 591 | 592 | ||
| 592 | /* Need voiced and unvoiced model */ | 593 | /* Need voiced and unvoiced model */ |
| 593 | p = (int)unit_residual; /* I know the compiler will complain about this */ | 594 | p = (long long)unit_residual; /* I know the compiler will complain about this */ |
| 594 | 595 | ||
| 595 | if (p > 7000) /* voiced */ | 596 | if (p > 7000) /* voiced */ |
| 596 | { | 597 | { |
| @@ -48,10 +48,10 @@ SRCS = token_test_main.c hrg_test_main.c \ · 47 unmodified lines | |||
| 48 | lpc_test2_main.c combine_waves_main.c \ | 48 | lpc_test2_main.c combine_waves_main.c \ |
| 49 | bin2ascii_main.c record_in_noise_main.c \ | 49 | bin2ascii_main.c record_in_noise_main.c \ |
| 50 | compare_wave_main.c rfc_main.c lpc_resynth_main.c \ | 50 | compare_wave_main.c rfc_main.c lpc_resynth_main.c \ |
| 51 | by_word_main.c multi_thread_main.c flite_test_main.c \ | 51 | by_word_main.c flite_test_main.c \ |
| 52 | dcoffset_wave_main.c tris1_main.c | 52 | dcoffset_wave_main.c tris1_main.c |
| 53 | FC = us.flitecheck indic_hin.flitecheck indic_tam.flitecheck | 53 | FC = us.flitecheck indic_hin.flitecheck indic_tam.flitecheck |
| 54 | OTHERS = kal_test_main.c | 54 | OTHERS = kal_test_main.c multi_thread_main.c |
| 55 | 55 | ||
| 56 | FILES = Makefile $(SRCS) $(DATAFILES) $(OTHERS) $(FC) | 56 | FILES = Makefile $(SRCS) $(DATAFILES) $(OTHERS) $(FC) |
| 57 | 57 | ||
| @@ -68,7 +68,7 @@ by_word_LIBS = -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex · 10 unmodified lines | |||
| 68 | #kal_test_LIBS = -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex \ | 68 | #kal_test_LIBS = -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex \ |
| 69 | # /home/awb/src/malloc/gmalloc.o | 69 | # /home/awb/src/malloc/gmalloc.o |
| 70 | 70 | ||
| 71 | ALL = $(MAIN_EXECS) | 71 | ALL = $(MAIN_EXECS) multi_thread |
| 72 | LOCAL_CLEAN = $(MAIN_EXECS) | 72 | LOCAL_CLEAN = $(MAIN_EXECS) |
| 73 | 73 | ||
| 74 | include $(TOP)/config/common_make_rules | 74 | include $(TOP)/config/common_make_rules |
| @@ -76,7 +76,7 @@ include $(TOP)/config/common_make_rules · 1 unmodified line | |||
| 76 | MAIN_O = $(SRCS:%=%_main.o) | 76 | MAIN_O = $(SRCS:%=%_main.o) |
| 77 | $(MAIN_O) : %_main.o : %_main.c | 77 | $(MAIN_O) : %_main.o : %_main.c |
| 78 | $(CC) $(CFLAGS) -o $@ $< | 78 | $(CC) $(CFLAGS) -o $@ $< |
| 79 | $(ALL) : %$(EXEEXT) : %_main.o $(FLITELIBS) | 79 | $(MAIN_EXECS) : %$(EXEEXT) : %_main.o $(FLITELIBS) |
| 80 | $(CC) $(CFLAGS) -o $@ $@_main.o $($(@:=_LIBS)) $(FLITELIBFLAGS) $(LDFLAGS) | 80 | $(CC) $(CFLAGS) -o $@ $@_main.o $($(@:=_LIBS)) $(FLITELIBFLAGS) $(LDFLAGS) |
| 81 | 81 | ||
| 82 | multi_thread: multi_thread_main.c | 82 | multi_thread: multi_thread_main.c |