From 02e19cf6179b57cb19573bd06107fd2d55c19f4f Mon Sep 17 00:00:00 2001 From: Anshul Maheshwari Date: Sat, 16 Aug 2014 09:48:29 +0200 Subject: [PATCH 1/2] corrected CFLAGS to be include in ffmpeg enable --- linux/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 3451f446..a3bf4516 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -41,9 +41,9 @@ LDFLAGS+= $(shell pkg-config --libs tesseract) endif ifeq ($(ENABLE_FFMPEG),yes) CFLAGS+=-DENABLE_FFMPEG -CFLAGS+= $(shell pkg-config --libs libavcodec) -CFLAGS+= $(shell pkg-config --libs libavformat) -CFLAGS+= $(shell pkg-config --libs libavutil) +CFLAGS+= $(shell pkg-config --cflags libavcodec) +CFLAGS+= $(shell pkg-config --cflags libavformat) +CFLAGS+= $(shell pkg-config --cflags libavutil) LDFLAGS+= $(shell pkg-config --libs libavcodec ) LDFLAGS+= $(shell pkg-config --libs libavformat ) LDFLAGS+= $(shell pkg-config --libs libavutil ) From efe6fceb3ad651a2f4437ed854c7439418ed7528 Mon Sep 17 00:00:00 2001 From: Anshul Maheshwari Date: Sun, 17 Aug 2014 10:19:54 +0200 Subject: [PATCH 2/2] add cflags for gpacmp4 on linux --- linux/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux/Makefile b/linux/Makefile index a3bf4516..dd3b5feb 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,12 +1,15 @@ SHELL = /bin/sh CC = gcc - +SYS := $(shell gcc -dumpmachine) CFLAGS = -O3 -std=gnu99 INCLUDE = -I../src/gpacmp4/ -I../src/libpng -I../src/zlib ALL_FLAGS = -Wno-write-strings -D_FILE_OFFSET_BITS=64 LDFLAGS = -lm +ifneq (, $(findstring linux, $(SYS))) +CFLAGS +=-DGPAC_CONFIG_LINUX +endif TARGET = ccextractor OBJS_DIR = objs