LOTS of fixes to the VS solution

7 files changed, 26 insertions, 13 deletions

diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index f0a730b7..b57b2ccf 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -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>

diff --git a/src/dirent/dirent.vcxproj b/src/dirent/dirent.vcxproj
index 65fa2fb0..8ac38f92 100644
--- a/src/dirent/dirent.vcxproj
+++ b/src/dirent/dirent.vcxproj
@@ -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>

diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj
index 68390d03..fce8d3e6 100644
--- a/src/fe-gtk/fe-gtk.vcxproj
+++ b/src/fe-gtk/fe-gtk.vcxproj
@@ -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>

diff --git a/src/fe-text/fe-text.vcxproj b/src/fe-text/fe-text.vcxproj
index 389c7b5e..ac7068ec 100644
--- a/src/fe-text/fe-text.vcxproj
+++ b/src/fe-text/fe-text.vcxproj
@@ -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>

diff --git a/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj
index ba88104d..3fda0fef 100644
--- a/src/pixmaps/pixmaps.vcxproj
+++ b/src/pixmaps/pixmaps.vcxproj
@@ -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>

diff --git a/src/version/version.c b/src/version/version.c
index 14312a43..53af5675 100644
--- a/src/version/version.c
+++ b/src/version/version.c
@@ -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 */
 		{
diff --git a/src/version/version.vcxproj b/src/version/version.vcxproj
index 26c13458..b07b8e2a 100644
--- a/src/version/version.vcxproj
+++ b/src/version/version.vcxproj
@@ -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>