From de9c457a3808ddf0cc6794ca1a24dbd2be7e57bb Mon Sep 17 00:00:00 2001 From: Urias McCullough Date: Fri, 23 Dec 2011 15:13:39 -0800 Subject: [PATCH] Disabled DEBUG=1 in several of the 3rd party ffmpeg subdirs Signed-off-by: Matt Madia --- src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile | 3 +++ src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile | 3 +++ src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile | 4 ++++ src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile index 40b8088222..e54e9556ad 100644 --- a/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile +++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile @@ -16,6 +16,9 @@ UseLibraryHeaders zlib ; TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare -Wpointer-arith ] ; +# Some targets in this subdir fail to build with DEBUG=1 +DEBUG = 0 ; + SubDirCcFlags $(HAIKU_FFMPEG_GCC_EXTRA_FLAGS) ; SubDirCcFlags $(HAIKU_FFMPEG_DEFINES) ; SubDirC++Flags $(HAIKU_FFMPEG_DEFINES) ; diff --git a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile index 5520a055e5..babee0209e 100644 --- a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile +++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile @@ -9,6 +9,9 @@ SubDirHdrs [ FDirName $(SUBDIR) ../../libswscale ] ; TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare -Wpointer-arith ] ; +# Some targets in this subdir fail to build with DEBUG=1 +DEBUG = 0 ; + SubDirCcFlags $(HAIKU_FFMPEG_GCC_EXTRA_FLAGS) ; SubDirCcFlags $(HAIKU_FFMPEG_DEFINES) ; SubDirC++Flags $(HAIKU_FFMPEG_DEFINES) ; diff --git a/src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile index 5bc931c187..9d2bdca1b6 100644 --- a/src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile +++ b/src/add-ons/media/plugins/ffmpeg/libavformat/Jamfile @@ -11,6 +11,10 @@ UseLibraryHeaders zlib ; TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare -Wpointer-arith ] ; +# Some targets in this subdir fail to build with DEBUG=1 +# (when compiled with gcc2) +DEBUG = 0 ; + SubDirCcFlags $(HAIKU_FFMPEG_GCC_EXTRA_FLAGS) ; SubDirCcFlags $(HAIKU_FFMPEG_DEFINES) ; SubDirC++Flags $(HAIKU_FFMPEG_DEFINES) ; diff --git a/src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile b/src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile index 817829436b..c8c00005c6 100644 --- a/src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile +++ b/src/add-ons/media/plugins/ffmpeg/libswscale/Jamfile @@ -8,6 +8,10 @@ SubDirHdrs [ FDirName $(SUBDIR) ../libavcodec ] ; TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare -Wpointer-arith ] ; +# Some targets in this subdir fail to build with DEBUG=1 +# (when compiled with gcc2) +DEBUG = 0 ; + local archSources ; archSources = ;