Now really finish the reversion

4 files changed, 28 insertions, 24 deletions

diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index e77eb29c..1f2a3c39 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -44,9 +44,9 @@ rmdir /q /s "$(HexChatRel)"
 mkdir "$(HexChatRel)"

 echo 2> portable-mode

 move portable-mode "$(HexChatRel)"

-copy "$(OutDir)\hexchat.exe" "$(HexChatRel)"

-copy "$(OutDir)\hexchat-text.exe" "$(HexChatRel)"

-copy "$(OutDir)\thememan.exe" "$(HexChatRel)"

+copy "$(HexChatBin)hexchat.exe" "$(HexChatRel)"

+copy "$(HexChatBin)hexchat-text.exe" "$(HexChatRel)"

+copy "$(HexChatBin)thememan.exe" "$(HexChatRel)"

 copy "$(DepsRoot)\bin\libatk-1.0-0.dll" "$(HexChatRel)"

 copy "$(DepsRoot)\bin\libcairo-2.dll" "$(HexChatRel)"

 copy "$(DepsRoot)\bin\libexpat-1.dll" "$(HexChatRel)"

@@ -83,26 +83,26 @@ copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatRel)"
 copy "$(DepsRoot)\bin\cert.pem" "$(HexChatRel)"

 copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatRel)"

 xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\"

-xcopy /q /s /i "$(OutDir)hcchecksum.dll" "$(HexChatRel)\plugins\"

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

-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"

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

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

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

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

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

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

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

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

+xcopy /q /s /i "$(HexChatBin)hcchecksum.dll" "$(HexChatRel)\plugins\"

+copy "$(HexChatBin)hcdns.dll" "$(HexChatRel)\plugins"

+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 "$(HexChatBin)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"

+copy "$(HexChatBin)hcpython.dll" "$(HexChatRel)\plugins"

+copy "$(HexChatBin)hctcl.dll" "$(HexChatRel)\plugins"

+copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins"

+copy "$(HexChatBin)hcsasl.dll" "$(HexChatRel)\plugins"

+copy "$(HexChatBin)hextray.dll" "$(HexChatRel)\plugins"

+copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins"

+copy "$(HexChatBin)hcwinsys.dll" "$(HexChatRel)\plugins"

+copy "$(HexChatBin)hcwmpa.dll" "$(HexChatRel)\plugins"

 copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)"

-xcopy /q /s /i "$(OutDir)\locale" "$(HexChatRel)\locale"

+xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\locale"

 xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale"

 copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(HexChatRel)"

 	</HexChatCopy>

diff --git a/win32/hexchat-xp.sln b/win32/hexchat-xp.sln
index d48742e2..aa12cbcf 100644
--- a/win32/hexchat-xp.sln
+++ b/win32/hexchat-xp.sln
@@ -70,6 +70,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exec", "..\plugins\exec\exe
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fishlim", "..\plugins\fishlim\fishlim-xp.vcxproj", "{3C4F42FC-292A-420B-B63D-C03DFBDD8E4E}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpcinfo", "..\plugins\mpcinfo\mpcinfo-xp.vcxproj", "{B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC}"

+EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upd", "..\plugins\upd\upd-xp.vcxproj", "{461DC24A-A410-4171-8C02-CCDBF3702C2A}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winamp", "..\plugins\winamp\winamp-xp.vcxproj", "{E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE}"

diff --git a/win32/hexchat.props b/win32/hexchat.props
index e9dd136a..890dfd01 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -102,7 +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)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"

@@ -113,7 +113,7 @@ copy "$(HexChatBin)hcsasl.dll" "$(HexChatRel)\plugins"
 copy "$(HexChatBin)hextray.dll" "$(HexChatRel)\plugins"

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

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

-::copy "$(HexChatBin)hcwmpa.dll" "$(HexChatRel)\plugins"

+copy "$(HexChatBin)hcwmpa.dll" "$(HexChatRel)\plugins"

 copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)"

 xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\locale"

 xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale"

diff --git a/win32/hexchat.sln b/win32/hexchat.sln
index 3eefc243..cb869353 100644
--- a/win32/hexchat.sln
+++ b/win32/hexchat.sln
@@ -70,6 +70,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exec", "..\plugins\exec\exe
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fishlim", "..\plugins\fishlim\fishlim.vcxproj", "{3C4F42FC-292A-420B-B63D-C03DFBDD8E4E}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpcinfo", "..\plugins\mpcinfo\mpcinfo.vcxproj", "{B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC}"

+EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upd", "..\plugins\upd\upd.vcxproj", "{461DC24A-A410-4171-8C02-CCDBF3702C2A}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winamp", "..\plugins\winamp\winamp.vcxproj", "{E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE}"