comparison Makefile @ 15223:35711c04c95c

Link with -z noexecstack, fixes bug #258. Please test on all platforms!
author reimar
date Wed, 20 Apr 2005 12:01:39 +0000
parents 9dda4cbf1211
children 8e7a5069dcae
comparison
equal deleted inserted replaced
15222:35fd849cf8fc 15223:35711c04c95c
242 242
243 $(PRG): $(MPLAYER_DEP) 243 $(PRG): $(MPLAYER_DEP)
244 ifeq ($(TARGET_WIN32),yes) 244 ifeq ($(TARGET_WIN32),yes)
245 windres -o osdep/mplayer-rc.o osdep/mplayer.rc 245 windres -o osdep/mplayer-rc.o osdep/mplayer.rc
246 endif 246 endif
247 $(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) 247 $(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)
248 248
249 mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a 249 mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
250 winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \ 250 winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
251 libmpcodecs/ad_qtaudio.o libmpcodecs/vd_qtvideo.o \ 251 libmpcodecs/ad_qtaudio.o libmpcodecs/vd_qtvideo.o \
252 -L/usr/local/lib/wine -lkernel32 252 -L/usr/local/lib/wine -lkernel32
257 mplayer_wine.so: $(MPLAYER_DEP) 257 mplayer_wine.so: $(MPLAYER_DEP)
258 $(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so mplayer_wine.spec.c $(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) -lwine $(ARCH_LIB) $(MATH_LIB) 258 $(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so mplayer_wine.spec.c $(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) -lwine $(ARCH_LIB) $(MATH_LIB)
259 259
260 ifeq ($(MENCODER),yes) 260 ifeq ($(MENCODER),yes)
261 $(PRG_MENCODER): $(MENCODER_DEP) 261 $(PRG_MENCODER): $(MENCODER_DEP)
262 $(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) 262 $(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)
263 endif 263 endif
264 264
265 codecs.conf.h: $(PRG_CFG) etc/codecs.conf 265 codecs.conf.h: $(PRG_CFG) etc/codecs.conf
266 ./$(PRG_CFG) ./etc/codecs.conf > $@ 266 ./$(PRG_CFG) ./etc/codecs.conf > $@
267 267