gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 20:40:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update build to fred's suggestions. No more hardcoded entries

Browse source
This commit is contained in:
Gregory John Casamento 2020-02-08 07:01:46 -05:00
parent 6539ed8913
commit 347fa8c4e1
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Tools/speech_recognizer/GNUmakefile
View file

@ -1,7 +1,5 @@
include $(GNUSTEP_MAKEFILES)/common.make
# Set the default. Eventually this should be conditional.
GSSPEECHRECOGNITIONENGINE = Pocketsphinx
include ../../config.make
VERSION = 0.1
@ -22,14 +20,12 @@ POCKETSPHINX_BASE_LIBS = -lpocketsphinx -lsphinxbase -lsphinxad
# Add includes and link dirs.... need to replace triplet.
GSSpeechRecognitionServer_OBJC_FILES += PocketsphinxSpeechRecognitionEngine.m
GSSpeechRecognitionServer_INCLUDE_DIRS += -I/usr/local/include/pocketsphinx \
-I/usr/include/pocketsphinx \
-I/usr/include/x86_64-linux-gnu/sphinxbase \
GSSpeechRecognitionServer_INCLUDE_DIRS += $(RECOGNIZER_BASE_CFLAGS) \
-I../../Headers \
-I../../Headers/Additions
GSSpeechRecognitionServer_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) \
-L/usr/local/lib -lgnustep-gui \
$(POCKETSPHINX_BASE_LIBS)
$(RECOGNIZER_BASE_LIBS)
endif
include $(GNUSTEP_MAKEFILES)/application.make

2
config.make.in
View file

@ -10,6 +10,8 @@ ADDITIONAL_DEPENDS = @LIBS@
BUILD_SPEECH=@BUILD_SPEECH@
BUILD_SPEECH_RECOGNIZER=@BUILD_SPEECH_RECOGNIZER@
BUILD_SOUND=@BUILD_SOUND@
RECOGNIZER_BASE_LIBS=@RECOGNIZER_BASE_LIBS@
RECOGNIZER_BASE_CFLAGS=@RECOGNIZER_BASE_CFLAGS@
# CUPS
GSCUPS_CFLAGS = @GSCUPS_CFLAGS@

7
configure vendored
View file

@ -635,6 +635,8 @@ GSCUPS_LIBS
GSCUPS_LDFLAGS
GSCUPS_CFLAGS
have_cups
RECOGNIZER_BASE_CFLAGS
RECOGNIZER_BASE_LIBS
BUILD_SPEECH_RECOGNIZER
BUILD_SPEECH
BUILD_SOUND
@ -5736,10 +5738,13 @@ done
if test $have_pocketsphinx = yes -a $have_speech_recognizer = yes -a $enable_speech_recognizer = yes; then
BUILD_SPEECH_RECOGNIZER="speech_recognizer"
POCKETSPHINX_BASE_LIBS="-lpocketsphinx -lsphinxbase -lsphinxad"
RECOGNIZER_BASE_LIBS=`pkg-config --libs pocketsphinx sphinxbase`
RECOGNIZER_BASE_CFLAGS=`pkg-config --cflags pocketsphinx sphinxbase`
fi
#--------------------------------------------------------------------
# Find CUPS
#--------------------------------------------------------------------

5
configure.ac
View file

@ -551,9 +551,12 @@ AC_CHECK_LIB(pocketsphinx, ps_start_utt, have_speech_recognizer=yes, have_speech
AC_CHECK_HEADERS(pocketsphinx/pocketsphinx_export.h, have_pocketsphinx=yes, have_pocketsphinx=no)
if test $have_pocketsphinx = yes -a $have_speech_recognizer = yes -a $enable_speech_recognizer = yes; then
BUILD_SPEECH_RECOGNIZER="speech_recognizer"
POCKETSPHINX_BASE_LIBS="-lpocketsphinx -lsphinxbase -lsphinxad"
RECOGNIZER_BASE_LIBS=`pkg-config --libs pocketsphinx sphinxbase`
RECOGNIZER_BASE_CFLAGS=`pkg-config --cflags pocketsphinx sphinxbase`
fi
AC_SUBST(BUILD_SPEECH_RECOGNIZER)
AC_SUBST(RECOGNIZER_BASE_LIBS)
AC_SUBST(RECOGNIZER_BASE_CFLAGS)
#--------------------------------------------------------------------
# Find CUPS