Commit bca4fd48c7ea396994e24714ca2c0ff482d8c2bd
1 parent
dcc05fb3
Exists in
master
and in
1 other branch
Atualiza makefile
Showing
3 changed files
with
4 additions
and
11 deletions
Show diff stats
Makefile
| ... | ... | @@ -4,7 +4,6 @@ CC = g++ |
| 4 | 4 | FLAGS = -g |
| 5 | 5 | |
| 6 | 6 | EXTRATORDIR = extrator/src/ |
| 7 | -INPUTDIR = input/src/ | |
| 8 | 7 | MIXERDIR = mixer/src/ |
| 9 | 8 | RECOGNIZEDIR = recognize/src/ |
| 10 | 9 | RENDERDIR = renderer/src/ |
| ... | ... | @@ -14,7 +13,6 @@ UTILDIR = util/src/ |
| 14 | 13 | |
| 15 | 14 | INCLUDES = \ |
| 16 | 15 | -I $(EXTRATORDIR)include \ |
| 17 | - -I $(INPUTDIR)include \ | |
| 18 | 16 | -I $(MIXERDIR)include \ |
| 19 | 17 | -I $(RECOGNIZEDIR)include \ |
| 20 | 18 | -I $(RENDERDIR)include \ |
| ... | ... | @@ -43,10 +41,6 @@ extratorOBJS = \ |
| 43 | 41 | extratorVTT.o \ |
| 44 | 42 | subtitle.o |
| 45 | 43 | |
| 46 | -inputOBJS = \ | |
| 47 | - inputException.o \ | |
| 48 | - inputFile.o | |
| 49 | - | |
| 50 | 44 | mixerOBJS = \ |
| 51 | 45 | mixer.o |
| 52 | 46 | |
| ... | ... | @@ -76,7 +70,6 @@ utilOBJS = \ |
| 76 | 70 | logging.o |
| 77 | 71 | |
| 78 | 72 | extratorOBJSPre = $(addprefix $(EXTRATORDIR),$(extratorOBJS) ) |
| 79 | -inputOBJSPre = $(addprefix $(INPUTDIR),$(inputOBJS) ) | |
| 80 | 73 | mixerOBJSPre = $(addprefix $(MIXERDIR),$(mixerOBJS) ) |
| 81 | 74 | recognizeOBJSPre = $(addprefix $(RECOGNIZEDIR),$(recognizeOBJS) ) |
| 82 | 75 | rendererOBJSPre = $(addprefix $(RENDERDIR),$(rendererOBJS) ) |
| ... | ... | @@ -86,7 +79,6 @@ utilOBJSPre = $(addprefix $(UTILDIR),$(utilOBJS) ) |
| 86 | 79 | |
| 87 | 80 | OBJECTS = \ |
| 88 | 81 | $(extratorOBJSPre) \ |
| 89 | - $(inputOBJSPre) \ | |
| 90 | 82 | $(mixerOBJSPre) \ |
| 91 | 83 | $(recognizeOBJSPre) \ |
| 92 | 84 | $(rendererOBJSPre) \ | ... | ... |
core_install.sh
| ... | ... | @@ -38,9 +38,11 @@ tar -xf lavid-lib.tar.gz |
| 38 | 38 | |
| 39 | 39 | echo -e "\n\033[32m##### Baixando sinais #####\033[0m\n" |
| 40 | 40 | |
| 41 | +cd ~/vlibras-core | |
| 41 | 42 | ./dict_update.sh |
| 42 | 43 | |
| 43 | 44 | echo -e "\n\033[32m##### Instalando Yasm #####\033[0m\n" |
| 45 | +cd ~/vlibras-libs | |
| 44 | 46 | cd yasm-1.2.0 |
| 45 | 47 | chmod +x configure |
| 46 | 48 | ./configure | ... | ... |
tradutor/src/include/tradutorPortGlosa.h
| ... | ... | @@ -9,8 +9,7 @@ |
| 9 | 9 | #include <list> |
| 10 | 10 | #include <pthread.h> |
| 11 | 11 | #include "listenerTradutor.h" |
| 12 | -#include "pyTradutor.h" | |
| 13 | -#include "listenerInput.h" | |
| 12 | +#include "pyTradutor.h" | |
| 14 | 13 | #include "logging.h" |
| 15 | 14 | |
| 16 | 15 | #ifndef _GERADOR_GLOSA_H_ |
| ... | ... | @@ -25,7 +24,7 @@ namespace Tradutor { |
| 25 | 24 | * |
| 26 | 25 | * \headerfile tradutor/src/include/tradutorPortGlosa.h |
| 27 | 26 | */ |
| 28 | - class TradutorPortGlosa : public ListenerInput{ | |
| 27 | + class TradutorPortGlosa { | |
| 29 | 28 | public: |
| 30 | 29 | |
| 31 | 30 | /** Construtor. */ | ... | ... |