From dfcfe058850b07ae9077eea8415cf5315deb1937 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 20 Oct 2012 16:45:05 +0200
Subject: build: fix compilation on Windows (manifest files)

---
 osdep/mplayer.exe.manifest | 19 ----------------
 osdep/mplayer.rc           | 55 ----------------------------------------------
 osdep/mpv.exe.manifest     | 19 ++++++++++++++++
 osdep/mpv.rc               | 55 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 74 deletions(-)
 delete mode 100644 osdep/mplayer.exe.manifest
 delete mode 100644 osdep/mplayer.rc
 create mode 100644 osdep/mpv.exe.manifest
 create mode 100644 osdep/mpv.rc

(limited to 'osdep')

diff --git a/osdep/mplayer.exe.manifest b/osdep/mplayer.exe.manifest
deleted file mode 100644
index c924377c4b..0000000000
--- a/osdep/mplayer.exe.manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="mpv - The Movie Player"
-        type="win32"
-    />
-    <description>mpv - The Movie Player</description>
-    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-        <security>
-            <requestedPrivileges>
-                <requestedExecutionLevel
-                    level="asInvoker"
-                />
-            </requestedPrivileges>
-        </security>
-    </trustInfo>
-</assembly>
diff --git a/osdep/mplayer.rc b/osdep/mplayer.rc
deleted file mode 100644
index ec04346f9d..0000000000
--- a/osdep/mplayer.rc
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Windows resource file for MPlayer
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <winver.h>
-#include "version.h"
-
-1 VERSIONINFO
-FILEVERSION 2,0,0,0
-PRODUCTVERSION 2,0,0,0
-FILEOS VOS__WINDOWS32
-FILETYPE VFT_APP
-{
-    BLOCK "StringFileInfo"
-    {
-        BLOCK "000004b0" // LANG_NEUTRAL,UNICODE_CP
-        {
-            VALUE "Comments","mpv is distributed under the terms of the GNU General Public License Version 3.\000"
-            VALUE "CompanyName", "\000"
-            VALUE "FileDescription", "mpv - Movie Player\000"
-            VALUE "FileVersion",VERSION
-            VALUE "LegalCopyright", " (C) 2000-2012 MPlayer Team and others\000"
-            //VALUE "LegalTrademarks"," \000";
-            VALUE "OriginalFilename", "mpv.exe\000"
-            VALUE "ProductName", "mpv - The Movie Player\000"
-            VALUE "ProductVersion",VERSION
-            //VALUE "SpecialBuild","\000"
-        }
-    }
-    BLOCK "VarFileInfo"
-    {
-        VALUE "Translation",0,0x04b0
-    }
-}
-
-IDI_ICON1 ICON DISCARDABLE  "etc/mplayer.ico"
-
-// for some reason RT_MANIFEST does not work
-1 24 "mpv.exe.manifest"
diff --git a/osdep/mpv.exe.manifest b/osdep/mpv.exe.manifest
new file mode 100644
index 0000000000..c924377c4b
--- /dev/null
+++ b/osdep/mpv.exe.manifest
@@ -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="mpv - The Movie Player"
+        type="win32"
+    />
+    <description>mpv - The Movie Player</description>
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel
+                    level="asInvoker"
+                />
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+</assembly>
diff --git a/osdep/mpv.rc b/osdep/mpv.rc
new file mode 100644
index 0000000000..ec04346f9d
--- /dev/null
+++ b/osdep/mpv.rc
@@ -0,0 +1,55 @@
+/*
+ * Windows resource file for MPlayer
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <winver.h>
+#include "version.h"
+
+1 VERSIONINFO
+FILEVERSION 2,0,0,0
+PRODUCTVERSION 2,0,0,0
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+{
+    BLOCK "StringFileInfo"
+    {
+        BLOCK "000004b0" // LANG_NEUTRAL,UNICODE_CP
+        {
+            VALUE "Comments","mpv is distributed under the terms of the GNU General Public License Version 3.\000"
+            VALUE "CompanyName", "\000"
+            VALUE "FileDescription", "mpv - Movie Player\000"
+            VALUE "FileVersion",VERSION
+            VALUE "LegalCopyright", " (C) 2000-2012 MPlayer Team and others\000"
+            //VALUE "LegalTrademarks"," \000";
+            VALUE "OriginalFilename", "mpv.exe\000"
+            VALUE "ProductName", "mpv - The Movie Player\000"
+            VALUE "ProductVersion",VERSION
+            //VALUE "SpecialBuild","\000"
+        }
+    }
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation",0,0x04b0
+    }
+}
+
+IDI_ICON1 ICON DISCARDABLE  "etc/mplayer.ico"
+
+// for some reason RT_MANIFEST does not work
+1 24 "mpv.exe.manifest"
-- 
cgit v1.2.3