npapi-vlc | branch: master | Martin Storsjö <[email protected]> | Thu May 3 14:42:25 2018 +0300| [4cde6f00728526999b67786e5f8fb2e57fda2298] | committer: 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. > https://code.videolan.org/videolan/npapi-vlc/commit/4cde6f00728526999b67786e5f8fb2e57fda2298 --- activex/axvlc_rc.rc.in | 16 ++++++++-------- npapi/gen-vlc-r-in | 14 +++++++------- npapi/package/npvlc_rc.rc.in | 14 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/activex/axvlc_rc.rc.in b/activex/axvlc_rc.rc.in index 789ff86..aa10baa 100644 --- a/activex/axvlc_rc.rc.in +++ b/activex/axvlc_rc.rc.in @@ -33,14 +33,14 @@ BEGIN END END -2 BITMAP DISCARDABLE "inplace.bmp" -3 BITMAP DISCARDABLE "../share/pixmaps/win32/defullscreen.bmp" -4 BITMAP DISCARDABLE "../share/pixmaps/win32/play.bmp" -5 BITMAP DISCARDABLE "../share/pixmaps/win32/pause.bmp" -6 BITMAP DISCARDABLE "../share/pixmaps/win32/volume.bmp" -7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp" -8 ICON DISCARDABLE "../share/pixmaps/win32/vlc.ico" -9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp" +2 BITMAP "inplace.bmp" +3 BITMAP "../share/pixmaps/win32/defullscreen.bmp" +4 BITMAP "../share/pixmaps/win32/play.bmp" +5 BITMAP "../share/pixmaps/win32/pause.bmp" +6 BITMAP "../share/pixmaps/win32/volume.bmp" +7 BITMAP "../share/pixmaps/win32/volume-muted.bmp" +8 ICON "../share/pixmaps/win32/vlc.ico" +9 BITMAP "../share/pixmaps/win32/fullscreen.bmp" 1 TYPELIB "axvlc.tlb" diff --git a/npapi/gen-vlc-r-in b/npapi/gen-vlc-r-in index bc79c11..61d1268 100755 --- a/npapi/gen-vlc-r-in +++ b/npapi/gen-vlc-r-in @@ -116,13 +116,13 @@ BEGIN END END -3 BITMAP DISCARDABLE "../share/pixmaps/win32/defullscreen.bmp" -4 BITMAP DISCARDABLE "../share/pixmaps/win32/play.bmp" -5 BITMAP DISCARDABLE "../share/pixmaps/win32/pause.bmp" -6 BITMAP DISCARDABLE "../share/pixmaps/win32/volume.bmp" -7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp" -8 ICON DISCARDABLE "../share/pixmaps/win32/vlc.ico" -9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp" +3 BITMAP "../share/pixmaps/win32/defullscreen.bmp" +4 BITMAP "../share/pixmaps/win32/play.bmp" +5 BITMAP "../share/pixmaps/win32/pause.bmp" +6 BITMAP "../share/pixmaps/win32/volume.bmp" +7 BITMAP "../share/pixmaps/win32/volume-muted.bmp" +8 ICON "../share/pixmaps/win32/vlc.ico" +9 BITMAP "../share/pixmaps/win32/fullscreen.bmp" ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "npvlc.dll.manifest" EOF diff --git a/npapi/package/npvlc_rc.rc.in b/npapi/package/npvlc_rc.rc.in index 33d0962..d429256 100644 --- a/npapi/package/npvlc_rc.rc.in +++ b/npapi/package/npvlc_rc.rc.in @@ -45,12 +45,12 @@ BEGIN END END -3 BITMAP DISCARDABLE "../share/pixmaps/win32/defullscreen.bmp" -4 BITMAP DISCARDABLE "../share/pixmaps/win32/play.bmp" -5 BITMAP DISCARDABLE "../share/pixmaps/win32/pause.bmp" -6 BITMAP DISCARDABLE "../share/pixmaps/win32/volume.bmp" -7 BITMAP DISCARDABLE "../share/pixmaps/win32/volume-muted.bmp" -8 ICON DISCARDABLE "../share/pixmaps/win32/vlc.ico" -9 BITMAP DISCARDABLE "../share/pixmaps/win32/fullscreen.bmp" +3 BITMAP "../share/pixmaps/win32/defullscreen.bmp" +4 BITMAP "../share/pixmaps/win32/play.bmp" +5 BITMAP "../share/pixmaps/win32/pause.bmp" +6 BITMAP "../share/pixmaps/win32/volume.bmp" +7 BITMAP "../share/pixmaps/win32/volume-muted.bmp" +8 ICON "../share/pixmaps/win32/vlc.ico" +9 BITMAP "../share/pixmaps/win32/fullscreen.bmp" ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "npvlc.dll.manifest" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
