diff options
55 files changed, 292 insertions, 286 deletions
diff --git a/plugins/checksum/checksum-xp.vcxproj b/plugins/checksum/checksum-xp.vcxproj index 68c50e6c..da55d023 100644 --- a/plugins/checksum/checksum-xp.vcxproj +++ b/plugins/checksum/checksum-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcchecksum</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcchecksum</TargetName> - <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/plugins/checksum/checksum.vcxproj b/plugins/checksum/checksum.vcxproj index fe6a484d..8e7e536e 100644 --- a/plugins/checksum/checksum.vcxproj +++ b/plugins/checksum/checksum.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcchecksum</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcchecksum</TargetName> - <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/plugins/dns/dns-xp.vcxproj b/plugins/dns/dns-xp.vcxproj index 58552712..ac71dc5d 100644 --- a/plugins/dns/dns-xp.vcxproj +++ b/plugins/dns/dns-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcdns</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcdns</TargetName> - <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/plugins/dns/dns.vcxproj b/plugins/dns/dns.vcxproj index 2333fcb4..754f42d2 100644 --- a/plugins/dns/dns.vcxproj +++ b/plugins/dns/dns.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcdns</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcdns</TargetName> - <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/plugins/doat/doat-xp.vcxproj b/plugins/doat/doat-xp.vcxproj index 9a317d2a..c8b8ab16 100644 --- a/plugins/doat/doat-xp.vcxproj +++ b/plugins/doat/doat-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcdoat</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcdoat</TargetName> - <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/plugins/doat/doat.vcxproj b/plugins/doat/doat.vcxproj index 48e1d798..e254172a 100644 --- a/plugins/doat/doat.vcxproj +++ b/plugins/doat/doat.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcdoat</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcdoat</TargetName> - <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/plugins/exec/exec-xp.vcxproj b/plugins/exec/exec-xp.vcxproj index 3d7d8ea6..a1c4ec8f 100644 --- a/plugins/exec/exec-xp.vcxproj +++ b/plugins/exec/exec-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcexec</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcexec</TargetName> - <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/plugins/exec/exec.vcxproj b/plugins/exec/exec.vcxproj index e26b1c54..ae88a968 100644 --- a/plugins/exec/exec.vcxproj +++ b/plugins/exec/exec.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcexec</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcexec</TargetName> - <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/plugins/fishlim/fishlim-xp.vcxproj b/plugins/fishlim/fishlim-xp.vcxproj index a6985219..a640ed94 100644 --- a/plugins/fishlim/fishlim-xp.vcxproj +++ b/plugins/fishlim/fishlim-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcfishlim</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcfishlim</TargetName> - <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/plugins/fishlim/fishlim.vcxproj b/plugins/fishlim/fishlim.vcxproj index c42cf99f..f57608ec 100644 --- a/plugins/fishlim/fishlim.vcxproj +++ b/plugins/fishlim/fishlim.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcfishlim</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcfishlim</TargetName> - <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/plugins/hextray/hextray-xp.vcxproj b/plugins/hextray/hextray-xp.vcxproj index dbf4f2cf..5024a20a 100644 --- a/plugins/hextray/hextray-xp.vcxproj +++ b/plugins/hextray/hextray-xp.vcxproj @@ -44,13 +44,13 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <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'"> <LinkIncremental>false</LinkIncremental> - <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/plugins/hextray/hextray.vcxproj b/plugins/hextray/hextray.vcxproj index 9c3f7366..765e5124 100644 --- a/plugins/hextray/hextray.vcxproj +++ b/plugins/hextray/hextray.vcxproj @@ -44,13 +44,13 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <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'"> <LinkIncremental>false</LinkIncremental> - <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/plugins/lua/lua-xp.vcxproj b/plugins/lua/lua-xp.vcxproj index 361baeac..43b987ad 100644 --- a/plugins/lua/lua-xp.vcxproj +++ b/plugins/lua/lua-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(LuaOutput)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(LuaOutput)</TargetName> - <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/plugins/lua/lua.vcxproj b/plugins/lua/lua.vcxproj index ae891901..9500bbea 100644 --- a/plugins/lua/lua.vcxproj +++ b/plugins/lua/lua.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(LuaOutput)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(LuaOutput)</TargetName> - <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/plugins/mpcinfo/mpcinfo.vcxproj b/plugins/mpcinfo/mpcinfo.vcxproj index 25a131a6..bd56301a 100644 --- a/plugins/mpcinfo/mpcinfo.vcxproj +++ b/plugins/mpcinfo/mpcinfo.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcmpcinfo</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcmpcinfo</TargetName> - <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/plugins/perl/perl-512-xp.vcxproj b/plugins/perl/perl-512-xp.vcxproj index 79557fe4..78781ab1 100644 --- a/plugins/perl/perl-512-xp.vcxproj +++ b/plugins/perl/perl-512-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl512Output)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl512Output)</TargetName> - <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/plugins/perl/perl-512.vcxproj b/plugins/perl/perl-512.vcxproj index b1ccdb82..43bd6a34 100644 --- a/plugins/perl/perl-512.vcxproj +++ b/plugins/perl/perl-512.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl512Output)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl512Output)</TargetName> - <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/plugins/perl/perl-514-xp.vcxproj b/plugins/perl/perl-514-xp.vcxproj index 6d8e0dbc..9ba45a5a 100644 --- a/plugins/perl/perl-514-xp.vcxproj +++ b/plugins/perl/perl-514-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl514Output)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl514Output)</TargetName> - <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/plugins/perl/perl-514.vcxproj b/plugins/perl/perl-514.vcxproj index d0e893bc..b6e5cbe7 100644 --- a/plugins/perl/perl-514.vcxproj +++ b/plugins/perl/perl-514.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl514Output)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl514Output)</TargetName> - <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/plugins/perl/perl-516-xp.vcxproj b/plugins/perl/perl-516-xp.vcxproj index 1e67fd8b..5870c360 100644 --- a/plugins/perl/perl-516-xp.vcxproj +++ b/plugins/perl/perl-516-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl516Output)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl516Output)</TargetName> - <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/plugins/perl/perl-516.vcxproj b/plugins/perl/perl-516.vcxproj index d172adbb..418b0820 100644 --- a/plugins/perl/perl-516.vcxproj +++ b/plugins/perl/perl-516.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl516Output)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(Perl516Output)</TargetName> - <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/plugins/python/python-xp.vcxproj b/plugins/python/python-xp.vcxproj index 1363d31b..29b89f6e 100644 --- a/plugins/python/python-xp.vcxproj +++ b/plugins/python/python-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(PythonOutput)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(PythonOutput)</TargetName> - <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/plugins/python/python.vcxproj b/plugins/python/python.vcxproj index e56af577..971653ce 100644 --- a/plugins/python/python.vcxproj +++ b/plugins/python/python.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(PythonOutput)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(PythonOutput)</TargetName> - <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/plugins/sasl/sasl-xp.vcxproj b/plugins/sasl/sasl-xp.vcxproj index 0659d69f..e63379e3 100644 --- a/plugins/sasl/sasl-xp.vcxproj +++ b/plugins/sasl/sasl-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcsasl</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcsasl</TargetName> - <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/plugins/sasl/sasl.vcxproj b/plugins/sasl/sasl.vcxproj index 3bdee159..830dbb65 100644 --- a/plugins/sasl/sasl.vcxproj +++ b/plugins/sasl/sasl.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcsasl</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcsasl</TargetName> - <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/plugins/tcl/tcl-xp.vcxproj b/plugins/tcl/tcl-xp.vcxproj index 08d55b2c..fcc27398 100644 --- a/plugins/tcl/tcl-xp.vcxproj +++ b/plugins/tcl/tcl-xp.vcxproj @@ -55,14 +55,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(TclOutput)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(TclOutput)</TargetName> - <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/plugins/tcl/tcl.vcxproj b/plugins/tcl/tcl.vcxproj index 1bfdd972..6bc9c52c 100644 --- a/plugins/tcl/tcl.vcxproj +++ b/plugins/tcl/tcl.vcxproj @@ -55,14 +55,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(TclOutput)</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>$(TclOutput)</TargetName> - <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/plugins/upd/upd-xp.vcxproj b/plugins/upd/upd-xp.vcxproj index b602f9f4..1cfe1f52 100644 --- a/plugins/upd/upd-xp.vcxproj +++ b/plugins/upd/upd-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcupd</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcupd</TargetName> - <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/plugins/upd/upd.vcxproj b/plugins/upd/upd.vcxproj index 00d7dc60..bfcd579f 100644 --- a/plugins/upd/upd.vcxproj +++ b/plugins/upd/upd.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcupd</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcupd</TargetName> - <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/plugins/winamp/winamp-xp.vcxproj b/plugins/winamp/winamp-xp.vcxproj index fd5ccb6e..9bb9334d 100644 --- a/plugins/winamp/winamp-xp.vcxproj +++ b/plugins/winamp/winamp-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwinamp</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwinamp</TargetName> - <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/plugins/winamp/winamp.vcxproj b/plugins/winamp/winamp.vcxproj index 174627fe..bb1aa6ff 100644 --- a/plugins/winamp/winamp.vcxproj +++ b/plugins/winamp/winamp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwinamp</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwinamp</TargetName> - <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/plugins/winsys/winsys-xp.vcxproj b/plugins/winsys/winsys-xp.vcxproj index 70c5892a..ea2fa3db 100644 --- a/plugins/winsys/winsys-xp.vcxproj +++ b/plugins/winsys/winsys-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwinsys</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwinsys</TargetName> - <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/plugins/winsys/winsys.vcxproj b/plugins/winsys/winsys.vcxproj index 82a9fb31..6cdaf5d6 100644 --- a/plugins/winsys/winsys.vcxproj +++ b/plugins/winsys/winsys.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwinsys</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwinsys</TargetName> - <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/plugins/wmpa/wmpa-xp.vcxproj b/plugins/wmpa/wmpa-xp.vcxproj index 788f9178..b69ab34c 100644 --- a/plugins/wmpa/wmpa-xp.vcxproj +++ b/plugins/wmpa/wmpa-xp.vcxproj @@ -47,14 +47,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwmpa</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwmpa</TargetName> - <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/plugins/wmpa/wmpa.vcxproj b/plugins/wmpa/wmpa.vcxproj index 3f982b0d..7b881f76 100644 --- a/plugins/wmpa/wmpa.vcxproj +++ b/plugins/wmpa/wmpa.vcxproj @@ -47,14 +47,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwmpa</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hcwmpa</TargetName> - <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/src/common/common-xp.vcxproj b/src/common/common-xp.vcxproj index 2546b11e..89e7878a 100644 --- a/src/common/common-xp.vcxproj +++ b/src/common/common-xp.vcxproj @@ -108,12 +108,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/src/common/common.vcxproj b/src/common/common.vcxproj index 7a531fc2..44954c05 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -108,12 +108,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/src/dirent/dirent-xp.vcxproj b/src/dirent/dirent-xp.vcxproj index 0df2bf7e..5159f76f 100644 --- a/src/dirent/dirent-xp.vcxproj +++ b/src/dirent/dirent-xp.vcxproj @@ -50,13 +50,13 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <TargetName>$(ProjectName)-win32</TargetName> - <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'"> <TargetName>$(ProjectName)-win32</TargetName> - <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/src/dirent/dirent.vcxproj b/src/dirent/dirent.vcxproj index 4e985a64..35624428 100644 --- a/src/dirent/dirent.vcxproj +++ b/src/dirent/dirent.vcxproj @@ -50,13 +50,13 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <TargetName>$(ProjectName)-win32</TargetName> - <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'"> <TargetName>$(ProjectName)-win32</TargetName> - <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/src/fe-gtk/fe-gtk-xp.vcxproj b/src/fe-gtk/fe-gtk-xp.vcxproj index 0a035e14..8e4d1805 100644 --- a/src/fe-gtk/fe-gtk-xp.vcxproj +++ b/src/fe-gtk/fe-gtk-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hexchat</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hexchat</TargetName> - <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/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj index 9a26d453..373dd9a5 100644 --- a/src/fe-gtk/fe-gtk.vcxproj +++ b/src/fe-gtk/fe-gtk.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hexchat</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hexchat</TargetName> - <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/src/fe-text/fe-text-xp.vcxproj b/src/fe-text/fe-text-xp.vcxproj index faf9ddd6..e0fef46b 100644 --- a/src/fe-text/fe-text-xp.vcxproj +++ b/src/fe-text/fe-text-xp.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hexchat-text</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hexchat-text</TargetName> - <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/src/fe-text/fe-text.vcxproj b/src/fe-text/fe-text.vcxproj index eeffb629..fa5573b9 100644 --- a/src/fe-text/fe-text.vcxproj +++ b/src/fe-text/fe-text.vcxproj @@ -45,14 +45,14 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <TargetName>hexchat-text</TargetName> - <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'"> <LinkIncremental>false</LinkIncremental> <TargetName>hexchat-text</TargetName> - <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/src/pixmaps/pixmaps-xp.vcxproj b/src/pixmaps/pixmaps-xp.vcxproj index 70871439..f4757887 100644 --- a/src/pixmaps/pixmaps-xp.vcxproj +++ b/src/pixmaps/pixmaps-xp.vcxproj @@ -44,13 +44,13 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <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'"> <LinkIncremental>false</LinkIncremental> - <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/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj index 6d567ebc..81b6f869 100644 --- a/src/pixmaps/pixmaps.vcxproj +++ b/src/pixmaps/pixmaps.vcxproj @@ -44,13 +44,13 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <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'"> <LinkIncremental>false</LinkIncremental> - <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/src/version/version-xp.vcxproj b/src/version/version-xp.vcxproj index c52a3967..e5e0eab0 100644 --- a/src/version/version-xp.vcxproj +++ b/src/version/version-xp.vcxproj @@ -44,13 +44,13 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <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'"> <LinkIncremental>false</LinkIncremental> - <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/src/version/version.vcxproj b/src/version/version.vcxproj index 59b3bf2e..d8b30858 100644 --- a/src/version/version.vcxproj +++ b/src/version/version.vcxproj @@ -44,13 +44,13 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <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'"> <LinkIncremental>false</LinkIncremental> - <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-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> 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> |