Complete the VS2010 reversion

6 files changed, 14 insertions, 16 deletions

diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index 9fa5baf6..e77eb29c 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -89,6 +89,7 @@ copy "$(OutDir)\hcdoat.dll" "$(HexChatRel)\plugins"
 copy "$(OutDir)\hcexec.dll" "$(HexChatRel)\plugins"

 copy "$(OutDir)\hcfishlim.dll" "$(HexChatRel)\plugins"

 copy "$(OutDir)\hclua.dll" "$(HexChatRel)\plugins"

+copy "$(OutDir)\hcmpcinfo.dll" "$(HexChatRel)\plugins"

 copy "$(OutDir)\hcperl-512.dll" "$(HexChatRel)\plugins"

 copy "$(OutDir)\hcperl-514.dll" "$(HexChatRel)\plugins"

 copy "$(OutDir)\hcperl-516.dll" "$(HexChatRel)\plugins"

diff --git a/win32/hexchat.props b/win32/hexchat.props
index 5403fc4b..e9dd136a 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -102,6 +102,7 @@ copy "$(HexChatBin)hcdoat.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hcexec.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcfishlim.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hclua.dll" "$(HexChatRel)\plugins"

+copy "$(OutDir)\hcmpcinfo.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcperl-512.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcperl-514.dll" "$(HexChatRel)\plugins"

 copy "$(HexChatBin)hcperl-516.dll" "$(HexChatRel)\plugins"

diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index 4089c925..5d5a07d2 100644
--- a/win32/installer/hexchat-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -42,7 +42,7 @@ Name: "plugins\doat"; Description: "Do At"; Types: custom; Flags: disablenounins
 Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning

-;Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

+Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

 ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning

@@ -165,9 +165,8 @@ Source: "plugins\hcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat

 Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec

 Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim

-Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp

-; or plugins\mpcinfo

-;Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo

+Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo

+Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo

 ;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp

 Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd

 Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd

diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss
index 30eb912c..8c660c18 100644
--- a/win32/installer/hexchat-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -41,7 +41,7 @@ Name: "plugins\doat"; Description: "Do At"; Types: custom; Flags: disablenounins
 Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning

-;Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

+Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

 ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning

@@ -166,9 +166,8 @@ Source: "plugins\hcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat

 Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec

 Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim

-Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp

-; or plugins\mpcinfo

-;Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo

+Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo

+Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo

 ;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp

 Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd

 Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd

diff --git a/win32/installer/hexchat-xp-x64.skel.iss b/win32/installer/hexchat-xp-x64.skel.iss
index 4089c925..5d5a07d2 100644
--- a/win32/installer/hexchat-xp-x64.skel.iss
+++ b/win32/installer/hexchat-xp-x64.skel.iss
@@ -42,7 +42,7 @@ Name: "plugins\doat"; Description: "Do At"; Types: custom; Flags: disablenounins
 Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning

-;Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

+Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

 ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning

@@ -165,9 +165,8 @@ Source: "plugins\hcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat

 Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec

 Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim

-Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp

-; or plugins\mpcinfo

-;Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo

+Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo

+Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo

 ;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp

 Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd

 Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd

diff --git a/win32/installer/hexchat-xp-x86.skel.iss b/win32/installer/hexchat-xp-x86.skel.iss
index 30eb912c..8c660c18 100644
--- a/win32/installer/hexchat-xp-x86.skel.iss
+++ b/win32/installer/hexchat-xp-x86.skel.iss
@@ -41,7 +41,7 @@ Name: "plugins\doat"; Description: "Do At"; Types: custom; Flags: disablenounins
 Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning

-;Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

+Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning

 ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning

 Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning

@@ -166,9 +166,8 @@ Source: "plugins\hcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com
 Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat

 Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec

 Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim

-Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp

-; or plugins\mpcinfo

-;Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo

+Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo

+Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo

 ;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp

 Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd

 Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd