summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-21 03:44:59 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-21 03:44:59 +0000
commit06ee8d3cc8d4f29b19022da800c307377ff0e6c2 (patch)
tree3ee49e5ad63c658229658c8e501606808a72dc15 /Makefile
parent7f3ef9a9f7c9d822cda24fe40760ecd1de482d18 (diff)
downloadmpv-06ee8d3cc8d4f29b19022da800c307377ff0e6c2.tar.bz2
mpv-06ee8d3cc8d4f29b19022da800c307377ff0e6c2.tar.xz
reversed broken linker option, it breaks compile on some systems. add a configure check for this nonsense if it's important..
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15233 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 73f92bd36f..d2d8a4e67e 100644
--- a/Makefile
+++ b/Makefile
@@ -244,7 +244,7 @@ $(PRG): $(MPLAYER_DEP)
ifeq ($(TARGET_WIN32),yes)
windres -o osdep/mplayer-rc.o osdep/mplayer.rc
endif
- $(CC) $(CFLAGS) -Wl,-z,noexecstack -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
+ $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
@@ -259,7 +259,7 @@ mplayer_wine.so: $(MPLAYER_DEP)
ifeq ($(MENCODER),yes)
$(PRG_MENCODER): $(MENCODER_DEP)
- $(CC) $(CFLAGS) -Wl,-z,noexecstack -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
+ $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
endif
codecs.conf.h: $(PRG_CFG) etc/codecs.conf