Mercurial > mplayer.hg

diff Makefile @ 31564:480cdba9e480

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a manifest file to disable file and registry "virtualization" on Windows.
author reimar
date Sun, 04 Jul 2010 07:13:18 +0000
parents 0c9300413b28
children 9a590e7aac57
line wrap: on
line diff
--- a/Makefile	Sat Jul 03 20:54:54 2010 +0000
+++ b/Makefile	Sun Jul 04 07:13:18 2010 +0000
@@ -885,6 +885,8 @@
 $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
 $(call ADDSUFFIXES,.d .o,mpcommon osdep/mplayer.rc): version.h
 
+osdep/mplayer-rc.o: osdep/mplayer.exe.manifest
+
 gui/%: CFLAGS += -Wno-strict-prototypes
 
 libdvdcss/%:   CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)