From 1fe07f325ed42e68424ad682177be8fc6506fc65 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Thu, 14 May 2009 10:04:26 +0000
Subject: [PATCH] Fixed libcaca and the Visual Studio solution so that it works
 on Win64, including the .NET projects.

---
 caca-sharp/caca-sharp.csproj  |  38 +++++++-
 caca-sharp/test-csharp.csproj |  22 ++++-
 caca/caca_types.h.in          |  20 +++-
 caca/libcaca.vcproj           | 155 +++++++++++++++++++++++++++++++
 cxx/libcaca++.vcproj          | 155 +++++++++++++++++++++++++++++++
 cxx/test-cxx.vcproj           | 155 +++++++++++++++++++++++++++++++
 libcaca.sln                   |  72 ++++++++-------
 src/cacademo.vcproj           | 169 ++++++++++++++++++++++++++++++++++
 src/cacafire.vcproj           | 169 ++++++++++++++++++++++++++++++++++
 src/cacaview.vcproj           | 169 +++++++++++++++++++++++++++++++++-
 win32/caca_types.h            |   6 +-
 11 files changed, 1086 insertions(+), 44 deletions(-)

diff --git a/caca-sharp/caca-sharp.csproj b/caca-sharp/caca-sharp.csproj
index a6d910a..0ede90b 100644
--- a/caca-sharp/caca-sharp.csproj
+++ b/caca-sharp/caca-sharp.csproj
@@ -34,18 +34,52 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>%24%28SolutionDir%29%24%28ConfigurationName%29\</OutputPath>
+    <OutputPath>..\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>%24%28SolutionDir%29%24%28ConfigurationName%29\</OutputPath>
+    <OutputPath>..\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>..\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/caca-sharp/test-csharp.csproj b/caca-sharp/test-csharp.csproj
index 848b672..490d13a 100644
--- a/caca-sharp/test-csharp.csproj
+++ b/caca-sharp/test-csharp.csproj
@@ -35,18 +35,36 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>%24%28SolutionDir%29%24%28ConfigurationName%29\</OutputPath>
+    <OutputPath>..\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>%24%28SolutionDir%29%24%28ConfigurationName%29\</OutputPath>
+    <OutputPath>..\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>..\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/caca/caca_types.h.in b/caca/caca_types.h.in
index 7fe5f2e..51d9a5e 100644
--- a/caca/caca_types.h.in
+++ b/caca/caca_types.h.in
@@ -33,8 +33,7 @@
 #   include <inttypes.h>
 #   include <unistd.h>
 
-/* mode 3: <windows.h> indicates Win32, only (u)intptr_t is present
- * FIXME: Win64 probably doesn't work that way */
+/* mode 3: Win32, only (u)intptr_t is present */
 #elif CACA_TYPES == 3
 #include <windows.h>
 
@@ -51,6 +50,22 @@ typedef unsigned long long int uint64_t;
 typedef int ssize_t;
 typedef unsigned int size_t;
 
+/* mode 4: Win64, only (u)intptr_t and size_t are present */
+#elif CACA_TYPES == 4
+#include <windows.h>
+
+typedef signed char int8_t;
+typedef signed short int16_t;
+typedef signed long int int32_t;
+typedef signed long long int int64_t;
+
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned long int uint32_t;
+typedef unsigned long long int uint64_t;
+
+typedef int ssize_t;
+
 /* fallback: nothing is known, we assume the platform is 32-bit and
  * sizeof(long) == sizeof(void *). We don't typedef directly because we
  * have no idea what other typedefs have already been made. */
@@ -98,4 +113,3 @@ typedef unsigned int _caca_size_t;
 #endif
 
 #endif /* __CACA_TYPES_H__ */
-
diff --git a/caca/libcaca.vcproj b/caca/libcaca.vcproj
index 9c87cb8..8c5f568 100644
--- a/caca/libcaca.vcproj
+++ b/caca/libcaca.vcproj
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -165,6 +168,158 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\win32;&quot;$(projectDir)&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__LIBCACA__"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996;4142"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				ModuleDefinitionFile=".\libcaca.def"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\win32;&quot;$(projectDir)&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__LIBCACA__"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996;4142"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				ModuleDefinitionFile=".\libcaca.def"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/cxx/libcaca++.vcproj b/cxx/libcaca++.vcproj
index 5fd8ede..6093f55 100644
--- a/cxx/libcaca++.vcproj
+++ b/cxx/libcaca++.vcproj
@@ -10,6 +10,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -164,6 +167,158 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\win32;..\caca"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__LIBCACA_PP__"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="2"
+				DisableSpecificWarnings="4996;4142"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				ModuleDefinitionFile=".\libcaca++.def"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\win32;..\caca"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__LIBCACA_PP__"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="2"
+				DisableSpecificWarnings="4996;4142"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				ModuleDefinitionFile=".\libcaca++.def"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/cxx/test-cxx.vcproj b/cxx/test-cxx.vcproj
index bd5d665..3c2b67c 100644
--- a/cxx/test-cxx.vcproj
+++ b/cxx/test-cxx.vcproj
@@ -12,6 +12,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -166,6 +169,158 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..\win32;..\caca"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..\win32;..\caca"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/libcaca.sln b/libcaca.sln
index 6f2fe2b..ea7ab36 100644
--- a/libcaca.sln
+++ b/libcaca.sln
@@ -34,93 +34,97 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|Win32 = Debug|Win32
+		Debug|Win64 = Debug|Win64
 		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|Win32 = Release|Win32
