summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-05 22:02:55 (UTC)
committer mickeyl <mickeyl>2005-05-05 22:02:55 (UTC)
commitfdd31c3dd95a42d2666235ad8c2478b7ceead261 (patch) (side-by-side diff)
treedf6cf67018891193b642f4e1f2d28a4263502a4a
parent548bfb68e473add1a19d3dd861fc1785f5e6b5c0 (diff)
downloadopie-fdd31c3dd95a42d2666235ad8c2478b7ceead261.zip
opie-fdd31c3dd95a42d2666235ad8c2478b7ceead261.tar.gz
opie-fdd31c3dd95a42d2666235ad8c2478b7ceead261.tar.bz2
use dependency system for flite plugins
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--dependencies.in14
-rw-r--r--noncore/apps/opie-reader/FliteDyn/FliteDyn.pro10
-rw-r--r--noncore/apps/opie-reader/FliteDyn/config.in5
-rw-r--r--noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro12
-rw-r--r--noncore/apps/opie-reader/FliteDyn16/config.in4
5 files changed, 40 insertions, 5 deletions
diff --git a/dependencies.in b/dependencies.in
index 4c758d3..70619de 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -25,5 +25,5 @@
config LIBSQLITE_DEP
boolean "Have sqlite >= 3.0.7"
- default n
+ default "n"
config LIBSQLITE_LIB_DIR
@@ -103,2 +103,14 @@
depends LIBFREETYPE2_DEP
+ config LIBFLITE_DEP
+ boolean "Have flite library"
+ default "n"
+
+ config LIBFLITE_INC_DIR
+ string "libflite include dir"
+ depends LIBFLITE_DEP
+
+ config LIBFLITE_LIB_DIR
+ string "libflite library dir"
+ depends LIBFLITE_DEP
+
diff --git a/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro b/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro
index 54927f5..5d03f91 100644
--- a/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro
+++ b/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro
@@ -11,5 +11,5 @@ INTERFACES =
DESTDIR = $(OPIEDIR)/plugins/reader/outcodecs
TARGET = flitedyn
-LIBS += -L/home/tim/flite/flite-1.2-release/lib -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex -lflite
+LIBS += -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex -lflite
INCLUDEPATH += $(OPIEDIR)/include
@@ -17,2 +17,10 @@ DEPENDPATH += $(OPIEDIR)/include
include( $(OPIEDIR)/include.pro )
+
+!isEmpty( LIBFLITE_INC_DIR ) {
+ INCLUDEPATH = $$LIBFLITE_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBFLITE_LIB_DIR ) {
+ LIBS = -L$$LIBFLITE_LIB_DIR $$LIBS
+}
+
diff --git a/noncore/apps/opie-reader/FliteDyn/config.in b/noncore/apps/opie-reader/FliteDyn/config.in
index 4a791f9..d2db3c3 100644
--- a/noncore/apps/opie-reader/FliteDyn/config.in
+++ b/noncore/apps/opie-reader/FliteDyn/config.in
@@ -2,3 +2,6 @@
boolean "opie-reader flite plugin (speech output via lib in 8kHz)"
default "n"
- depends OPIE-READER
+ depends OPIE-READER && LIBFLITE_DEP
+ comment "opie-reader flite plugin needs libflite"
+ depends !( OPIE-READER && LIBFLITE_DEP )
+
diff --git a/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro b/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro
index 0f92e49..9fb7a56 100644
--- a/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro
+++ b/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro
@@ -11,5 +11,5 @@ INTERFACES =
DESTDIR = $(OPIEDIR)/plugins/reader/outcodecs
TARGET = flitedyn
-LIBS += -L/home/tim/flite/flite-1.2-release/lib -lflite_cmu_us_kal16 -lflite_usenglish -lflite_cmulex -lflite
+LIBS += -lflite_cmu_us_kal16 -lflite_usenglish -lflite_cmulex -lflite
INCLUDEPATH += $(OPIEDIR)/include
@@ -17,2 +17,12 @@ DEPENDPATH += $(OPIEDIR)/include
include( $(OPIEDIR)/include.pro )
+
+!isEmpty( LIBFLITE_INC_DIR ) {
+ INCLUDEPATH = $$LIBFLITE_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBFLITE_LIB_DIR ) {
+ LIBS = -L$$LIBFLITE_LIB_DIR $$LIBS
+}
+
+
+
diff --git a/noncore/apps/opie-reader/FliteDyn16/config.in b/noncore/apps/opie-reader/FliteDyn16/config.in
index 869fddc..c6f73e5 100644
--- a/noncore/apps/opie-reader/FliteDyn16/config.in
+++ b/noncore/apps/opie-reader/FliteDyn16/config.in
@@ -2,3 +2,5 @@
boolean "opie-reader flite plugin (speech output via lib in 16kHz)"
default "n"
- depends OPIE-READER
+ depends OPIE-READER && LIBFLITE_DEP
+ comment "opie-reader flite plugin needs libflite"
+ depends !( OPIE-READER && LIBFLITE_DEP )