LOTS of fixes to the VS solution

This commit is contained in:
Berke Viktor
2012-06-15 21:37:48 +02:00
parent bf37bd3755
commit 593efa703b
46 changed files with 218 additions and 65 deletions

View File

@@ -90,7 +90,10 @@
<Import Project="..\..\win32\xchat.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
<IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level1</WarningLevel>

View File

@@ -35,6 +35,8 @@
<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>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>

View File

@@ -30,6 +30,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<TargetName>xchat</TargetName>
<OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
<IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>

View File

@@ -30,6 +30,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<TargetName>xchat-text</TargetName>
<OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
<IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>

View File

@@ -29,6 +29,8 @@
<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>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -47,7 +49,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PostBuildEvent>
<Command>"$(DepsRoot)\bin\gdk-pixbuf-csource" --build-list $(Pixmaps) > "$(SolutionDir)\..\src\pixmaps\inline_pngs.h"</Command>
<Command>"$(DepsRoot)\bin\gdk-pixbuf-csource" --build-list $(Pixmaps) &gt; "$(SolutionDir)\..\src\pixmaps\inline_pngs.h"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>

View File

@@ -76,13 +76,13 @@ main (int argc, char *argv[])
{
printf ("#define COMMA_VERSION %s\n", comma ());
}
else if (!strcmp (argv[1], "-a32")) /* xchat-wdk.iss/AppVerName */
{
printf ("AppVerName=XChat-WDK %s (x86)\n", PACKAGE_VERSION);
}
else if (!strcmp (argv[1], "-a64")) /* xchat-wdk.iss/AppVerName */
else if (!strcmp (argv[1], "-a")) /* xchat-wdk.iss/AppVerName */
{
#ifdef _WIN64
printf ("AppVerName=XChat-WDK %s (x64)\n", PACKAGE_VERSION);
#else
printf ("AppVerName=XChat-WDK %s (x86)\n", PACKAGE_VERSION);
#endif
}
else if (!strcmp (argv[1], "-v")) /* xchat-wdk.iss/AppVersion */
{
@@ -92,13 +92,13 @@ main (int argc, char *argv[])
{
printf ("VersionInfoVersion=%s\n", point ());
}
else if (!strcmp (argv[1], "-o32")) /* xchat-wdk.iss/OutputBaseFilename */
{
printf ("OutputBaseFilename=XChat-WDK %s x86\n", PACKAGE_VERSION);
}
else if (!strcmp (argv[1], "-o64")) /* xchat-wdk.iss/OutputBaseFilename */
else if (!strcmp (argv[1], "-o")) /* xchat-wdk.iss/OutputBaseFilename */
{
#ifdef _WIN64
printf ("OutputBaseFilename=XChat-WDK %s x64\n", PACKAGE_VERSION);
#else
printf ("OutputBaseFilename=XChat-WDK %s x86\n", PACKAGE_VERSION);
#endif
}
else if (!strcmp (argv[1], "-v")) /* version.txt */
{

View File

@@ -29,6 +29,8 @@
<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>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -48,7 +50,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PostBuildEvent>
<Command>"$(OutputPath)\$(TargetName)$(TargetExt)" -r &gt; "$(SolutionDir)\..\resource.h"</Command>
<Command>"$(OutDir)\$(TargetName)$(TargetExt)" -r &gt; "$(SolutionDir)\..\resource.h"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>