diff --git a/src/htm/htm-xp.csproj b/src/htm/htm-xp.csproj
index 975870b3..84fce8aa 100644
--- a/src/htm/htm-xp.csproj
+++ b/src/htm/htm-xp.csproj
@@ -35,7 +35,7 @@
x86
pdbonly
true
- ..\..\win32\build-xp\Win32\bin\
+ ..\..\..\hexchat-build-xp\Win32\bin\
TRACE
prompt
4
@@ -61,7 +61,7 @@
- ..\..\win32\build-xp\x64\bin\
+ ..\..\..\hexchat-build-xp\x64\bin\
TRACE
true
pdbonly
diff --git a/src/htm/htm.csproj b/src/htm/htm.csproj
index d3bfac39..eea953d2 100644
--- a/src/htm/htm.csproj
+++ b/src/htm/htm.csproj
@@ -35,7 +35,7 @@
x86
pdbonly
true
- ..\..\win32\build\Win32\bin\
+ ..\..\..\hexchat-build\Win32\bin\
TRACE
prompt
4
@@ -61,7 +61,7 @@
- ..\..\win32\build\x64\bin\
+ ..\..\..\hexchat-build\x64\bin\
TRACE
true
pdbonly
diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index 2d94ab14..68a5d827 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -36,7 +36,7 @@
$(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
png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" png_tray_fileoffer "$(SolutionDir)\..\src\pixmaps\tray_fileoffer.png" png_tray_highlight "$(SolutionDir)\..\src\pixmaps\tray_highlight.png" png_tray_message "$(SolutionDir)\..\src\pixmaps\tray_message.png" png_tree_channel "$(SolutionDir)\..\src\pixmaps\tree_channel.png" png_tree_dialog "$(SolutionDir)\..\src\pixmaps\tree_dialog.png" png_tree_server "$(SolutionDir)\..\src\pixmaps\tree_server.png" png_tree_util "$(SolutionDir)\..\src\pixmaps\tree_util.png" png_book "$(SolutionDir)\..\src\pixmaps\book.png" png_hexchat "$(SolutionDir)\..\src\pixmaps\hexchat.png"
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;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib
- $(SolutionDir)build-xp
+ $(SolutionDir)..\..\hexchat-build-xp
$(HexChatBuild)\$(PlatformName)\bin\
$(HexChatBuild)\$(PlatformName)\obj\
$(HexChatBuild)\$(PlatformName)\rel
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 2281c69f..6237cbb9 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -38,7 +38,7 @@
$(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
png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" png_tray_fileoffer "$(SolutionDir)\..\src\pixmaps\tray_fileoffer.png" png_tray_highlight "$(SolutionDir)\..\src\pixmaps\tray_highlight.png" png_tray_message "$(SolutionDir)\..\src\pixmaps\tray_message.png" png_tree_channel "$(SolutionDir)\..\src\pixmaps\tree_channel.png" png_tree_dialog "$(SolutionDir)\..\src\pixmaps\tree_dialog.png" png_tree_server "$(SolutionDir)\..\src\pixmaps\tree_server.png" png_tree_util "$(SolutionDir)\..\src\pixmaps\tree_util.png" png_book "$(SolutionDir)\..\src\pixmaps\book.png" png_hexchat "$(SolutionDir)\..\src\pixmaps\hexchat.png"
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
- $(SolutionDir)build
+ $(SolutionDir)..\..\hexchat-build
$(HexChatBuild)\$(PlatformName)\bin\
$(HexChatBuild)\$(PlatformName)\obj\
$(HexChatBuild)\$(PlatformName)\rel