mirror of
https://github.com/mpv-player/mpv
synced 2024-08-24 07:21:49 +02:00
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
This commit is contained in:
parent
7f3ef9a9f7
commit
06ee8d3cc8
4
Makefile
4
Makefile
@ -244,7 +244,7 @@ $(PRG): $(MPLAYER_DEP)
|
|||||||
ifeq ($(TARGET_WIN32),yes)
|
ifeq ($(TARGET_WIN32),yes)
|
||||||
windres -o osdep/mplayer-rc.o osdep/mplayer.rc
|
windres -o osdep/mplayer-rc.o osdep/mplayer.rc
|
||||||
endif
|
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
|
mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
|
||||||
winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
|
winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
|
||||||
@ -259,7 +259,7 @@ mplayer_wine.so: $(MPLAYER_DEP)
|
|||||||
|
|
||||||
ifeq ($(MENCODER),yes)
|
ifeq ($(MENCODER),yes)
|
||||||
$(PRG_MENCODER): $(MENCODER_DEP)
|
$(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
|
endif
|
||||||
|
|
||||||
codecs.conf.h: $(PRG_CFG) etc/codecs.conf
|
codecs.conf.h: $(PRG_CFG) etc/codecs.conf
|
||||||
|
Loading…
Reference in New Issue
Block a user