Windows build and explicit driver selection

.gitignore

@@ -61,9 +61,15 @@ src/gui-autosave.pjd
 *~
 
 *.vcproj.*.user
+*.vcxproj.user
 *.opensdf
 *.sdf
 *.suo
 
 # Eclipse CDT
 .settings/
+
+# Visual Studio
+.vs
+*/x64/Debug
+*/x64/Release

creavision/CreaVision_eviacam.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">
     <ProjectName>creavision</ProjectName>
@@ -17,13 +25,25 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -34,10 +54,18 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
@@ -46,6 +74,7 @@
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)\creavision\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)\creavision\</IntDir>
@@ -159,27 +188,17 @@
     <ClCompile Include="crvcamera_cv.cpp" />
     <ClCompile Include="crvcamera_enum.cpp" />
     <ClCompile Include="crvcamera_wdm.cpp" />
-    <ClCompile Include="crvcolor.cpp" />
-    <ClCompile Include="crvgeomtry.cpp" />
-    <ClCompile Include="crvhistogram.cpp" />
     <ClCompile Include="crvimage.cpp" />
-    <ClCompile Include="crvmisc.cpp" />
     <ClCompile Include="crvnormroi.cpp" />
-    <ClCompile Include="crvskindetection.cpp" />
     <ClCompile Include="videoInput.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="crvcamera.h" />
     <ClInclude Include="crvcamera_cv.h" />
     <ClInclude Include="crvcamera_enum.h" />
     <ClInclude Include="crvcamera_wdm.h" />
-    <ClInclude Include="crvcolor.h" />
-    <ClInclude Include="crvgeomtry.h" />
-    <ClInclude Include="crvhistogram.h" />
     <ClInclude Include="crvimage.h" />
-    <ClInclude Include="crvmisc.h" />
     <ClInclude Include="crvnormroi.h" />
-    <ClInclude Include="crvskindetection.h" />
     <ClInclude Include="videoInput.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

creavision/CreaVision_eviacam.vcxproj.filters

@@ -23,27 +23,12 @@
     <ClCompile Include="crvcamera_wdm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crvcolor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="crvgeomtry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="crvhistogram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="crvimage.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crvmisc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="crvnormroi.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crvskindetection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="videoInput.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -61,27 +46,12 @@
     <ClInclude Include="crvcamera_wdm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="crvcolor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="crvgeomtry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="crvhistogram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="crvimage.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="crvmisc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="crvnormroi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="crvskindetection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="videoInput.h">
       <Filter>Header Files</Filter>
     </ClInclude>

creavision/crvcamera_cv.cpp

@@ -178,7 +178,7 @@ int CCameraCV::GetNumDevices()
 			tmpCapture.release();
 
 			// Generate device name
-			sprintf (g_deviceNames[i], "Camera (Id:%d)", i);
+			sprintf (g_deviceNames[i], "Camera (Dr:ocv,Id:%d)", i);
 		}		
 		g_numDevices= i;
 	}

creavision/crvcamera_v4l2.cpp

@@ -1702,7 +1702,7 @@ int CCameraV4L2::GetNumDevices()
 
 				// Prepend device number and append device name
 				unsigned int j= count - 1 - i;
-				snprintf (g_deviceNames[j], CAM_DEVICE_NAME_LENGTH, " (Id:%d) %s", j, device->name);
+				snprintf (g_deviceNames[j], CAM_DEVICE_NAME_LENGTH, " (Dr:v4l,Id:%d) %s", j, device->name);
 				snprintf (g_deviceShortNames[j], CAM_DEVICE_SHORT_NAME_LENGTH, "%s", device->shortName);
 				snprintf (g_deviceDriverNames[j], CAM_DEVICE_DRIVER_NAME_LENGTH, "%s", device->driver);
 

creavision/crvcamera_wdm.cpp

@@ -88,6 +88,7 @@ bool CCameraWDM::DoQueryFrame(cv::Mat &frame)
 	frame.create(height, width, CV_8UC3);
 
 	m_VI->getPixels(m_Id, frame.data, false, false);
