From 901dfa1b324a767174bac6fd27a5f68385e6db9e Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Tue, 27 Oct 2009 00:00:45 +0000 Subject: [PATCH] Change installer to install a file named VSFilter-Aegisub.dll instead of VSFilter.dll to avoid conflicts with other VSFilter.dll files on the user's system. Originally committed to SVN as r3736. --- aegisub/packages/win_installer/aegisub2.iss | 2 +- aegisub/packages/win_installer/old_filelist.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/aegisub/packages/win_installer/aegisub2.iss b/aegisub/packages/win_installer/aegisub2.iss index bc5f307dc..5f255cf5c 100644 --- a/aegisub/packages/win_installer/aegisub2.iss +++ b/aegisub/packages/win_installer/aegisub2.iss @@ -96,7 +96,7 @@ DestDir: {app}; Source: src\DirectShowSource.dll; Flags: ignoreversion; Componen DestDir: {app}; Source: src\ffms2.dll; Flags: ignoreversion; Components: codec DestDir: {app}; Source: src\ffms2.pdb; Flags: ignoreversion; Components: codec and main/pdb ; vsfilter -DestDir: {app}\csri; Source: src\csri\VSFilter.dll; Flags: ignoreversion; Components: codec/vsfilter +DestDir: {app}\csri; Source: src\csri\VSFilter-Aegisub.dll; Flags: ignoreversion; Components: codec/vsfilter ; auto4 main DestDir: {app}\automation\include; Source: src\automation\include\utils.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/lua; Attribs: readonly DestDir: {app}\automation\include; Source: src\automation\include\utils-auto4.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Components: auto/lua; Attribs: readonly diff --git a/aegisub/packages/win_installer/old_filelist.txt b/aegisub/packages/win_installer/old_filelist.txt index 2edccb8fa..0c32cccb0 100644 --- a/aegisub/packages/win_installer/old_filelist.txt +++ b/aegisub/packages/win_installer/old_filelist.txt @@ -53,3 +53,4 @@ automation\auto3\simple-k-replacer.auto3 automation\autoload\line-per-syllable.auto3 automation\autoload\multi-template.auto3 automation\autoload\simple-k-replacer.auto3 +csri\VSFilter.dll