From 1af0afa88c58de7fb6627afb546a19e0e73239b5 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sun, 31 Aug 2014 17:22:12 +0100 Subject: [PATCH] 1.48.11 (from http://espeak.sourceforge.net/test/latest.html) --- espeak-data/voices/europe/eu | 0 espeak-data/voices/test/eu | 3 --- phsource/ufric/ts_eu.wav | Bin phsource/ufric/tz_eu.wav | Bin phsource/ufric/z_eu.wav | Bin src/Makefile | 10 +++++----- 6 files changed, 5 insertions(+), 8 deletions(-) mode change 100755 => 100644 espeak-data/voices/europe/eu delete mode 100644 espeak-data/voices/test/eu mode change 100755 => 100644 phsource/ufric/ts_eu.wav mode change 100755 => 100644 phsource/ufric/tz_eu.wav mode change 100755 => 100644 phsource/ufric/z_eu.wav diff --git a/espeak-data/voices/europe/eu b/espeak-data/voices/europe/eu old mode 100755 new mode 100644 diff --git a/espeak-data/voices/test/eu b/espeak-data/voices/test/eu deleted file mode 100644 index 35ada0cf..00000000 --- a/espeak-data/voices/test/eu +++ /dev/null @@ -1,3 +0,0 @@ -name basque-test -language eu - diff --git a/phsource/ufric/ts_eu.wav b/phsource/ufric/ts_eu.wav old mode 100755 new mode 100644 diff --git a/phsource/ufric/tz_eu.wav b/phsource/ufric/tz_eu.wav old mode 100755 new mode 100644 diff --git a/phsource/ufric/z_eu.wav b/phsource/ufric/z_eu.wav old mode 100755 new mode 100644 diff --git a/src/Makefile b/src/Makefile index 17224b85..95fe5493 100644 --- a/src/Makefile +++ b/src/Makefile @@ -93,13 +93,13 @@ SRCS3 = espeak.cpp OBJS3=$(patsubst %.cpp,%.o,$(SRCS3)) LIBS3=-lstdc++ -L . -lespeak -CXXFLAGS?=-O2 -CXXFLAGS+=-fno-exceptions -pedantic -Wall +CXXFLAGS=-O2 + all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME) .cpp.o: - $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -I. -c $< + $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $< $(BIN_NAME): $(OBJS1) $(CXX) $(LDFLAGS) -o $@ $(OBJS1) $(LIBS1) @@ -110,8 +110,8 @@ $(BIN2_NAME): $(OBJS3) $(LIB_NAME) x_%.o: %.cpp - $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -fpic -fvisibility=hidden \ - -I. -D LIBRARY -c $< -o x_$*.o + $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -fpic -fvisibility=hidden -pedantic \ + -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o $(LIB_NAME): $(OBJS2) $(CXX) $(LDFLAGS) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ \