Porting to x64

strobejb · Jul 19, 2012 · a1137ef · a1137ef
1 parent 2a8506a
commit a1137ef
Show file tree

Hide file tree

Showing 34 changed files with 643 additions and 77 deletions.
diff --git a/HexEdit.sln b/HexEdit.sln
@@ -29,37 +29,67 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D42516BB-4C96-4F56-BF73-B3B9E95BA5F4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D42516BB-4C96-4F56-BF73-B3B9E95BA5F4}.Debug|Win32.Build.0 = Debug|Win32
+		{D42516BB-4C96-4F56-BF73-B3B9E95BA5F4}.Debug|x64.ActiveCfg = Debug|x64
+		{D42516BB-4C96-4F56-BF73-B3B9E95BA5F4}.Debug|x64.Build.0 = Debug|x64
 		{D42516BB-4C96-4F56-BF73-B3B9E95BA5F4}.Release|Win32.ActiveCfg = Release|Win32
 		{D42516BB-4C96-4F56-BF73-B3B9E95BA5F4}.Release|Win32.Build.0 = Release|Win32
+		{D42516BB-4C96-4F56-BF73-B3B9E95BA5F4}.Release|x64.ActiveCfg = Release|x64
+		{D42516BB-4C96-4F56-BF73-B3B9E95BA5F4}.Release|x64.Build.0 = Release|x64
 		{D5B645A0-AB6C-4C08-8A02-9EE1324A0BFD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D5B645A0-AB6C-4C08-8A02-9EE1324A0BFD}.Debug|Win32.Build.0 = Debug|Win32
+		{D5B645A0-AB6C-4C08-8A02-9EE1324A0BFD}.Debug|x64.ActiveCfg = Debug|x64
+		{D5B645A0-AB6C-4C08-8A02-9EE1324A0BFD}.Debug|x64.Build.0 = Debug|x64
 		{D5B645A0-AB6C-4C08-8A02-9EE1324A0BFD}.Release|Win32.ActiveCfg = Release|Win32
 		{D5B645A0-AB6C-4C08-8A02-9EE1324A0BFD}.Release|Win32.Build.0 = Release|Win32
+		{D5B645A0-AB6C-4C08-8A02-9EE1324A0BFD}.Release|x64.ActiveCfg = Release|x64
+		{D5B645A0-AB6C-4C08-8A02-9EE1324A0BFD}.Release|x64.Build.0 = Release|x64
 		{93B6F7BD-DDB7-4FEA-8994-1927AD706DD6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{93B6F7BD-DDB7-4FEA-8994-1927AD706DD6}.Debug|Win32.Build.0 = Debug|Win32
+		{93B6F7BD-DDB7-4FEA-8994-1927AD706DD6}.Debug|x64.ActiveCfg = Debug|x64
+		{93B6F7BD-DDB7-4FEA-8994-1927AD706DD6}.Debug|x64.Build.0 = Debug|x64
 		{93B6F7BD-DDB7-4FEA-8994-1927AD706DD6}.Release|Win32.ActiveCfg = Release|Win32
 		{93B6F7BD-DDB7-4FEA-8994-1927AD706DD6}.Release|Win32.Build.0 = Release|Win32
+		{93B6F7BD-DDB7-4FEA-8994-1927AD706DD6}.Release|x64.ActiveCfg = Release|x64
+		{93B6F7BD-DDB7-4FEA-8994-1927AD706DD6}.Release|x64.Build.0 = Release|x64
 		{3FBA3178-4AE6-4103-9EB2-542901D978B7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3FBA3178-4AE6-4103-9EB2-542901D978B7}.Debug|Win32.Build.0 = Debug|Win32
+		{3FBA3178-4AE6-4103-9EB2-542901D978B7}.Debug|x64.ActiveCfg = Debug|x64
+		{3FBA3178-4AE6-4103-9EB2-542901D978B7}.Debug|x64.Build.0 = Debug|x64
 		{3FBA3178-4AE6-4103-9EB2-542901D978B7}.Release|Win32.ActiveCfg = Release|Win32
 		{3FBA3178-4AE6-4103-9EB2-542901D978B7}.Release|Win32.Build.0 = Release|Win32
+		{3FBA3178-4AE6-4103-9EB2-542901D978B7}.Release|x64.ActiveCfg = Release|x64
+		{3FBA3178-4AE6-4103-9EB2-542901D978B7}.Release|x64.Build.0 = Release|x64
 		{E101755F-A81A-4C12-9B4B-8485BF8E66DA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E101755F-A81A-4C12-9B4B-8485BF8E66DA}.Debug|Win32.Build.0 = Debug|Win32
+		{E101755F-A81A-4C12-9B4B-8485BF8E66DA}.Debug|x64.ActiveCfg = Debug|x64
+		{E101755F-A81A-4C12-9B4B-8485BF8E66DA}.Debug|x64.Build.0 = Debug|x64
 		{E101755F-A81A-4C12-9B4B-8485BF8E66DA}.Release|Win32.ActiveCfg = Release|Win32
 		{E101755F-A81A-4C12-9B4B-8485BF8E66DA}.Release|Win32.Build.0 = Release|Win32
+		{E101755F-A81A-4C12-9B4B-8485BF8E66DA}.Release|x64.ActiveCfg = Release|x64
+		{E101755F-A81A-4C12-9B4B-8485BF8E66DA}.Release|x64.Build.0 = Release|x64
 		{8724EC2D-4352-46B2-AB57-3C3430BD52DB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8724EC2D-4352-46B2-AB57-3C3430BD52DB}.Debug|Win32.Build.0 = Debug|Win32
+		{8724EC2D-4352-46B2-AB57-3C3430BD52DB}.Debug|x64.ActiveCfg = Debug|x64
+		{8724EC2D-4352-46B2-AB57-3C3430BD52DB}.Debug|x64.Build.0 = Debug|x64
 		{8724EC2D-4352-46B2-AB57-3C3430BD52DB}.Release|Win32.ActiveCfg = Release|Win32
 		{8724EC2D-4352-46B2-AB57-3C3430BD52DB}.Release|Win32.Build.0 = Release|Win32
+		{8724EC2D-4352-46B2-AB57-3C3430BD52DB}.Release|x64.ActiveCfg = Release|x64
+		{8724EC2D-4352-46B2-AB57-3C3430BD52DB}.Release|x64.Build.0 = Release|x64
 		{6BD408DB-3E6D-4649-9A92-4A4E52E70137}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6BD408DB-3E6D-4649-9A92-4A4E52E70137}.Debug|Win32.Build.0 = Debug|Win32
