Skip to content

V
vlc-2-2
Commit a0761fb1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Win32: no need for activex and mozilla folder.

parent e1e5b556
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
Makefile.am
View file @ a0761fb1
...@@ -803,16 +803,12 @@ if BUILD_OSDMENU ...@@ -803,16 +803,12 @@ if BUILD_OSDMENU
done done
endif endif
if BUILD_MOZILLA if BUILD_MOZILLA
mkdir -p "$(win32_destdir)/mozilla" cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)
cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/ cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)
cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
endif endif
if BUILD_ACTIVEX if BUILD_ACTIVEX
mkdir -p "$(win32_destdir)/activex" cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)
cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/activex/ cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)
cp $(srcdir)/projects/activex/test.html $(win32_destdir)/activex/
cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
endif endif
# SDK # SDK
...@@ -822,6 +818,10 @@ endif ...@@ -822,6 +818,10 @@ endif
cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib" cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \ for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \
cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
if BUILD_ACTIVEX
cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/sdk/
cp $(srcdir)/projects/activex/test.html $(win32_destdir)/sdk/
endif
find $(win32_destdir) -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*lua' -exec unix2dos {} \; find $(win32_destdir) -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*lua' -exec unix2dos {} \;
......
extras/package/win32/vlc.win32.nsi.in
View file @ a0761fb1
...@@ -608,8 +608,8 @@ Section /o $Name_Section03 SEC03 ...@@ -608,8 +608,8 @@ Section /o $Name_Section03 SEC03
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
!insertmacro OpenUninstallLog !insertmacro OpenUninstallLog
!insertmacro InstallFile mozilla\npvlc.dll !insertmacro InstallFile npvlc.dll
!insertmacro InstallFile mozilla\npvlc.dll.manifest !insertmacro InstallFile npvlc.dll.manifest
!insertmacro CloseUninstallLog !insertmacro CloseUninstallLog
!define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}" !define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"
...@@ -627,8 +627,8 @@ Section $Name_Section04 SEC04 ...@@ -627,8 +627,8 @@ Section $Name_Section04 SEC04
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
!insertmacro OpenUninstallLog !insertmacro OpenUninstallLog
!insertmacro InstallFile activex\axvlc.dll !insertmacro InstallFile axvlc.dll
!insertmacro InstallFile activex\axvlc.dll.manifest !insertmacro InstallFile axvlc.dll.manifest
!insertmacro CloseUninstallLog !insertmacro CloseUninstallLog
RegDLL "$INSTDIR\axvlc.dll" RegDLL "$INSTDIR\axvlc.dll"
SectionEnd SectionEnd
......
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