+		Release|Win64 = Release|Win64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Win32.Build.0 = Debug|Win32
+		{F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Win64.ActiveCfg = Debug|x64
+		{F25D1237-9ED8-4343-B958-308C95FE392F}.Debug|Win64.Build.0 = Debug|x64
 		{F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Any CPU.ActiveCfg = Release|Win32
-		{F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Win32.ActiveCfg = Release|Win32
 		{F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Win32.Build.0 = Release|Win32
+		{F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Win64.ActiveCfg = Release|x64
+		{F25D1237-9ED8-4343-B958-308C95FE392F}.Release|Win64.Build.0 = Release|x64
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Win32.Build.0 = Debug|Win32
+		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Win64.ActiveCfg = Debug|x64
+		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Debug|Win64.Build.0 = Debug|x64
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Any CPU.ActiveCfg = Release|Win32
-		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Win32.ActiveCfg = Release|Win32
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Win32.Build.0 = Release|Win32
+		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Win64.ActiveCfg = Release|x64
+		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4}.Release|Win64.Build.0 = Release|x64
 		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Win32.Build.0 = Debug|Win32
+		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Win64.ActiveCfg = Debug|x64
+		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Debug|Win64.Build.0 = Debug|x64
 		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Any CPU.ActiveCfg = Release|Win32
-		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Win32.ActiveCfg = Release|Win32
 		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Win32.Build.0 = Release|Win32
+		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Win64.ActiveCfg = Release|x64
+		{EE082122-5ECD-4DB4-93C7-145392074F8B}.Release|Win64.Build.0 = Release|x64
 		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Win32.Build.0 = Debug|Any CPU
+		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Win64.ActiveCfg = Debug|x64
+		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Debug|Win64.Build.0 = Debug|x64
 		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Win32.ActiveCfg = Release|Any CPU
+		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Win32.Build.0 = Release|Any CPU
+		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Win64.ActiveCfg = Release|x64
+		{046BD004-7B02-4521-BF01-9D9042F19AD5}.Release|Win64.Build.0 = Release|x64
 		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Win32.Build.0 = Debug|Any CPU
+		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Win64.ActiveCfg = Debug|x64
+		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Debug|Win64.Build.0 = Debug|x64
 		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Win32.ActiveCfg = Release|Any CPU
+		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Win32.Build.0 = Release|Any CPU
+		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Win64.ActiveCfg = Release|x64
+		{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}.Release|Win64.Build.0 = Release|x64
 		{5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Win32.Build.0 = Debug|Win32
+		{5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Win64.ActiveCfg = Debug|x64
+		{5AAFB727-094F-4104-A765-A94B32497C7D}.Debug|Win64.Build.0 = Debug|x64
 		{5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Any CPU.ActiveCfg = Release|Win32
-		{5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Win32.ActiveCfg = Release|Win32
 		{5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Win32.Build.0 = Release|Win32
+		{5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Win64.ActiveCfg = Release|x64
+		{5AAFB727-094F-4104-A765-A94B32497C7D}.Release|Win64.Build.0 = Release|x64
 		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Win32.Build.0 = Debug|Win32
+		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Win64.ActiveCfg = Debug|x64
+		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Debug|Win64.Build.0 = Debug|x64
 		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Any CPU.ActiveCfg = Release|Win32
-		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Win32.ActiveCfg = Release|Win32
 		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Win32.Build.0 = Release|Win32
+		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Win64.ActiveCfg = Release|x64
+		{F2530E59-7ADB-4D3C-8873-6D110788B8F7}.Release|Win64.Build.0 = Release|x64
 		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Win32.Build.0 = Debug|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Win64.ActiveCfg = Debug|x64
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Debug|Win64.Build.0 = Debug|x64
 		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Any CPU.ActiveCfg = Release|Win32
-		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Win32.ActiveCfg = Release|Win32
 		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Win32.Build.0 = Release|Win32
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Win64.ActiveCfg = Release|x64
+		{62E567BD-73B7-4C1E-9919-6423C8A8F72E}.Release|Win64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/cacademo.vcproj b/src/cacademo.vcproj
index 5f41812..8fcccef 100644
--- a/src/cacademo.vcproj
+++ b/src/cacademo.vcproj
@@ -12,6 +12,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -180,6 +183,172 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\win32;..\caca"
+				PreprocessorDefinitions="LIBCACA=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996;4142"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/cacademo.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/cacademo.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\win32;..\caca"
+				PreprocessorDefinitions="LIBCACA=1"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996;4142"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/cacademo.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/src/cacafire.vcproj b/src/cacafire.vcproj
index 30914bc..5f8742e 100644
--- a/src/cacafire.vcproj
+++ b/src/cacafire.vcproj
@@ -12,6 +12,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -180,6 +183,172 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\win32;..\caca"
+				PreprocessorDefinitions="LIBCACA=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996;4142"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/cacafire.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/cacafire.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\win32;..\caca"
+				PreprocessorDefinitions="LIBCACA=1"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996;4142"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/cacafire.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/src/cacaview.vcproj b/src/cacaview.vcproj
index 707a582..a85a7f4 100644
--- a/src/cacaview.vcproj
+++ b/src/cacaview.vcproj
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -41,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\win32;..\caca;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="..\win32;..\caca"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -122,7 +125,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\win32"
+				AdditionalIncludeDirectories="..\win32;..\caca"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -175,6 +178,168 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\win32;..\caca"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/cacaview.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/cacaview.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\win32;..\caca"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/cacaview.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 		<ProjectReference
diff --git a/win32/caca_types.h b/win32/caca_types.h
index d2e5826..d2201da 100644
--- a/win32/caca_types.h
+++ b/win32/caca_types.h
@@ -1,2 +1,6 @@
-#define CACA_TYPES 3
+#if defined _WIN64
+#   define CACA_TYPES 4
+#else
+#   define CACA_TYPES 3
+#endif
 #include "../caca/caca_types.h.in"
\ No newline at end of file