From 8e5a132e13587cab84441f232e602df23c7fa5b9 Mon Sep 17 00:00:00 2001
From: Dimitar Trendafilov <dimitar@coherent-labs.com>
Date: Thu, 15 Nov 2018 09:41:29 +0200
Subject: Split spasm to lib and executable

- added solution folders
---
 JSImpl/test/Test.make             |  8 ++---
 JSImpl/test/Test.vcxproj          | 11 ++++---
 JSImpl/test/genie.lua             | 63 ++++++++++++++++++++-------------------
 JSImpl/test/gmock.vcxproj         | 14 +++++----
 JSImpl/test/gmock.vcxproj.filters | 22 +++++++-------
 JSImpl/test/gtest.vcxproj         | 12 ++++----
 JSImpl/test/gtest.vcxproj.filters | 16 +++++-----
 JSImpl/test/gtest_main.vcxproj    |  2 ++
 8 files changed, 80 insertions(+), 68 deletions(-)

(limited to 'JSImpl/test')

diff --git a/JSImpl/test/Test.make b/JSImpl/test/Test.make
index 4540d2d..e1a6ad4 100644
--- a/JSImpl/test/Test.make
+++ b/JSImpl/test/Test.make
@@ -47,7 +47,7 @@ ifeq ($(config),debug64)
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/Test
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src"
+  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
@@ -56,7 +56,7 @@ ifeq ($(config),debug64)
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++14
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -L"." -m64
-  LDDEPS             += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a
+  LDDEPS             += ../build/bin/Debug/libsprt.a ../build/bin/Debug/libspasm_lib.a ../build/bin/Debug/libJSLib.a ../build/bin/Debug/libgtest.a ../build/bin/Debug/libgmock.a ../build/bin/Debug/libgtest_main.a
   LIBS               += $(LDDEPS) -lpthread
   EXTERNAL_LIBS      +=
   LINKOBJS            = $(OBJECTS)
@@ -80,7 +80,7 @@ ifeq ($(config),release64)
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/Test
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src"
+  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
@@ -89,7 +89,7 @@ ifeq ($(config),release64)
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++14
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
   ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -L"." -m64
-  LDDEPS             += ../build/bin/Release/libsprt.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a
+  LDDEPS             += ../build/bin/Release/libsprt.a ../build/bin/Release/libspasm_lib.a ../build/bin/Release/libJSLib.a ../build/bin/Release/libgtest.a ../build/bin/Release/libgmock.a ../build/bin/Release/libgtest_main.a
   LIBS               += $(LDDEPS) -lpthread
   EXTERNAL_LIBS      +=
   LINKOBJS            = $(OBJECTS)
diff --git a/JSImpl/test/Test.vcxproj b/JSImpl/test/Test.vcxproj
index 3a7058a..c099f1c 100644
--- a/JSImpl/test/Test.vcxproj
+++ b/JSImpl/test/Test.vcxproj
@@ -57,7 +57,7 @@
     <ClCompile>
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -72,7 +72,7 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -87,7 +87,7 @@
     <ClCompile>
       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <StringPooling>true</StringPooling>
