Commit 4cde6f00 authored by Martin Storsjö's avatar Martin Storsjö

Stop setting the DISCARDABLE flag in windows resource files

This flag hasn't had any effect since Win16. llvm-rc doesn't yet
support this flag.
parent 47df5bda
...@@ -33,14 +33,14 @@ BEGIN ...@@ -33,14 +33,14 @@ BEGIN
END END
END END
2 BITMAP DISCARDABLE "inplace.bmp" 2 BITMAP "inplace.bmp"
3 BITMAP DISCARDABLE "../share/pixmaps/win32/defullscreen.bmp" 3 BITMAP "../share/pixmaps/win32/defullscreen.bmp"
4 BITMAP DISCARDABLE "../share/pixmaps/win32/play.bmp" 4 BITMAP "../share/pixmaps/win32/play.bmp"
5 BITMAP DISCARDABLE "../share/pixmaps/win32/pause.bmp" 5 BITMAP "../share/pixmaps/win32/pause.bmp"
6 BITMAP DISCARDABLE "../share/pixmaps/win32/volume.bmp" 6 BITMAP "../share/pixmaps/win32/volume.bmp"
7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp" 7 BITMAP "../share/pixmaps/win32/volume-muted.bmp"
8 ICON DISCARDABLE "../share/pixmaps/win32/vlc.ico" 8 ICON "../share/pixmaps/win32/vlc.ico"
9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp" 9 BITMAP "../share/pixmaps/win32/fullscreen.bmp"
1 TYPELIB "axvlc.tlb" 1 TYPELIB "axvlc.tlb"
......
...@@ -116,13 +116,13 @@ BEGIN ...@@ -116,13 +116,13 @@ BEGIN
END END
END END
3 BITMAP DISCARDABLE "../share/pixmaps/win32/defullscreen.bmp" 3 BITMAP "../share/pixmaps/win32/defullscreen.bmp"
4 BITMAP DISCARDABLE "../share/pixmaps/win32/play.bmp" 4 BITMAP "../share/pixmaps/win32/play.bmp"
5 BITMAP DISCARDABLE "../share/pixmaps/win32/pause.bmp" 5 BITMAP "../share/pixmaps/win32/pause.bmp"
6 BITMAP DISCARDABLE "../share/pixmaps/win32/volume.bmp" 6 BITMAP "../share/pixmaps/win32/volume.bmp"
7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp" 7 BITMAP "../share/pixmaps/win32/volume-muted.bmp"
8 ICON DISCARDABLE "../share/pixmaps/win32/vlc.ico" 8 ICON "../share/pixmaps/win32/vlc.ico"
9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp" 9 BITMAP "../share/pixmaps/win32/fullscreen.bmp"
ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "npvlc.dll.manifest" ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "npvlc.dll.manifest"
EOF EOF
......
...@@ -45,12 +45,12 @@ BEGIN ...@@ -45,12 +45,12 @@ BEGIN
END END
END END
3 BITMAP DISCARDABLE "../share/pixmaps/win32/defullscreen.bmp" 3 BITMAP "../share/pixmaps/win32/defullscreen.bmp"
4 BITMAP DISCARDABLE "../share/pixmaps/win32/play.bmp" 4 BITMAP "../share/pixmaps/win32/play.bmp"
5 BITMAP DISCARDABLE "../share/pixmaps/win32/pause.bmp" 5 BITMAP "../share/pixmaps/win32/pause.bmp"
6 BITMAP DISCARDABLE "../share/pixmaps/win32/volume.bmp" 6 BITMAP "../share/pixmaps/win32/volume.bmp"
7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp" 7 BITMAP "../share/pixmaps/win32/volume-muted.bmp"
8 ICON DISCARDABLE "../share/pixmaps/win32/vlc.ico" 8 ICON "../share/pixmaps/win32/vlc.ico"
9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp" 9 BITMAP "../share/pixmaps/win32/fullscreen.bmp"
ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "npvlc.dll.manifest" ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "npvlc.dll.manifest"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment