Remove hardcoding as much as possible

8 files changed, 104 insertions, 98 deletions

diff --git a/win32/copy/copy-xp.vcxproj b/win32/copy/copy-xp.vcxproj
index 77f97838..745291c9 100644
--- a/win32/copy/copy-xp.vcxproj
+++ b/win32/copy/copy-xp.vcxproj
@@ -42,12 +42,12 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index 6f4894af..f382e311 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -42,12 +42,12 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index 70f4616e..f7a08e2f 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -35,7 +35,10 @@
     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>

     <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>

     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>

-    <HexChatDest>$(SolutionDir)build-xp\$(PlatformName)\rel</HexChatDest>

+    <HexChatBuild>$(SolutionDir)build-xp</HexChatBuild>

+    <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>

+    <HexChatObj>$(HexChatBuild)\$(PlatformName)\obj\</HexChatObj>

+    <HexChatRel>$(HexChatBuild)\$(PlatformName)\rel</HexChatRel>

   </PropertyGroup>

   <ItemDefinitionGroup />

   <ItemGroup />

diff --git a/win32/hexchat.props b/win32/hexchat.props
index a10d5951..39c017d5 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -35,81 +35,84 @@
     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>

     <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>

     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>

-    <HexChatDest>$(SolutionDir)build\$(PlatformName)\rel</HexChatDest>

+    <HexChatBuild>$(SolutionDir)build-xp</HexChatBuild>

+    <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>

+    <HexChatObj>$(HexChatBuild)\$(PlatformName)\obj\</HexChatObj>

+    <HexChatRel>$(HexChatBuild)\$(PlatformName)\rel</HexChatRel>

 	<HexChatCopy>

-rmdir /q /s "$(HexChatDest)"

-mkdir "$(HexChatDest)"

+rmdir /q /s "$(HexChatRel)"

+mkdir "$(HexChatRel)"

 echo 2&gt; portable-mode

-move portable-mode "$(HexChatDest)"

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

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

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

-copy "$(DepsRoot)\bin\atk-1.0.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\cairo.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\fontconfig.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\gdk_pixbuf-2.0.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\gdk-win32-2.0.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\gio-2.0.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\glib-2.0.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\gmodule-2.0.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\gobject-2.0.dll" "$(HexChatDest)

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

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

-copy "$(DepsRoot)\bin\libintl.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\libpng15.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\pango-1.0.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\pangocairo-1.0.dll" "$(HexChatDest)"

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

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

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

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

-xcopy /q /s /i etc "$(HexChatDest)\etc"

-xcopy /q /s /i share "$(HexChatDest)\share"

-copy "..\..\COPYING" "$(HexChatDest)"

-copy "$(DepsRoot)\LICENSE.ATK" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.CAIRO" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.ENCHANT" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.FONTCONFIG" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.FREETYPE" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.GDKPIXBUF" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.GETTEXT" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.GLIB" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.GTK" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.LIBFFI" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.LIBPNG" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.LIBXML2" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.OPENSSL" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.PANGO" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.PIXMAN" "$(HexChatDest)\share"

-copy "$(DepsRoot)\LICENSE.ZLIB" "$(HexChatDest)\share"

-copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\cert.pem" "$(HexChatDest)"

-copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatDest)"

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

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

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

-copy "$(OutDir)\hcdoat.dll" "$(HexChatDest)\plugins"

-copy "$(OutDir)\hcexec.dll" "$(HexChatDest)\plugins"

-copy "$(OutDir)\hcfishlim.dll" "$(HexChatDest)\plugins"

-copy "$(OutDir)\hclua.dll" "$(HexChatDest)\plugins"

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

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

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

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

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

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

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

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

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

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

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

-copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatDest)"

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

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

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

+move portable-mode "$(HexChatRel)"

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

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

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

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

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

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

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

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

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

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

+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\libintl.dll" "$(HexChatRel)"

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

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

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

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

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

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

+copy "$(DepsRoot)\LICENSE.ATK" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.CAIRO" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.ENCHANT" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.FONTCONFIG" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.FREETYPE" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.GDKPIXBUF" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.GETTEXT" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.GLIB" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.GTK" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.LIBFFI" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.LIBPNG" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.LIBXML2" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.OPENSSL" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.PANGO" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.PIXMAN" "$(HexChatRel)\share"

+copy "$(DepsRoot)\LICENSE.ZLIB" "$(HexChatRel)\share"

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

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

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

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

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

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

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

 	</HexChatCopy>

   </PropertyGroup>

   <ItemDefinitionGroup />

diff --git a/win32/installer/installer-xp.vcxproj b/win32/installer/installer-xp.vcxproj
index be31a153..a9adfbe5 100644
--- a/win32/installer/installer-xp.vcxproj
+++ b/win32/installer/installer-xp.vcxproj
@@ -42,12 +42,12 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj
index 788e47a4..34db26b9 100644
--- a/win32/installer/installer.vcxproj
+++ b/win32/installer/installer.vcxproj
@@ -42,12 +42,12 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

diff --git a/win32/nls/nls-xp.vcxproj b/win32/nls/nls-xp.vcxproj
index 1212b5d7..cf366fed 100644
--- a/win32/nls/nls-xp.vcxproj
+++ b/win32/nls/nls-xp.vcxproj
@@ -42,12 +42,12 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj
index c3fbba36..521510a7 100644
--- a/win32/nls/nls.vcxproj
+++ b/win32/nls/nls.vcxproj
@@ -42,12 +42,12 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>

-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>

+    <OutDir>$(HexChatBin)</OutDir>

+    <IntDir>$(SolutionDir)build\$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>