Fix build.
Update the BUILD.gn file to match the current build system rules.
Also silence some warnings which show up as a result of Fuchisa's more
strict default warning flags.
Change-Id: I4f8a3ca22651081759d18122e7ed070e540b5031
diff --git a/BUILD.gn b/BUILD.gn
index b54eb4b..6fd90bf 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -31,8 +31,6 @@
#* */
#*************************************************************************/
-import("//packages/package.gni")
-
source_set("flite") {
deps = [
]
diff --git a/lang/cmu_us_slt/cmu_us_slt_cg.c b/lang/cmu_us_slt/cmu_us_slt_cg.c
index 4c984c2..a14143a 100644
--- a/lang/cmu_us_slt/cmu_us_slt_cg.c
+++ b/lang/cmu_us_slt/cmu_us_slt_cg.c
@@ -415,16 +415,16 @@
cmu_us_slt_single_num_frames
};
const unsigned short **cmu_us_slt_model_vectors[] = {
- cmu_us_slt_single_model_vectors
+ (const unsigned short**)cmu_us_slt_single_model_vectors
};
const cst_cart **cmu_us_slt_mcep_carts[] = {
- cmu_us_slt_single_mcep_carts
+ (const cst_cart**)cmu_us_slt_single_mcep_carts
};
const dur_stat **cmu_us_slt_dur_stats_table[] = {
- cmu_us_slt_dur_stats
+ (const dur_stat**)cmu_us_slt_dur_stats
};
const cst_cart *cmu_us_slt_dur_cart_table[] = {
- &cmu_us_slt_dur_cart
+ (const cst_cart*)&cmu_us_slt_dur_cart
};
const cst_cg_db cmu_us_slt_cg_db = {
@@ -438,8 +438,8 @@
cmu_us_slt_mcep_carts,
&cmu_us_slt_spamf0_accent_cart,
&cmu_us_slt_spamf0_phrase_cart,
- cmu_us_slt_num_channels,
- cmu_us_slt_num_frames,
+ (int*)cmu_us_slt_num_channels,
+ (int*)cmu_us_slt_num_frames,
cmu_us_slt_model_vectors,
cmu_us_slt_spamf0_accent_num_channels,
cmu_us_slt_spamf0_accent_num_frames,
@@ -452,7 +452,7 @@
cmu_us_slt_dur_cart_table,
cmu_us_slt_phone_states,
1, /* 1 if mlpg required */
- cmu_us_slt_dynwin,
+ (float*)cmu_us_slt_dynwin,
cmu_us_slt_dynwinsize,
0.420000, /* mlsa_alpha */
0.400000, /* mlsa_beta */
