From bca4fd48c7ea396994e24714ca2c0ff482d8c2bd Mon Sep 17 00:00:00 2001 From: Wesnydy ribeiro Date: Wed, 23 Mar 2016 12:54:52 -0300 Subject: [PATCH] Atualiza makefile --- Makefile | 8 -------- core_install.sh | 2 ++ tradutor/src/include/tradutorPortGlosa.h | 5 ++--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index e52d9d0..2c160c4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ CC = g++ FLAGS = -g EXTRATORDIR = extrator/src/ -INPUTDIR = input/src/ MIXERDIR = mixer/src/ RECOGNIZEDIR = recognize/src/ RENDERDIR = renderer/src/ @@ -14,7 +13,6 @@ UTILDIR = util/src/ INCLUDES = \ -I $(EXTRATORDIR)include \ - -I $(INPUTDIR)include \ -I $(MIXERDIR)include \ -I $(RECOGNIZEDIR)include \ -I $(RENDERDIR)include \ @@ -43,10 +41,6 @@ extratorOBJS = \ extratorVTT.o \ subtitle.o -inputOBJS = \ - inputException.o \ - inputFile.o - mixerOBJS = \ mixer.o @@ -76,7 +70,6 @@ utilOBJS = \ logging.o extratorOBJSPre = $(addprefix $(EXTRATORDIR),$(extratorOBJS) ) -inputOBJSPre = $(addprefix $(INPUTDIR),$(inputOBJS) ) mixerOBJSPre = $(addprefix $(MIXERDIR),$(mixerOBJS) ) recognizeOBJSPre = $(addprefix $(RECOGNIZEDIR),$(recognizeOBJS) ) rendererOBJSPre = $(addprefix $(RENDERDIR),$(rendererOBJS) ) @@ -86,7 +79,6 @@ utilOBJSPre = $(addprefix $(UTILDIR),$(utilOBJS) ) OBJECTS = \ $(extratorOBJSPre) \ - $(inputOBJSPre) \ $(mixerOBJSPre) \ $(recognizeOBJSPre) \ $(rendererOBJSPre) \ diff --git a/core_install.sh b/core_install.sh index 3024337..a893339 100755 --- a/core_install.sh +++ b/core_install.sh @@ -38,9 +38,11 @@ tar -xf lavid-lib.tar.gz echo -e "\n\033[32m##### Baixando sinais #####\033[0m\n" +cd ~/vlibras-core ./dict_update.sh echo -e "\n\033[32m##### Instalando Yasm #####\033[0m\n" +cd ~/vlibras-libs cd yasm-1.2.0 chmod +x configure ./configure diff --git a/tradutor/src/include/tradutorPortGlosa.h b/tradutor/src/include/tradutorPortGlosa.h index 29c25f2..55bfc45 100644 --- a/tradutor/src/include/tradutorPortGlosa.h +++ b/tradutor/src/include/tradutorPortGlosa.h @@ -9,8 +9,7 @@ #include #include #include "listenerTradutor.h" -#include "pyTradutor.h" -#include "listenerInput.h" +#include "pyTradutor.h" #include "logging.h" #ifndef _GERADOR_GLOSA_H_ @@ -25,7 +24,7 @@ namespace Tradutor { * * \headerfile tradutor/src/include/tradutorPortGlosa.h */ - class TradutorPortGlosa : public ListenerInput{ + class TradutorPortGlosa { public: /** Construtor. */ -- libgit2 0.21.2