+	cv::flip(frame, frame, 0);
 
 	return true;
 }
@@ -109,7 +110,7 @@ int CCameraWDM::GetNumDevices()
 		if (g_numDevices> MAX_CAM_DEVICES) g_numDevices= MAX_CAM_DEVICES;		
 		for (int i= 0; i< g_numDevices; ++i) {
 			// Prepend device number and append device name
-			_snprintf (g_deviceNames[i], CAM_DEVICE_NAME_LENGTH, " (Id:%d) %s\0", i, videoInput::getDeviceName(i));
+			_snprintf (g_deviceNames[i], CAM_DEVICE_NAME_LENGTH, " (Dr:wdm,Id:%d) %s\0", i, videoInput::getDeviceName(i));
 		}		
 	}
 

simplelog/simplelog.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>{5FF96C8F-40F9-46CD-980C-0AFBB932AC2E}</ProjectGuid>
@@ -18,13 +26,25 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -35,10 +55,18 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
@@ -47,6 +75,7 @@
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)\simplelog\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)\simplelog\</IntDir>
@@ -83,6 +112,38 @@
       <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NOPCH;WIN32;_WINDOWS;_DEBUG;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>$(SolutionDir)$(Configuration)\simplelog.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/EHsc %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>NOPCH;WIN32;_WINDOWS;_DEBUG;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <AssemblerListingLocation>$(SolutionDir)$(Configuration)\simplelog\</AssemblerListingLocation>
+      <ObjectFileName>$(SolutionDir)$(Configuration)\simplelog\</ObjectFileName>
+      <ProgramDataBaseFileName>$(SolutionDir)$(Configuration)\simplelog.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NOPCH;WIN32;_WINDOWS;_DEBUG;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0405</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
       <PreprocessorDefinitions>NOPCH;WIN32;_WINDOWS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -116,6 +177,39 @@
       <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NOPCH;WIN32;_WINDOWS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>$(SolutionDir)$(Configuration)\simplelog.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/EHsc  %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NOPCH;WIN32;_WINDOWS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <AssemblerListingLocation>$(SolutionDir)$(Configuration)\simplelog\</AssemblerListingLocation>
+      <ObjectFileName>$(SolutionDir)$(Configuration)\simplelog\</ObjectFileName>
+      <ProgramDataBaseFileName>$(SolutionDir)$(Configuration)\simplelog.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NOPCH;WIN32;__WXMSW__;_WINDOWS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0405</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="simplelog.c" />
   </ItemGroup>

