From a734aa2b2652c27859ae67192246e854c5fd2377 Mon Sep 17 00:00:00 2001 From: Carlos Fernandez Sanz Date: Wed, 21 Sep 2016 11:43:08 -0700 Subject: [PATCH] Fixed compilation in linux --- linux/Makefile | 2 +- linux/build | 7 ++++--- linux/builddebug | 8 +++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 1c441126..e25f22fc 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -4,7 +4,7 @@ CC = gcc SYS := $(shell gcc -dumpmachine) CFLAGS = -O3 -std=gnu99 -s INCLUDE = -I../src/gpacmp4/ -I../src/libpng -I../src/lib_hash -I../src/zlib -I../src/lib_ccx -I../src/. -INCLUDE += -I../src/zvbi +INCLUDE += -I../src/zvbi -I../src/utf8proc ALL_FLAGS = -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT LDFLAGS = -lm diff --git a/linux/build b/linux/build index 622391e9..556fdb07 100755 --- a/linux/build +++ b/linux/build @@ -1,6 +1,6 @@ #!/bin/bash -BLD_FLAGS="-g -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR" -BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi -I../src/lib_hash -I../src/protobuf-c" +BLD_FLAGS="-std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR" +BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi -I../src/lib_hash -I../src/protobuf-c -I../src/utf8proc" SRC_LIBPNG="$(find ../src/libpng/ -name '*.c')" SRC_ZLIB="$(find ../src/zlib/ -name '*.c')" SRC_ZVBI="$(find ../src/zvbi/ -name '*.c')" @@ -8,7 +8,8 @@ SRC_CCX="$(find ../src/lib_ccx/ -name '*.c')" SRC_GPAC="$(find ../src/gpacmp4/ -name '*.c')" SRC_HASH="$(find ../src/lib_hash/ -name '*.c')" SRC_PROTOBUF="$(find ../src/protobuf-c/ -name '*.c')" -BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_ZLIB $SRC_ZVBI $SRC_LIBPNG $SRC_HASH $SRC_PROTOBUF" +SRC_UTF8PROC="../src/utf8proc/utf8proc.c" +BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_ZLIB $SRC_ZVBI $SRC_LIBPNG $SRC_HASH $SRC_PROTOBUF $SRC_UTF8PROC" BLD_LINKER="-lm -zmuldefs -l tesseract -l lept" ./pre-build.sh diff --git a/linux/builddebug b/linux/builddebug index c51d8dd7..6bca7f2c 100755 --- a/linux/builddebug +++ b/linux/builddebug @@ -1,13 +1,15 @@ #!/bin/bash -BLD_FLAGS="-g -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT" -BLD_INCLUDE="-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi -I../src/lib_hash" +BLD_FLAGS="-g -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DENABLE_OCR" +BLD_INCLUDE="-I../src -I /usr/include/leptonica/ -I /usr/include/tesseract/ -I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi -I../src/lib_hash -I../src/protobuf-c -I../src/utf8proc" SRC_LIBPNG="$(find ../src/libpng/ -name '*.c')" SRC_ZLIB="$(find ../src/zlib/ -name '*.c')" SRC_ZVBI="$(find ../src/zvbi/ -name '*.c')" SRC_CCX="$(find ../src/lib_ccx/ -name '*.c')" SRC_GPAC="$(find ../src/gpacmp4/ -name '*.c')" SRC_HASH="$(find ../src/lib_hash/ -name '*.c')" -BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_ZLIB $SRC_ZVBI $SRC_LIBPNG $SRC_HASH" +SRC_PROTOBUF="$(find ../src/protobuf-c/ -name '*.c')" +SRC_UTF8PROC="../src/utf8proc/utf8proc.c" +BLD_SOURCES="../src/ccextractor.c $SRC_CCX $SRC_GPAC $SRC_ZLIB $SRC_ZVBI $SRC_LIBPNG $SRC_HASH $SRC_PROTOBUF $SRC_UTF8PROC" BLD_LINKER="-lm -zmuldefs -l tesseract -l lept" ./pre-build.sh