Mercurial > mplayer.hg

changeset 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 1474401afe45
children 9a590e7aac57
files Makefile osdep/mplayer.exe.manifest osdep/mplayer.rc
diffstat 3 files changed, 24 insertions(+), 0 deletions(-) [+]
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)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/osdep/mplayer.exe.manifest	Sun Jul 04 07:13:18 2010 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <assemblyIdentity
+        version="0.0.9.0"
+        processorArchitecture="*"
+        name="MPlayer - The Movie Player"
+        type="win32"
+    />
+    <description>MPlayer - The Movie Player</description>
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel
+                    level="asInvoker"
+                />
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+</assembly>
--- a/osdep/mplayer.rc	Sat Jul 03 20:54:54 2010 +0000
+++ b/osdep/mplayer.rc	Sun Jul 04 07:13:18 2010 +0000
@@ -51,3 +51,6 @@
 }
 
 IDI_ICON1 ICON DISCARDABLE  "etc/mplayer.ico"
+
+// for some reason RT_MANIFEST does not work
+1 24 "mplayer.exe.manifest"