+		{6BD408DB-3E6D-4649-9A92-4A4E52E70137}.Debug|x64.ActiveCfg = Debug|x64
+		{6BD408DB-3E6D-4649-9A92-4A4E52E70137}.Debug|x64.Build.0 = Debug|x64
 		{6BD408DB-3E6D-4649-9A92-4A4E52E70137}.Release|Win32.ActiveCfg = Release|Win32
 		{6BD408DB-3E6D-4649-9A92-4A4E52E70137}.Release|Win32.Build.0 = Release|Win32
+		{6BD408DB-3E6D-4649-9A92-4A4E52E70137}.Release|x64.ActiveCfg = Release|x64
+		{6BD408DB-3E6D-4649-9A92-4A4E52E70137}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/ConfigLib/ConfigLib.vcxproj b/src/ConfigLib/ConfigLib.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D42516BB-4C96-4F56-BF73-B3B9E95BA5F4}</ProjectGuid>
@@ -21,32 +29,59 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
     <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -61,6 +96,20 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);SEQUENCE64</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -71,6 +120,26 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);SEQUENCE64</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);SEQUENCE64</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/src/ConfigLib/configlib.cpp b/src/ConfigLib/configlib.cpp
@@ -361,7 +361,7 @@ BOOL SetConfigStr(HCONFIG config, LPCTSTR szKeyName, LPCTSTR szValue)
 		char *ptr = new char[len];
 
 		// make a UTF8 version of the name
-		while(WideCharToMultiByte(CP_UTF8, 0, szValue, -1, ptr, len, 0, 0) == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+		while(WideCharToMultiByte(CP_UTF8, 0, szValue, -1, ptr, (int)len, 0, 0) == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER)
 		{
 			delete[] ptr;
 			len *= 2;

diff --git a/src/DockLib/DockLib.c b/src/DockLib/DockLib.c
@@ -355,7 +355,7 @@ VOID DockWnd_ShowDeferredPopups(HWND hwndMain)
 {
 	DOCKSERVER *dsp = GetDockServer(hwndMain);
 
-	if(dsp->fDeferShowWindow)
+	if(dsp && dsp->fDeferShowWindow)
 	{
 		DOCKPANEL *dpp;
 

diff --git a/src/DockLib/DockLib.h b/src/DockLib/DockLib.h
@@ -157,7 +157,7 @@ VOID DockWnd_ShowDeferredPopups(HWND hwndMain);
 
 HDWP DockWnd_DeferPanelPos(HDWP hdwp, HWND hwndMain, RECT *rect);
 
-LRESULT HANDLE_NCACTIVATE(HWND hwndMain, HWND hwnd, WPARAM wParam, LPARAM lParam);
+LRESULT HANDLE_NCACTIVATE(HWND hwndMain, HWND hwnd, WPARAM wParam, LPARAM lParam, WNDPROC oldProc OPTIONAL);
 
 BOOL WINAPI DockWnd_IsDialogMessage(HWND hwndMain, UINT uId, MSG *msg);
 

diff --git a/src/DockLib/DockLib.vcxproj b/src/DockLib/DockLib.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D5B645A0-AB6C-4C08-8A02-9EE1324A0BFD}</ProjectGuid>
@@ -21,34 +29,63 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -63,6 +100,20 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);SEQUENCE64</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -73,6 +124,26 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);SEQUENCE64</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);SEQUENCE64</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>