Download as
Browse Code »

Commit bca4fd48c7ea396994e24714ca2c0ff482d8c2bd

Authored by Wesnydy ribeiro
1 parent dcc05fb3
Exists in master and in 1 other branch devel

Atualiza makefile

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