@@ -102,7 +102,7 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -129,6 +129,9 @@
     <ProjectReference Include="..\..\spasm\solution\sprt.vcxproj">
       <Project>{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\spasm\solution\spasm_lib.vcxproj">
+      <Project>{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\solution\JSLib.vcxproj">
       <Project>{19EA680D-85FE-90BE-4E80-341EBA538DEF}</Project>
     </ProjectReference>
diff --git a/JSImpl/test/genie.lua b/JSImpl/test/genie.lua
index ba0f0c2..c3cd1d6 100644
--- a/JSImpl/test/genie.lua
+++ b/JSImpl/test/genie.lua
@@ -10,9 +10,11 @@ project 'Test'
         'googletest/googlemock/include',
         '..',
         '../../spasm/src',
+        '../../spasm/src/asm',
     }
     links {
         'sprt',
+        'spasm_lib',
         'JSLib',
         'gtest',
         'gmock',
@@ -22,35 +24,36 @@ project 'Test'
         links 'pthread'
     configuration '*'
 
-project 'gtest'
-    kind 'StaticLib'
-    language 'C++'
-    uuid(os.uuid('gtest'))
-    files 'googletest/googletest/src/gtest-all.cc'
-    files 'googletest/googletest/include/gtest/*.h'
-    includedirs {
-        'googletest/googletest',
-        'googletest/googletest/include',
-    }
+group 'gtest'
+    project 'gtest'
+        kind 'StaticLib'
+        language 'C++'
+        uuid(os.uuid('gtest'))
+        files 'googletest/googletest/src/gtest-all.cc'
+        files 'googletest/googletest/include/gtest/*.h'
+        includedirs {
+            'googletest/googletest',
+            'googletest/googletest/include',
+        }
 
-project 'gmock'
-    kind 'StaticLib'
-    language 'C++'
-    uuid(os.uuid('gmock'))
-    files 'googletest/googlemock/src/gmock-all.cc'
-    files 'googletest/googlemock/include/gmock/*.h'
-    includedirs {
-        'googletest/googlemock',
-        'googletest/googlemock/include',
-        'googletest/googletest/include',
-    }
+    project 'gmock'
+        kind 'StaticLib'
+        language 'C++'
+        uuid(os.uuid('gmock'))
+        files 'googletest/googlemock/src/gmock-all.cc'
+        files 'googletest/googlemock/include/gmock/*.h'
+        includedirs {
+            'googletest/googlemock',
+            'googletest/googlemock/include',
+            'googletest/googletest/include',
+        }
 
-project 'gtest_main'
-    kind 'StaticLib'
-    language 'C++'
-    uuid(os.uuid('gtest_main'))
-    files 'googletest/googletest/src/gtest_main.cc'
-    includedirs {
-        'googletest/googletest',
-        'googletest/googletest/include',
-    }
+    project 'gtest_main'
+        kind 'StaticLib'
+        language 'C++'
+        uuid(os.uuid('gtest_main'))
+        files 'googletest/googletest/src/gtest_main.cc'
+        includedirs {
+            'googletest/googletest',
+            'googletest/googletest/include',
+        }
diff --git a/JSImpl/test/gmock.vcxproj b/JSImpl/test/gmock.vcxproj
index 8fbaa69..f4e2bec 100644
--- a/JSImpl/test/gmock.vcxproj
+++ b/JSImpl/test/gmock.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -114,17 +116,17 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h" />
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h" />
     <ClInclude Include="googletest\googlemock\include\gmock\gmock-actions.h" />
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h" />
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h" />
     <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-actions.h" />
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h" />
     <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-function-mockers.h" />
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h" />
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h" />
     <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-nice-strict.h" />
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h" />
     <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h" />
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h" />
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h" />
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h" />
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="googletest\googlemock\src\gmock-all.cc">
diff --git a/JSImpl/test/gmock.vcxproj.filters b/JSImpl/test/gmock.vcxproj.filters
index 01914f2..7ecdd12 100644
--- a/JSImpl/test/gmock.vcxproj.filters
+++ b/JSImpl/test/gmock.vcxproj.filters
@@ -18,37 +18,37 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h">
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-actions.h">
       <Filter>googletest\googlemock\include\gmock</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h">
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h">
       <Filter>googletest\googlemock\include\gmock</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-actions.h">
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-actions.h">
       <Filter>googletest\googlemock\include\gmock</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h">
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-function-mockers.h">
       <Filter>googletest\googlemock\include\gmock</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-actions.h">
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h">
       <Filter>googletest\googlemock\include\gmock</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h">
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-nice-strict.h">
       <Filter>googletest\googlemock\include\gmock</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-function-mockers.h">
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h">
       <Filter>googletest\googlemock\include\gmock</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h">
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h">
       <Filter>googletest\googlemock\include\gmock</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-nice-strict.h">
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h">
       <Filter>googletest\googlemock\include\gmock</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h">
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h">
       <Filter>googletest\googlemock\include\gmock</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h">
+    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h">
       <Filter>googletest\googlemock\include\gmock</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/JSImpl/test/gtest.vcxproj b/JSImpl/test/gtest.vcxproj
index 623e8f5..7adfade 100644
--- a/JSImpl/test/gtest.vcxproj
+++ b/JSImpl/test/gtest.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -114,16 +116,16 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h" />
+    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h" />
     <ClInclude Include="googletest\googletest\include\gtest\gtest-message.h" />
     <ClInclude Include="googletest\googletest\include\gtest\gtest-param-test.h" />
-    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h" />
     <ClInclude Include="googletest\googletest\include\gtest\gtest-printers.h" />
-    <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h" />
     <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h" />
-    <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h" />
+    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h" />
+    <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h" />
     <ClInclude Include="googletest\googletest\include\gtest\gtest.h" />
-    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h" />
+    <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h" />
+    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="googletest\googletest\src\gtest-all.cc">
diff --git a/JSImpl/test/gtest.vcxproj.filters b/JSImpl/test/gtest.vcxproj.filters
index 780060b..3a35c75 100644
--- a/JSImpl/test/gtest.vcxproj.filters
+++ b/JSImpl/test/gtest.vcxproj.filters
@@ -18,7 +18,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h">
+    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h">
       <Filter>googletest\googletest\include\gtest</Filter>
     </ClInclude>
     <ClInclude Include="googletest\googletest\include\gtest\gtest-message.h">
@@ -27,25 +27,25 @@
     <ClInclude Include="googletest\googletest\include\gtest\gtest-param-test.h">
       <Filter>googletest\googletest\include\gtest</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h">
-      <Filter>googletest\googletest\include\gtest</Filter>
-    </ClInclude>
     <ClInclude Include="googletest\googletest\include\gtest\gtest-printers.h">
       <Filter>googletest\googletest\include\gtest</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h">
+    <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h">
       <Filter>googletest\googletest\include\gtest</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h">
+    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h">
       <Filter>googletest\googletest\include\gtest</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h">
+    <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h">
       <Filter>googletest\googletest\include\gtest</Filter>
     </ClInclude>
     <ClInclude Include="googletest\googletest\include\gtest\gtest.h">
       <Filter>googletest\googletest\include\gtest</Filter>
     </ClInclude>
-    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h">
+    <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h">
+      <Filter>googletest\googletest\include\gtest</Filter>
+    </ClInclude>
+    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h">
       <Filter>googletest\googletest\include\gtest</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/JSImpl/test/gtest_main.vcxproj b/JSImpl/test/gtest_main.vcxproj
index 997d941..2ce7ce4 100644
--- a/JSImpl/test/gtest_main.vcxproj
+++ b/JSImpl/test/gtest_main.vcxproj
@@ -21,11 +21,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-- 
cgit v1.3.1-23-gd82d