src/eviacam.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>{4C7EE63E-9BCD-4DBA-A0D3-075D3DBB2597}</ProjectGuid>
@@ -18,12 +26,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <UseOfAtl>false</UseOfAtl>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <UseOfAtl>false</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
@@ -35,10 +55,18 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
@@ -49,12 +77,20 @@
     <ExtensionsToDeleteOnClean>*.dll%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath)</ExtensionsToDeleteOnClean>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ExtensionsToDeleteOnClean>*.dll%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath)</ExtensionsToDeleteOnClean>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\bin\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)\evicam\</IntDir>
     <ExtensionsToDeleteOnClean>*.dll%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath)</ExtensionsToDeleteOnClean>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ExtensionsToDeleteOnClean>*.dll%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath)</ExtensionsToDeleteOnClean>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -460,6 +496,106 @@ if %ERRORLEVEL% LEQ 1 exit 0
 
 if not exist $(TargetDir)haarcascade_frontalface_default.xml copy "$(CVPATH)\sources\data\haarcascades\haarcascade_frontalface_default.xml" $(TargetDir)
 
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\;..\simplelog;..\creavision;..\wxcamwindow;..\wxutil;$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;$(CVPATH)\build\include;$(CVPATH)\build\include\opencv</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;NOPCH;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>$(WXWIN)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Command>mkdir $(TargetDir)ca
+mkdir $(TargetDir)es
+mkdir $(TargetDir)gl
+mkdir $(TargetDir)it
+mkdir $(TargetDir)tr
+mkdir $(TargetDir)de
+mkdir $(TargetDir)oc
+mkdir $(TargetDir)fr
+mkdir $(TargetDir)ar
+mkdir $(TargetDir)he
+mkdir $(TargetDir)ru
+mkdir $(TargetDir)pt_BR
+mkdir $(TargetDir)ja
+mkdir $(TargetDir)el
+mkdir $(TargetDir)lt
+mkdir $(TargetDir)zh_TW
+mkdir $(TargetDir)zh_CN
+
+echo F | xcopy "$(SolutionDir)..\po\ca.gmo" $(TargetDir)ca\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\es.gmo" $(TargetDir)es\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\gl.gmo" $(TargetDir)gl\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\it.gmo" $(TargetDir)it\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\tr.gmo" $(TargetDir)tr\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\de.gmo" $(TargetDir)de\eviacam.mo /D
+echo F |  xcopy "$(SolutionDir)..\po\oc.gmo" $(TargetDir)oc\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\fr.gmo" $(TargetDir)fr\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\ar.gmo" $(TargetDir)ar\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\he.gmo" $(TargetDir)he\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\ru.gmo" $(TargetDir)ru\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\pt_BR.gmo" $(TargetDir)pt_BR\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\ja.gmo" $(TargetDir)ja\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\el.gmo" $(TargetDir)el\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\lt.gmo" $(TargetDir)lt\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\zh_TW.gmo" $(TargetDir)zh_TW\eviacam.mo /D
+echo F | xcopy "$(SolutionDir)..\po\zh_CN.gmo" $(TargetDir)zh_CN\eviacam.mo /D
+
+if not exist $(TargetDir)ca\wxstd.mo copy "%25WXWIN%25\locale\ca.mo" $(TargetDir)ca\wxstd.mo
+if not exist $(TargetDir)es\wxstd.mo copy "%25WXWIN%25\locale\es.mo" $(TargetDir)es\wxstd.mo
+if not exist $(TargetDir)gl\wxstd.mo copy "%25WXWIN%25\locale\gl_ES.mo" $(TargetDir)gl\wxstd.mo
+if not exist $(TargetDir)it\wxstd.mo copy "%25WXWIN%25\locale\it.mo" $(TargetDir)it\wxstd.mo
+if not exist $(TargetDir)tr\wxstd.mo copy "%25WXWIN%25\locale\tr.mo" $(TargetDir)tr\wxstd.mo
+if not exist $(TargetDir)de\wxstd.mo copy "%25WXWIN%25\locale\de.mo" $(TargetDir)de\wxstd.mo
+rem if not exist $(TargetDir)oc\wxstd.mo copy "%25WXWIN%25\locale\oc.mo" $(TargetDir)oc\wxstd.mo
+if not exist $(TargetDir)fr\wxstd.mo copy "%25WXWIN%25\locale\fr.mo" $(TargetDir)fr\wxstd.mo
+rem if not exist $(TargetDir)ar\wxstd.mo copy "%25WXWIN%25\locale\ar.mo" $(TargetDir)ar\wxstd.mo
+rem if not exist $(TargetDir)he\wxstd.mo copy "%25WXWIN%25\locale\he.mo" $(TargetDir)he\wxstd.mo
+if not exist $(TargetDir)ru\wxstd.mo copy "%25WXWIN%25\locale\ru.mo" $(TargetDir)ru\wxstd.mo
+if not exist $(TargetDir)pt_BR\wxstd.mo copy "%25WXWIN%25\locale\pt_BR.mo" $(TargetDir)pt_BR\wxstd.mo
+if not exist $(TargetDir)ja\wxstd.mo copy "%25WXWIN%25\locale\ja.mo" $(TargetDir)ja\wxstd.mo
+if not exist $(TargetDir)el\wxstd.mo copy "%25WXWIN%25\locale\el.mo" $(TargetDir)el\wxstd.mo
+if not exist $(TargetDir)zh_TW\wxstd.mo copy "%25WXWIN%25\locale\zh_TW.mo" $(TargetDir)zh_TW\wxstd.mo
+if not exist $(TargetDir)zh_CN\wxstd.mo copy "%25WXWIN%25\locale\zh_CN.mo" $(TargetDir)zh_CN\wxstd.mo
+
+mkdir $(TargetDir)\resources
+robocopy "$(SolutionDir)..\src\resources" "$(TargetDir)\resources" /E /Xo
+if %ERRORLEVEL% LEQ 1 exit 0
+</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)eviacam.exe</OutputFile>
+      <AdditionalLibraryDirectories>$(CVPATH)\build\x64\vc15\lib;$(WXWIN)\lib\vc_x64_lib;$(DSHOW_SAMPLES)\baseclasses\$(Configuration);$(SolutionDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <UACUIAccess>false</UACUIAccess>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>for %%x in (
+	opencv_world460.dll
+) do (
+	if not exist $(TargetDir)%%x copy $(CVPATH)\build\x64\vc15\bin\%%x $(TargetDir)
+)
+
+if not exist $(TargetDir)haarcascade_frontalface_default.xml copy "$(CVPATH)\sources\data\haarcascades\haarcascade_frontalface_default.xml" $(TargetDir)
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -551,4 +687,4 @@ if not exist $(TargetDir)haarcascade_frontalface_default.xml copy "$(CVPATH)\sou
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

src/viacamcontroller.cpp

@@ -195,41 +195,46 @@ CCamera* CViacamController::SetUpCamera()
 
 	/*
 		Try to find previously used camera with the same name
-		(only check native driver)
 	*/
 	int camId = -1;
 	const char * camName= NULL;
 	if (m_cameraName.Length()> 0) {
 		SLOG_INFO("Previous used camera: %s... ", (const char *) m_cameraName.mb_str());
-		for (camId = 0; camId < CCameraEnum::getNumDevices(0); camId++) {
-			camName = CCameraEnum::getDeviceName(0, camId);
-			if (wxString(camName, wxConvLibc) == m_cameraName) {
-				SLOG_INFO("FOUND");
+		for (driverId = 0; driverId < CCameraEnum::NUM_DRIVERS; driverId++) {
+			for (camId = 0; camId < CCameraEnum::getNumDevices(driverId); camId++) {
+				camName = CCameraEnum::getDeviceName(driverId, camId);
+				if (wxString(camName, wxConvLibc) == m_cameraName) {
+					SLOG_INFO("FOUND");
+					break;
+				}
+			}
+			if (camId < CCameraEnum::getNumDevices(driverId)) {
 				break;
 			}
 		}
 
-		if (camId == CCameraEnum::getNumDevices(0)) {
+		if (driverId == CCameraEnum::NUM_DRIVERS) {
 			SLOG_INFO("NOT FOUND");
 			camId = -1;
 		}
 	}
 
 	/*
-		Show selection dialog when needed (use native driver names)
+		Show selection dialog when needed
 	*/
-	SLOG_INFO("Detected %d camera(s)", CCameraEnum::getNumDevices(0));
 	if (camId == -1) {
-		if (CCameraEnum::getNumDevices(0) > 1) {
-			wxArrayString strArray;
-
-			for (int i = 0; i < CCameraEnum::getNumDevices(0); i++) {
-				strArray.Add(wxString(CCameraEnum::getDeviceName(0, i), wxConvLibc));
+		wxArrayString strArray;
+		for (driverId = 0; driverId < CCameraEnum::NUM_DRIVERS; driverId++) {
+			SLOG_INFO("Driver %d detected %d camera(s)", driverId, CCameraEnum::getNumDevices(driverId));
+			for (int i = 0; i < CCameraEnum::getNumDevices(driverId); i++) {
+				strArray.Add(wxString(CCameraEnum::getDeviceName(driverId, i), wxConvLibc));
 			}
+		}
 
+		if (strArray.GetCount() > 1) {
 			wxSingleChoiceDialog choiceDlg(
 				NULL, _("Choose the camera to use"), _T("Enable Viacam"), strArray, 
-				(char**)NULL, wxDEFAULT_DIALOG_STYLE | wxOK | wxCANCEL | wxCENTRE);
+				(void**)NULL, wxDEFAULT_DIALOG_STYLE | wxOK | wxCANCEL | wxCENTRE);
 
 			if (choiceDlg.ShowModal ()!= wxID_OK) return NULL;
 
@@ -238,17 +243,24 @@ CCamera* CViacamController::SetUpCamera()
 		} 
 		else {
 			camId= 0;
-			m_cameraName = wxString(CCameraEnum::getDeviceName(0, camId), wxConvLibc);
+			m_cameraName = strArray[0];
+		}
+
+		if (camId >= CCameraEnum::getNumDevices(0)) {
+			camId -= CCameraEnum::getNumDevices(0);
+			driverId = 1;
+		}
+		else {
+			driverId = 0;
 		}
 	}
 
 	/*
 		Try to open the camera to make sure it works
 	*/
-	SLOG_INFO("Selected camera: %d", camId);
+	SLOG_INFO("Selected camera: Driver:%d Id:%d", driverId, camId);
 	SLOG_INFO("Try to open the camera to make sure it works...");
-	// native driver first
-	CCamera* cam = CCameraEnum::getCamera(1, camId);
+	CCamera* cam = CCameraEnum::getCamera(driverId, camId);
 	/*
 	SLOG_INFO("Testing with WDM driver...");
 	if (!testCamera(cam)) {

src/wviacam.cpp

@@ -598,7 +598,6 @@ void WViacam::OnToolHelpClick( wxCommandEvent& event )
 		case (wxLANGUAGE_SPANISH_GUATEMALA):
 		case (wxLANGUAGE_SPANISH_HONDURAS):
 		case (wxLANGUAGE_SPANISH_MEXICAN):
-		case (wxLANGUAGE_SPANISH_MODERN):
 		case (wxLANGUAGE_SPANISH_NICARAGUA):
 		case (wxLANGUAGE_SPANISH_PANAMA):
 		case (wxLANGUAGE_SPANISH_PARAGUAY):

win32/eviacam.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32819.101
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eviacam", "..\src\eviacam.vcxproj", "{4C7EE63E-9BCD-4DBA-A0D3-075D3DBB2597}"
 EndProject
@@ -15,31 +15,56 @@ 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
 		{4C7EE63E-9BCD-4DBA-A0D3-075D3DBB2597}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4C7EE63E-9BCD-4DBA-A0D3-075D3DBB2597}.Debug|Win32.Build.0 = Debug|Win32
+		{4C7EE63E-9BCD-4DBA-A0D3-075D3DBB2597}.Debug|x64.ActiveCfg = Debug|x64
+		{4C7EE63E-9BCD-4DBA-A0D3-075D3DBB2597}.Debug|x64.Build.0 = Debug|x64
 		{4C7EE63E-9BCD-4DBA-A0D3-075D3DBB2597}.Release|Win32.ActiveCfg = Release|Win32
 		{4C7EE63E-9BCD-4DBA-A0D3-075D3DBB2597}.Release|Win32.Build.0 = Release|Win32
+		{4C7EE63E-9BCD-4DBA-A0D3-075D3DBB2597}.Release|x64.ActiveCfg = Release|x64
+		{4C7EE63E-9BCD-4DBA-A0D3-075D3DBB2597}.Release|x64.Build.0 = Release|x64
 		{05F37C83-F423-4022-BAB6-8FEC1972A219}.Debug|Win32.ActiveCfg = Debug|Win32
 		{05F37C83-F423-4022-BAB6-8FEC1972A219}.Debug|Win32.Build.0 = Debug|Win32
+		{05F37C83-F423-4022-BAB6-8FEC1972A219}.Debug|x64.ActiveCfg = Debug|x64
+		{05F37C83-F423-4022-BAB6-8FEC1972A219}.Debug|x64.Build.0 = Debug|x64
 		{05F37C83-F423-4022-BAB6-8FEC1972A219}.Release|Win32.ActiveCfg = Release|Win32
 		{05F37C83-F423-4022-BAB6-8FEC1972A219}.Release|Win32.Build.0 = Release|Win32
+		{05F37C83-F423-4022-BAB6-8FEC1972A219}.Release|x64.ActiveCfg = Release|x64
+		{05F37C83-F423-4022-BAB6-8FEC1972A219}.Release|x64.Build.0 = Release|x64
 		{FF220E89-E196-48A7-8FD6-6382A32502E7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FF220E89-E196-48A7-8FD6-6382A32502E7}.Debug|Win32.Build.0 = Debug|Win32
+		{FF220E89-E196-48A7-8FD6-6382A32502E7}.Debug|x64.ActiveCfg = Debug|x64
+		{FF220E89-E196-48A7-8FD6-6382A32502E7}.Debug|x64.Build.0 = Debug|x64
 		{FF220E89-E196-48A7-8FD6-6382A32502E7}.Release|Win32.ActiveCfg = Release|Win32
 		{FF220E89-E196-48A7-8FD6-6382A32502E7}.Release|Win32.Build.0 = Release|Win32
+		{FF220E89-E196-48A7-8FD6-6382A32502E7}.Release|x64.ActiveCfg = Release|x64
+		{FF220E89-E196-48A7-8FD6-6382A32502E7}.Release|x64.Build.0 = Release|x64
 		{EF4CBA03-871C-48CE-998D-66F326B8A99A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EF4CBA03-871C-48CE-998D-66F326B8A99A}.Debug|Win32.Build.0 = Debug|Win32
+		{EF4CBA03-871C-48CE-998D-66F326B8A99A}.Debug|x64.ActiveCfg = Debug|x64
+		{EF4CBA03-871C-48CE-998D-66F326B8A99A}.Debug|x64.Build.0 = Debug|x64
 		{EF4CBA03-871C-48CE-998D-66F326B8A99A}.Release|Win32.ActiveCfg = Release|Win32
 		{EF4CBA03-871C-48CE-998D-66F326B8A99A}.Release|Win32.Build.0 = Release|Win32
+		{EF4CBA03-871C-48CE-998D-66F326B8A99A}.Release|x64.ActiveCfg = Release|x64
+		{EF4CBA03-871C-48CE-998D-66F326B8A99A}.Release|x64.Build.0 = Release|x64
 		{5FF96C8F-40F9-46CD-980C-0AFBB932AC2E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5FF96C8F-40F9-46CD-980C-0AFBB932AC2E}.Debug|Win32.Build.0 = Debug|Win32
+		{5FF96C8F-40F9-46CD-980C-0AFBB932AC2E}.Debug|x64.ActiveCfg = Debug|x64
+		{5FF96C8F-40F9-46CD-980C-0AFBB932AC2E}.Debug|x64.Build.0 = Debug|x64
 		{5FF96C8F-40F9-46CD-980C-0AFBB932AC2E}.Release|Win32.ActiveCfg = Release|Win32
 		{5FF96C8F-40F9-46CD-980C-0AFBB932AC2E}.Release|Win32.Build.0 = Release|Win32
+		{5FF96C8F-40F9-46CD-980C-0AFBB932AC2E}.Release|x64.ActiveCfg = Release|x64
+		{5FF96C8F-40F9-46CD-980C-0AFBB932AC2E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {77C52EDE-5B5F-49F2-8C0D-E06A81DE5596}
+	EndGlobalSection
 EndGlobal

wxcamwindow/wxcamwindow.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>{05F37C83-F423-4022-BAB6-8FEC1972A219}</ProjectGuid>
@@ -17,13 +25,25 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -34,10 +54,18 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
@@ -46,6 +74,7 @@
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)\wxcamwindow\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)\wxcamwindow\</IntDir>

wxutil/wxutil.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>{EF4CBA03-871C-48CE-998D-66F326B8A99A}</ProjectGuid>
@@ -18,13 +26,25 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v143</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -35,10 +55,18 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
@@ -47,6 +75,7 @@
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)\wxutil\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)\wxutil\</IntDir>