Makefile.am: fixed linking of mozilla plugin

npvlc_rc.rc: fixed description and suffixes columns

Makefile.am: fixed linking of mozilla plugin
npvlc_rc.rc: fixed description and suffixes columns
69aae8d2 · Damien Fouilleul · 7527abe7 · 69aae8d2 · 69aae8d2
Commit 69aae8d2 authored Mar 17, 2006 by Damien Fouilleul
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

mozilla/Makefile.am mozilla/Makefile.am +4 -1

mozilla/npvlc_rc.rc mozilla/npvlc_rc.rc +2 -2

No files found.
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -41,9 +41,12 @@ noinst_DATA = npvlc_rc.$(OBJEXT)

 SOURCES_support = support/npwin.cpp
 CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
-LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc)
+LDFLAGS_npvlc = -shared -Wl,--kill-at $(LIBRARIES_libvlc)

 DATA_npvlc_rc = $(noinst_npvlc_rc_DATA)
+noinst_npvlc_rc_DATA = npvlc_rc.$(OBJEXT)
+noinst_npvlc_rcdir =
+
 npvlc_rc.$(OBJEXT): npvlc_rc.rc
 	$(WINDRES) -DVERSION=$(VERSION) \
 		-DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` \

--- a/mozilla/npvlc_rc.rc
+++ b/mozilla/npvlc_rc.rc
@@ -40,8 +40,8 @@ BEGIN
            VALUE "CompanyName", "VideoLAN Team\0"
            VALUE "LegalCopyright", "Copyright VideoLAN \251 1996-2006\0"
            VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mpeg4|audio/mpeg4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|application/x-ogg|application/ogg|application/x-vlc-plugin|video/x-ms-asf-plugin|video/x-ms-asf|application/x-mplayer2|video/x-ms-wmv|application/x-google-vlc-plugin\0"
-            VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg||\0"
-            VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|VLC plugin|Google VLC plugin\0"
+            VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg|ogg||\0"
+            VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|Ogg stream|VLC plugin|||||Google VLC plugin\0"
        END
    END
    BLOCK "VarFileInfo"