Updates (#49)

* Use newer Win SDK to fix 2 phase parsing problem with prior release * Update test nlohmann::json to 3.3.0
jessey-git · Oct 6, 2018 · 6fc094b · 6fc094b
1 parent 93a4253
commit 6fc094b
Show file tree

Hide file tree

Showing 2 changed files with 508 additions and 494 deletions.
diff --git a/examples/viewer/viewer.vcxproj b/examples/viewer/viewer.vcxproj
@@ -15,7 +15,7 @@
     <ProjectGuid>{D49DC3E4-3F9B-4F15-8767-C2CF5735182F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>viewer</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -68,7 +68,6 @@
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\thirdparty;$(SolutionDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <EnablePREfast>false</EnablePREfast>
-      <AdditionalOptions>/Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -90,7 +89,6 @@
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\thirdparty;$(SolutionDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <EnablePREfast>false</EnablePREfast>
-      <AdditionalOptions>/Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>