Better project files.

- Output directly to rel\ instead of to bin\ and then copying files over.
- Deduped Win32 vs x64 configs
- Moved some common properties to hexchat.props
- All build intermediates (except htm's intermediates) are no longer emitted in the source directory

6 files changed, 106 insertions, 288 deletions

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index d0c1150b..a0c0a39d 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup Label="Configuration">

     <PlatformToolset>v120</PlatformToolset>

+    <ConfigurationType>Application</ConfigurationType>

   </PropertyGroup>

   <ItemGroup Label="ProjectConfigurations">

     <ProjectConfiguration Include="Release|Win32">

@@ -18,73 +19,63 @@
     <RootNamespace>copy</RootNamespace>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

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

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

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

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\hexchat.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\hexchat.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

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

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

-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>

-  </PropertyGroup>

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

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

-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>

-  </PropertyGroup>

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

-    <ClCompile>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-    <PreBuildEvent>

-      <Command>$(HexChatCopy)</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-    <PreBuildEvent>

-      <Command>$(HexChatCopy)</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

+  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  <Import Project="..\hexchat.props" />

   <ItemGroup>

+    <None Include="$(DepsRoot)\bin\cert.pem" />

+    <None Include="$(DepsRoot)\bin\atk-1.0.dll" />

+    <None Include="$(DepsRoot)\bin\cairo.dll" />

+    <None Include="$(DepsRoot)\bin\fontconfig.dll" />

+    <None Include="$(DepsRoot)\bin\gdk_pixbuf-2.0.dll" />

+    <None Include="$(DepsRoot)\bin\gdk-win32-2.0.dll" />

+    <None Include="$(DepsRoot)\bin\gio-2.0.dll" />

+    <None Include="$(DepsRoot)\bin\glib-2.0.dll" />

+    <None Include="$(DepsRoot)\bin\gmodule-2.0.dll" />

+    <None Include="$(DepsRoot)\bin\gobject-2.0.dll" />

+    <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper.exe" />

+    <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper-console.exe" />

+    <None Include="$(DepsRoot)\bin\gthread-2.0.dll" />

+    <None Include="$(DepsRoot)\bin\gtk-win32-2.0.dll" />

+    <None Include="$(DepsRoot)\bin\harfbuzz.dll" />

+    <None Include="$(DepsRoot)\bin\iconv.dll" />

+    <None Include="$(DepsRoot)\bin\libeay32.dll" />

+    <None Include="$(DepsRoot)\bin\libenchant.dll" />

+    <None Include="$(DepsRoot)\bin\libintl.dll" />

+    <None Include="$(DepsRoot)\bin\libpng16.dll" />

+    <None Include="$(DepsRoot)\bin\libxml2.dll" />

+    <None Include="$(DepsRoot)\bin\pango-1.0.dll" />

+    <None Include="$(DepsRoot)\bin\pangocairo-1.0.dll" />

+    <None Include="$(DepsRoot)\bin\pangoft2-1.0.dll" />

+    <None Include="$(DepsRoot)\bin\pangowin32-1.0.dll" />

+    <None Include="$(DepsRoot)\bin\pixman-1.dll" />

+    <None Include="$(DepsRoot)\bin\ssleay32.dll" />

+    <None Include="$(DepsRoot)\bin\zlib1.dll" />

+    <None Include="$(HexChatBin)thememan.exe" />

     <None Include="changelog.url" />

     <None Include="readme.url" />

-    <None Include="share\xml\iso-codes\iso_3166.xml" />

-    <None Include="share\xml\iso-codes\iso_639.xml" />

+

+    <Engines Include="$(DepsRoot)\lib\gtk-2.0\i686-pc-vs10\engines\**\*" />

+

+    <Share Include="share\**\*" />

+

+    <DepsRootDocs Include="$(DepsRoot)\share\doc\**\*" />

+

+    <Locale Include="$(HexChatBin)locale\**\*;$(DepsRoot)\share\locale\**\*" />

+

+    <MSWindowsTheme Include="$(DepsRoot)\share\themes\MS-Windows\**\*" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
+  <Target Name="Build">

+    <Copy SourceFiles="@(None)" DestinationFolder="$(HexChatRel)" />

+    <Copy SourceFiles="@(Engines)" DestinationFiles="@(Engines->'$(HexChatRel)\lib\gtk-2.0\i686-pc-vs10\engines\%(RecursiveDir)%(Filename)%(Extension)')" />

+    <Copy SourceFiles="@(Share)" DestinationFiles="@(Share->'$(HexChatRel)\share\%(RecursiveDir)%(Filename)%(Extension)')" />

+    <Copy SourceFiles="@(DepsRootDocs)" DestinationFiles="@(DepsRootDocs->'$(HexChatRel)\share\doc\%(RecursiveDir)%(Filename)%(Extension)')" />

+    <Copy SourceFiles="..\..\COPYING" DestinationFolder="$(HexChatRel)\share\doc\hexchat" />

+    <Copy SourceFiles="$(DepsRoot)\lib\enchant\libenchant_myspell.dll" DestinationFolder="$(HexChatRel)\lib\enchant" />

+    <Copy SourceFiles="@(Locale)" DestinationFiles="@(Locale->'$(HexChatRel)\share\locale\%(RecursiveDir)%(Filename)%(Extension)')" />

+    <Copy SourceFiles="@(MSWindowsTheme)" DestinationFiles="@(MSWindowsTheme->'$(HexChatRel)\share\themes\MS-Windows\%(RecursiveDir)%(Filename)%(Extension)')" />

+

+    <WriteLinesToFile File="$(HexChatRel)portable-mode" Lines="2" Overwrite="true" />

+  </Target>

+</Project>

diff --git a/win32/copy/copy.vcxproj.filters b/win32/copy/copy.vcxproj.filters
index af2be024..695b5c78 100644
--- a/win32/copy/copy.vcxproj.filters
+++ b/win32/copy/copy.vcxproj.filters
@@ -1,52 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{e02a8c67-767c-4c6e-a854-81fae08cf4da}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Resource Files\etc">

-      <UniqueIdentifier>{503881c0-011d-443b-a373-4bfe125dcfa6}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Resource Files\share">

-      <UniqueIdentifier>{4316433a-2a8e-48f7-9020-e1f4de0d23d1}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Resource Files\etc\gtk-2.0">

-      <UniqueIdentifier>{832ebebc-ab71-4bf6-9f3a-02ec748f7c14}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Resource Files\share\xml">

-      <UniqueIdentifier>{9a881586-aed2-4f80-ba84-e521e6785566}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Resource Files\share\xml\iso-codes">

-      <UniqueIdentifier>{c825f724-0618-4160-97b7-12d6e0f2bc7b}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="etc\download.png">

-      <Filter>Resource Files\etc</Filter>

-    </None>

-    <None Include="etc\gtkpref.png">

-      <Filter>Resource Files\etc</Filter>

-    </None>

-    <None Include="etc\music.png">

-      <Filter>Resource Files\etc</Filter>

-    </None>

-    <None Include="etc\system.png">

-      <Filter>Resource Files\etc</Filter>

-    </None>

-    <None Include="etc\gtk-2.0\gtkrc">

-      <Filter>Resource Files\etc\gtk-2.0</Filter>

-    </None>

-    <None Include="share\xml\iso-codes\iso_639.xml">

-      <Filter>Resource Files\share\xml\iso-codes</Filter>

-    </None>

-    <None Include="share\xml\iso-codes\iso_3166.xml">

-      <Filter>Resource Files\share\xml\iso-codes</Filter>

-    </None>

-    <None Include="readme.url">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="changelog.url">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 32588334..8d0a71c6 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-	<ImportGroup Label="PropertySheets" />

-

 	<PropertyGroup Label="UserMacros">

 

 		<!-- SPECIFY YOUR DEPENDENCY DIRECTORIES HERE -->

@@ -23,7 +21,6 @@
 		<MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath>

 		<PerlPath>$(YourPerlPath)\$(PlatformName)</PerlPath>

 		<PerlLib>perl520</PerlLib>

-		<PerlOutput>hcperl</PerlOutput>

 		<Python2Path>$(YourPython2Path)\$(PlatformName)</Python2Path>

 		<Python2Lib>python27</Python2Lib>

 		<Python2Output>hcpython2</Python2Output>

@@ -37,83 +34,48 @@
 		<HexChatBuild>$(SolutionDir)..\..\hexchat-build</HexChatBuild>

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

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

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

-		<HexChatCopy>

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

-mkdir "$(HexChatRel)"

-echo 2&gt; portable-mode

-move portable-mode "$(HexChatRel)"

-copy changelog.url "$(HexChatRel)"

-copy readme.url "$(HexChatRel)"

-copy "$(DepsRoot)\bin\cert.pem" "$(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)"

-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\gspawn-win$(PlatformArchitecture)-helper.exe" "$(HexChatRel)"

-copy "$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper-console.exe" "$(HexChatRel)"

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

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

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

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

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

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

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

-copy "$(DepsRoot)\bin\libpng16.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)"

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

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

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

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

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

-xcopy /q /s /i "..\..\COPYING" "$(HexChatRel)\share\doc\hexchat\"

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

-xcopy /q /s /i "$(DepsRoot)\share\themes\MS-Windows" "$(HexChatRel)\share\themes\MS-Windows"

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

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

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

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

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

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

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

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

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

-copy "$(HexChatBin)hcnotifications-winrt.dll" "$(HexChatRel)\plugins"

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

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

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

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

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

-		</HexChatCopy>

-		<IsccPath Condition="'$(Platform)'=='Win32'">"%PROGRAMFILES%\Inno Setup 5\iscc.exe"</IsccPath>

-		<IsccPath Condition="'$(Platform)'=='x64'">"%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe"</IsccPath>

+		<HexChatLib>$(HexChatBuild)\$(PlatformName)\lib\</HexChatLib>

+		<HexChatPdb>$(HexChatBuild)\$(PlatformName)\pdb\</HexChatPdb>

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

+		<IsccPath>"$(MSBuildExtensionsPath32)\..\Inno Setup 5\iscc.exe"</IsccPath>

+	</PropertyGroup>

+

+	<PropertyGroup>

+		<LinkIncremental>false</LinkIncremental>

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

+		<UseDebugLibraries>false</UseDebugLibraries>

+		<WholeProgramOptimization>true</WholeProgramOptimization>

+		<CharacterSet>MultiByte</CharacterSet>

 	</PropertyGroup>

 

 	<ItemDefinitionGroup>

 		<ClCompile>

 			<WarningLevel>Level3</WarningLevel>

+			<PrecompiledHeader>NotUsing</PrecompiledHeader>

 			<DisableSpecificWarnings>4996</DisableSpecificWarnings>

-			<AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions> 

-			<WholeProgramOptimization>false</WholeProgramOptimization>

+			<AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>

+			<WholeProgramOptimization>true</WholeProgramOptimization>

 			<!-- UNCOMMENT ONLY ONE -->

 			<!--Optimization>Disabled</Optimization-->

 			<Optimization>MaxSpeed</Optimization>

 			<!--Optimization>MinSpace</Optimization-->

 			<!--Optimization>Full</Optimization-->

-			<AdditionalIncludeDirectories>$(SolutionDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+			<FunctionLevelLinking>true</FunctionLevelLinking>

+			<IntrinsicFunctions>true</IntrinsicFunctions>

+			<MultiProcessorCompilation>true</MultiProcessorCompilation>

 		</ClCompile>

+		<Lib>

+			<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>

+		</Lib>

+		<Link>

+			<ImportLibrary>$(HexChatLib)$(TargetName).lib</ImportLibrary>

+			<ProgramDatabaseFile>$(HexChatPdb)$(TargetName).pdb</ProgramDatabaseFile>

+			<SubSystem>Windows</SubSystem>

+			<GenerateDebugInformation>true</GenerateDebugInformation>

+			<EnableCOMDATFolding>true</EnableCOMDATFolding>

+			<OptimizeReferences>true</OptimizeReferences>

+			<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+		</Link>

 	</ItemDefinitionGroup>

 

 	<ItemGroup />

diff --git a/win32/hexchat.sln b/win32/hexchat.sln
index 0321261d..3cc4d918 100644
--- a/win32/hexchat.sln
+++ b/win32/hexchat.sln
@@ -78,6 +78,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nls", "nls\nls.vcxproj", "{
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj", "{C9B735E4-75BC-45AC-A5E3-39A6D076F912}"

 	ProjectSection(ProjectDependencies) = postProject

+		{B10A2C41-344C-43E0-A32D-B9587C198D8B} = {B10A2C41-344C-43E0-A32D-B9587C198D8B}

+		{DE87FFCA-9606-4116-B747-062D88A56A28} = {DE87FFCA-9606-4116-B747-062D88A56A28}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcxproj", "{5A0F4962-E670-4DA2-9E45-52CC47F26E2F}"

+	ProjectSection(ProjectDependencies) = postProject

 		{C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {C2321A03-0BA7-45B3-8740-ABD82B36B0BF}

 		{19C52A0A-A790-409E-A28A-9745FF990F5C} = {19C52A0A-A790-409E-A28A-9745FF990F5C}

 		{4980AF24-9D42-427D-A8E6-0DF3B97C455D} = {4980AF24-9D42-427D-A8E6-0DF3B97C455D}

@@ -85,7 +91,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj",
 		{B10A2C41-344C-43E0-A32D-B9587C198D8B} = {B10A2C41-344C-43E0-A32D-B9587C198D8B}

 		{461DC24A-A410-4171-8C02-CCDBF3702C2A} = {461DC24A-A410-4171-8C02-CCDBF3702C2A}

 		{E93E1255-95D1-4B08-8FDF-B53CC6A21280} = {E93E1255-95D1-4B08-8FDF-B53CC6A21280}

-		{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}

+		{A7D7CE59-2A31-48AE-BED2-A9828E241832} = {A7D7CE59-2A31-48AE-BED2-A9828E241832}

 		{5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} = {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91}

 		{6C0CA980-97C5-427A-BE61-5BCECAFABBDA} = {6C0CA980-97C5-427A-BE61-5BCECAFABBDA}

 		{B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC} = {B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC}

@@ -94,13 +100,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj",
 		{DE87FFCA-9606-4116-B747-062D88A56A28} = {DE87FFCA-9606-4116-B747-062D88A56A28}

 		{C53145CC-D021-40C9-B97C-0249AB9A43C9} = {C53145CC-D021-40C9-B97C-0249AB9A43C9}

 		{D90BC3E3-1341-4849-9354-5F40489D39D1} = {D90BC3E3-1341-4849-9354-5F40489D39D1}

-		{3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} = {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcxproj", "{5A0F4962-E670-4DA2-9E45-52CC47F26E2F}"

-	ProjectSection(ProjectDependencies) = postProject

-		{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}

 		{C9B735E4-75BC-45AC-A5E3-39A6D076F912} = {C9B735E4-75BC-45AC-A5E3-39A6D076F912}

+		{3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} = {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E}

 	EndProjectSection

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "htm", "..\src\htm\htm.csproj", "{DE87FFCA-9606-4116-B747-062D88A56A28}"

diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj
index a3d546c9..713411a5 100644
--- a/win32/installer/installer.vcxproj
+++ b/win32/installer/installer.vcxproj
@@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup Label="Configuration">

     <PlatformToolset>v120</PlatformToolset>

+    <ConfigurationType>Application</ConfigurationType>

   </PropertyGroup>

   <ItemGroup Label="ProjectConfigurations">

     <ProjectConfiguration Include="Release|Win32">

@@ -18,42 +19,14 @@
     <RootNamespace>installer</RootNamespace>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

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

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

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

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\hexchat.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\hexchat.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

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

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

-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>

-  </PropertyGroup>

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

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

-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>

+  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  <Import Project="..\hexchat.props" />

+  <PropertyGroup>

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

   </PropertyGroup>

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

     <ClCompile>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -64,10 +37,8 @@
       <Command>

       <![CDATA[

 SET SOLUTIONDIR=$(SolutionDir)..\

-powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\installer\hexchat.iss.tt" "$(SolutionDir)..\win32\installer\hexchat.iss"

-del "$(OutDir)hexchat.iss"

-type hexchat.iss >> "$(OutDir)hexchat.iss"

-$(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexchat.iss"

+powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\installer\hexchat.iss.tt" "$(HexChatBin)hexchat.iss"

+$(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(HexChatBin)hexchat.iss"

       ]]>

       </Command>

     </PreBuildEvent>

@@ -78,6 +49,4 @@ $(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexch
     <None Include="hexchat.iss" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

 </Project>

diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj
index 928fb225..36977f3c 100644
--- a/win32/nls/nls.vcxproj
+++ b/win32/nls/nls.vcxproj
@@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup Label="Configuration">

     <PlatformToolset>v120</PlatformToolset>

+    <ConfigurationType>Application</ConfigurationType>

   </PropertyGroup>

   <ItemGroup Label="ProjectConfigurations">

     <ProjectConfiguration Include="Release|Win32">

@@ -18,68 +19,13 @@
     <RootNamespace>nls</RootNamespace>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

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

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

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

-    <ConfigurationType>Application</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\hexchat.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\hexchat.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

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

+  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  <Import Project="..\hexchat.props" />

+  <PropertyGroup>

     <OutDir>$(HexChatBin)</OutDir>

-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>

   </PropertyGroup>

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

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

-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>

-  </PropertyGroup>

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

-    <ClCompile>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

-    <PreBuildEvent>

-      <Command>cd ..\..\po

-rmdir /q /s "$(OutDir)\locale"

-mkdir "$(OutDir)\locale"

-for %%A in (*.po) do (

-mkdir "$(OutDir)\locale\%%~nA\LC_MESSAGES"

-"$(MsgfmtPath)\msgfmt" -co "$(OutDir)\locale\%%~nA\LC_MESSAGES\hexchat.mo" %%A

-)</Command>

-    </PreBuildEvent>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-    </ClCompile>

-    <Link>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-    </Link>

+  <ItemDefinitionGroup>

     <PreBuildEvent>

       <Command>cd ..\..\po

 rmdir /q /s "$(OutDir)\locale"

@@ -93,6 +39,4 @@ mkdir "$(OutDir)\locale\%%~nA\LC_MESSAGES"
   <ItemGroup>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
+</Project>