summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--ffinstall.nsi75
2 files changed, 1 insertions, 80 deletions
diff --git a/Makefile b/Makefile
index fac0d39130..5b5decf74a 100644
--- a/Makefile
+++ b/Makefile
@@ -156,10 +156,6 @@ install-progs: $(PROGS)
install -d "$(BINDIR)"
install -c -m 755 $(PROGS) "$(BINDIR)"
-# Create the Windows installer.
-wininstaller: all install
- makensis ffinstall.nsi
-
install-man:
install -d "$(MANDIR)/man1"
install -m 644 $(MANPAGES) "$(MANDIR)/man1"
@@ -437,7 +433,7 @@ tests/seek_test$(EXESUF): tests/seek_test.c .libs
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< $(EXTRALIBS)
-.PHONY: all lib videohook documentation install* wininstaller uninstall*
+.PHONY: all lib videohook documentation install* uninstall*
.PHONY: dep depend clean distclean TAGS
.PHONY: codectest libavtest seektest test-server fulltest test
.PHONY: $(CODEC_TESTS) $(LAVF_TESTS) regtest-ref swscale-error
diff --git a/ffinstall.nsi b/ffinstall.nsi
deleted file mode 100644
index d3198a04eb..0000000000
--- a/ffinstall.nsi
+++ /dev/null
@@ -1,75 +0,0 @@
-;NSIS Script For FFmpeg
-
-;Title Of Your Application
-Name "FFmpeg"
-CompletedText "FFmpeg install completed! Enjoy your meal!"
-
-; do a CRC check
-CRCCheck On
-
-; output file name
-OutFile "FFinstall.exe"
-
-; license page introduction
-LicenseText "You must agree to this license before installing."
-
-; license data
-LicenseData ".\COPYING"
-
-; the default installation directory
-InstallDir "$PROGRAMFILES\FFmpeg"
-
-;The text to prompt the user to enter a directory
-DirText "Please select the folder below"
-
-Section "Install"
- ;Install Files
- SetOutPath $INSTDIR
- SetCompress Auto
- SetOverwrite IfNewer
- File ".\ffmpeg.exe"
- File ".\SDL.dll"
- File ".\ffplay.exe"
- File ".\COPYING"
- File ".\CREDITS"
-
- ; documentation
- SetOutPath $INSTDIR\doc
- File ".\doc\faq.html"
- File ".\doc\ffmpeg-doc.html"
- File ".\doc\ffplay-doc.html"
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FFmpeg" "DisplayName" "FFmpeg (remove only)"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FFmpeg" "UninstallString" "$INSTDIR\Uninst.exe"
-WriteUninstaller "Uninst.exe"
-SectionEnd
-
-Section "Shortcuts"
- ;Add Shortcuts
-SectionEnd
-
-UninstallText "This will uninstall FFmpeg from your system"
-
-Section Uninstall
- ; delete files
- Delete "$INSTDIR\ffmpeg.exe"
- Delete "$INSTDIR\SDL.dll"
- Delete "$INSTDIR\ffplay.exe"
- Delete "$INSTDIR\COPYING"
- Delete "$INSTDIR\CREDITS"
-
- ; delete documentation
- Delete "$INSTDIR\doc\faq.html"
- Delete "$INSTDIR\ffmpeg-doc.html"
- Delete "$INSTDIR\doc\ffplay-doc.html"
-
- RMDir /r $INSTDIR\doc
-
- ; delete uninstaller and unistall registry entries
- Delete "$INSTDIR\Uninst.exe"
- DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\FFmpeg"
- DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FFmpeg"
- RMDir "$INSTDIR"
-SectionEnd
-