1*4882a593SmuzhiyunFrom 40bf9c0960becaf0e592cac901466af93f24e52b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Julius Kriukas <julius@kriukas.lt> 3*4882a593SmuzhiyunDate: Fri, 1 Dec 2017 18:29:24 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Update Makefile to be compatible with buildroot 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun- Append to existing CFLAGS instead of overwriting. 7*4882a593Smuzhiyun- Remove cross-compilation specific options from CFLAGS, they will be 8*4882a593Smuzhiyun set by buildroot. 9*4882a593Smuzhiyun- Remove local ffmpeg_compiled include, buildroot will build ffmpeg 10*4882a593Smuzhiyun separately. 11*4882a593Smuzhiyun- Remove hard-coded dbus, freetype, rpi-firmware include paths, they 12*4882a593Smuzhiyun will be added by buildroot. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Julius Kriukas <julius@kriukas.lt> 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun Makefile | 6 +++--- 17*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 3 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/Makefile b/Makefile 20*4882a593Smuzhiyunindex 5f4e414..53fa1bc 100644 21*4882a593Smuzhiyun--- a/Makefile 22*4882a593Smuzhiyun+++ b/Makefile 23*4882a593Smuzhiyun@@ -1,10 +1,10 @@ 24*4882a593Smuzhiyun-CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog 25*4882a593Smuzhiyun+CFLAGS+=-fomit-frame-pointer -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog 26*4882a593Smuzhiyun CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun LDFLAGS=-L$(SDKSTAGE)/opt/vc/lib/ 29*4882a593Smuzhiyun-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound 30*4882a593Smuzhiyun+LDFLAGS+=-L./ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads 33*4882a593Smuzhiyun+INCLUDES+=-I./ -Ilinux 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun DIST ?= omxplayer-dist 36*4882a593Smuzhiyun STRIP ?= strip 37*4882a593Smuzhiyun-- 38*4882a593Smuzhiyun2.11.0 39*4882a593Smuzhiyun 40