Fix copying

1 files changed, 25 insertions, 23 deletions

diff --git a/win32/hexchat.props b/win32/hexchat.props
index aa95e48a..5403fc4b 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -46,9 +46,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\atk-1.0.dll" "$(HexChatRel)"

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

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

@@ -60,6 +60,7 @@ copy "$(DepsRoot)\bin\gmodule-2.0.dll" "$(HexChatRel)"
 copy "$(DepsRoot)\bin\gobject-2.0.dll" "$(HexChatRel)

 copy "$(DepsRoot)\bin\gthread-2.0.dll" "$(HexChatRel)"

 copy "$(DepsRoot)\bin\gtk-win32-2.0.dll" "$(HexChatRel)"

+copy "$(DepsRoot)\bin\iconv.dll" "$(HexChatRel)"

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

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

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

@@ -67,8 +68,9 @@ copy "$(DepsRoot)\bin\pango-1.0.dll" "$(HexChatRel)"
 copy "$(DepsRoot)\bin\pangocairo-1.0.dll" "$(HexChatRel)"

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

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

-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatRel)\lib\gtk-2.0\2.10.0\engines"

-xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(HexChatRel)\lib\gtk-2.0\modules\"

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

+::xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatRel)\lib\gtk-2.0\2.10.0\engines"

+::xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(HexChatRel)\lib\gtk-2.0\modules\"

 xcopy /q /s /i etc "$(HexChatRel)\etc"

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

 copy "..\..\COPYING" "$(HexChatRel)"

@@ -94,25 +96,25 @@ 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)\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)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>