summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-12 20:29:30 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-12 20:29:30 +0000
commitf4b7a0e4d1ffee255ed7147970ba304d65dd2422 (patch)
treed743c4acf9347602fd5842cd55c61e956cde5e5f
parent1f2f5a5ea92983e7d83e3324ae3266f19757f0d8 (diff)
downloadmpv-f4b7a0e4d1ffee255ed7147970ba304d65dd2422.tar.bz2
mpv-f4b7a0e4d1ffee255ed7147970ba304d65dd2422.tar.xz
Get rid on -DGNU_SOURCE for internal code, imported libs should be fixed
ASAP, too, though git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21604 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure2
-rw-r--r--libaf/Makefile2
-rw-r--r--libass/Makefile2
-rw-r--r--libmpcodecs/Makefile1
4 files changed, 2 insertions, 5 deletions
diff --git a/configure b/configure
index 856aaf6e77..b71a8b525f 100755
--- a/configure
+++ b/configure
@@ -4600,7 +4600,7 @@ if test "$_sdl" = yes ; then
_inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-Dmain=SDL_main//`"
else
_libs_mplayer="$_libs_mplayer `$_sdlconfig --libs`"
- _inc_extra="$_inc_extra `$_sdlconfig --cflags`"
+ _inc_extra="$_inc_extra `$_sdlconfig --cflags | sed s/-D_GNU_SOURCE=1//`"
fi
_vosrc="$_vosrc vo_sdl.c"
_vomodules="sdl $_vomodules"
diff --git a/libaf/Makefile b/libaf/Makefile
index 6175bb4dd0..08e7347ab8 100644
--- a/libaf/Makefile
+++ b/libaf/Makefile
@@ -32,8 +32,6 @@ SRCS=af.c \
SRCS-$(CONFIG_LIBAVCODEC) += af_lavcresample.c
SRCS-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c
-CFLAGS = -D_GNU_SOURCE
-
CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
diff --git a/libass/Makefile b/libass/Makefile
index 32952a06f5..4e1b4b5f2d 100644
--- a/libass/Makefile
+++ b/libass/Makefile
@@ -13,6 +13,6 @@ SRCS = ass.c \
ass_library.c \
ass_font.c \
-CFLAGS = -I../libmpcodecs -D_GNU_SOURCE
+CFLAGS = -I../libmpcodecs
include ../mpcommon.mak
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index e22660db86..2f00b1ad69 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -157,7 +157,6 @@ CFLAGS = -I.. \
-I../libmpdemux \
-I../stream \
-I../loader \
- -D_GNU_SOURCE \
CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec