From a32f54126b8e4f3f1d48228fd60bcade3af6949f Mon Sep 17 00:00:00 2001
From: Johann Muszynski <johann.muszynski@gmail.com>
Date: Tue, 28 Mar 2017 21:45:29 +0300
Subject: [PATCH] Add Visual Studio 2017 solution

---
 .gitignore                               |   6 +-
 util/libuv.py                            |  11 +-
 util/vs2017/README.md                    |   3 +
 util/vs2017/lib/wren_lib.vcxproj         | 187 ++++++++++++++++++
 util/vs2017/lib/wren_lib.vcxproj.filters |  75 ++++++++
 util/vs2017/wren.sln                     |  36 ++++
 util/vs2017/wren/wren.vcxproj            | 234 +++++++++++++++++++++++
 util/vs2017/wren/wren.vcxproj.filters    | 129 +++++++++++++
 8 files changed, 676 insertions(+), 5 deletions(-)
 create mode 100644 util/vs2017/README.md
 create mode 100644 util/vs2017/lib/wren_lib.vcxproj
 create mode 100644 util/vs2017/lib/wren_lib.vcxproj.filters
 create mode 100644 util/vs2017/wren.sln
 create mode 100644 util/vs2017/wren/wren.vcxproj
 create mode 100644 util/vs2017/wren/wren.vcxproj.filters

diff --git a/.gitignore b/.gitignore
index 316ac38a..5c293461 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,9 @@
 /wren
 
 # Intermediate files.
-/build
-/deps
+build/
+deps/
+obj/
 /.sass-cache
 *.pyc
 
@@ -24,6 +25,7 @@ xcuserdata/
 !wren_lib/
 
 # Visual Studio cache files.
+.vs/
 ipch/
 *.aps
 *.ncb
diff --git a/util/libuv.py b/util/libuv.py
index b2f23a8b..719652d7 100755
--- a/util/libuv.py
+++ b/util/libuv.py
@@ -113,8 +113,13 @@ def build_libuv_linux(arch):
   run(["make", "-C", "out", "BUILDTYPE=Release"], cwd=LIB_UV_DIR)
 
 
-def build_libuv_windows():
-  run(["cmd", "/c", "vcbuild.bat", "release"], cwd=LIB_UV_DIR)
+def build_libuv_windows(arch):
+  args = ["cmd", "/c", "vcbuild.bat", "release"]
+  if arch == "-32":
+    args.append("x86")
+  elif arch == "-64":
+    args.append("x64")
+  run(args, cwd=LIB_UV_DIR)
 
 
 def build_libuv(arch, out):
@@ -123,7 +128,7 @@ def build_libuv(arch, out):
   elif platform.system() == "Linux":
     build_libuv_linux(arch)
   elif platform.system() == "Windows":
-    build_libuv_windows()
+    build_libuv_windows(arch)
   else:
     print("Unsupported platform: " + platform.system())
     sys.exit(1)
diff --git a/util/vs2017/README.md b/util/vs2017/README.md
new file mode 100644
index 00000000..77eac2f3
--- /dev/null
+++ b/util/vs2017/README.md
@@ -0,0 +1,3 @@
+# Building on windows
+
+Building the `wren` project requires python2 to available in the path as `python`, in order to download and build the libuv dependency. The download and build of libuv is done as a pre-build step by the solution.
diff --git a/util/vs2017/lib/wren_lib.vcxproj b/util/vs2017/lib/wren_lib.vcxproj
new file mode 100644
index 00000000..824b1265
--- /dev/null
+++ b/util/vs2017/lib/wren_lib.vcxproj
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <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>{D7CC5189-C399-AC94-ECB2-9A3CD8DEE122}</ProjectGuid>
+    <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>wren_lib</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <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>..\..\..\lib\</OutDir>
+    <IntDir>obj\Win32\Debug\</IntDir>
+    <TargetName>wren_static_d</TargetName>
+    <TargetExt>.lib</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>..\..\..\lib\</OutDir>
+    <IntDir>obj\x64\Debug\</IntDir>
+    <TargetName>wren_static_d</TargetName>
+    <TargetExt>.lib</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>..\..\..\lib\</OutDir>
+    <IntDir>obj\Win32\Release\</IntDir>
+    <TargetName>wren_static</TargetName>
+    <TargetExt>.lib</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>..\..\..\lib\</OutDir>
+    <IntDir>obj\x64\Release\</IntDir>
+    <TargetName>wren_static</TargetName>
+    <TargetExt>.lib</TargetExt>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\vm;..\..\..\src\optional;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\vm;..\..\..\src\optional;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\vm;..\..\..\src\optional;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <StringPooling>true</StringPooling>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\vm;..\..\..\src\optional;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <StringPooling>true</StringPooling>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\optional\wren_opt_meta.h" />
+    <ClInclude Include="..\..\..\src\optional\wren_opt_random.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_common.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_compiler.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_core.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_debug.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_opcodes.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_primitive.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_utils.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_value.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_vm.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\optional\wren_opt_meta.c" />
+    <ClCompile Include="..\..\..\src\optional\wren_opt_random.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_compiler.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_core.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_debug.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_primitive.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_utils.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_value.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_vm.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/util/vs2017/lib/wren_lib.vcxproj.filters b/util/vs2017/lib/wren_lib.vcxproj.filters
new file mode 100644
index 00000000..cec85853
--- /dev/null
+++ b/util/vs2017/lib/wren_lib.vcxproj.filters
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="optional">
+      <UniqueIdentifier>{CB60FAAF-B72D-55BB-E046-4363CC728A49}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="vm">
+      <UniqueIdentifier>{E8795900-D405-880B-3DB4-880B295F880B}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\optional\wren_opt_meta.h">
+      <Filter>optional</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\optional\wren_opt_random.h">
+      <Filter>optional</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_common.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_compiler.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_core.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_debug.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_opcodes.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_primitive.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_utils.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_value.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_vm.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\optional\wren_opt_meta.c">
+      <Filter>optional</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\optional\wren_opt_random.c">
+      <Filter>optional</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_compiler.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_core.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_debug.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_primitive.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_utils.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_value.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_vm.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/util/vs2017/wren.sln b/util/vs2017/wren.sln
new file mode 100644
index 00000000..c4e81304
--- /dev/null
+++ b/util/vs2017/wren.sln
@@ -0,0 +1,36 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wren", "wren\wren.vcxproj", "{0143A07C-ED79-A10D-9666-8710827C1D0F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wren_lib", "lib\wren_lib.vcxproj", "{D7CC5189-C399-AC94-ECB2-9A3CD8DEE122}"
+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
+		{0143A07C-ED79-A10D-9666-8710827C1D0F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0143A07C-ED79-A10D-9666-8710827C1D0F}.Debug|Win32.Build.0 = Debug|Win32
+		{0143A07C-ED79-A10D-9666-8710827C1D0F}.Debug|x64.ActiveCfg = Debug|x64
+		{0143A07C-ED79-A10D-9666-8710827C1D0F}.Debug|x64.Build.0 = Debug|x64
+		{0143A07C-ED79-A10D-9666-8710827C1D0F}.Release|Win32.ActiveCfg = Release|Win32
+		{0143A07C-ED79-A10D-9666-8710827C1D0F}.Release|Win32.Build.0 = Release|Win32
+		{0143A07C-ED79-A10D-9666-8710827C1D0F}.Release|x64.ActiveCfg = Release|x64
+		{0143A07C-ED79-A10D-9666-8710827C1D0F}.Release|x64.Build.0 = Release|x64
+		{D7CC5189-C399-AC94-ECB2-9A3CD8DEE122}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D7CC5189-C399-AC94-ECB2-9A3CD8DEE122}.Debug|Win32.Build.0 = Debug|Win32
+		{D7CC5189-C399-AC94-ECB2-9A3CD8DEE122}.Debug|x64.ActiveCfg = Debug|x64
+		{D7CC5189-C399-AC94-ECB2-9A3CD8DEE122}.Debug|x64.Build.0 = Debug|x64
+		{D7CC5189-C399-AC94-ECB2-9A3CD8DEE122}.Release|Win32.ActiveCfg = Release|Win32
+		{D7CC5189-C399-AC94-ECB2-9A3CD8DEE122}.Release|Win32.Build.0 = Release|Win32
+		{D7CC5189-C399-AC94-ECB2-9A3CD8DEE122}.Release|x64.ActiveCfg = Release|x64
+		{D7CC5189-C399-AC94-ECB2-9A3CD8DEE122}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/util/vs2017/wren/wren.vcxproj b/util/vs2017/wren/wren.vcxproj
new file mode 100644
index 00000000..e8bd3d79
--- /dev/null
+++ b/util/vs2017/wren/wren.vcxproj
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <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>{0143A07C-ED79-A10D-9666-8710827C1D0F}</ProjectGuid>
+    <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>wren</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <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'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>..\..\..\bin\</OutDir>
+    <IntDir>obj\Win32\Debug\</IntDir>
+    <TargetName>wren_d</TargetName>
+    <TargetExt>.exe</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>..\..\..\bin\</OutDir>
+    <IntDir>obj\x64\Debug\</IntDir>
+    <TargetName>wren_d</TargetName>
+    <TargetExt>.exe</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>..\..\..\bin\</OutDir>
+    <IntDir>obj\Win32\Release\</IntDir>
+    <TargetName>wren</TargetName>
+    <TargetExt>.exe</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>..\..\..\bin\</OutDir>
+    <IntDir>obj\x64\Release\</IntDir>
+    <TargetName>wren</TargetName>
+    <TargetExt>.exe</TargetExt>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\vm;..\..\..\src\optional;..\..\..\src\module;..\..\..\src\cli;deps\libuv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libuv.lib;userenv.lib;advapi32.lib;iphlpapi.lib;psapi.lib;shell32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>deps\libuv\Release\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
+    </Link>
+    <PreBuildEvent>
+      <Command>python ../../libuv.py download
+python ../../libuv.py build -32</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\vm;..\..\..\src\optional;..\..\..\src\module;..\..\..\src\cli;deps\libuv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libuv.lib;userenv.lib;advapi32.lib;iphlpapi.lib;psapi.lib;shell32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>deps\libuv\Release\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
+    </Link>
+    <PreBuildEvent>
+      <Command>python ../../libuv.py download
+python ../../libuv.py build -64</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\vm;..\..\..\src\optional;..\..\..\src\module;..\..\..\src\cli;deps\libuv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <StringPooling>true</StringPooling>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>libuv.lib;userenv.lib;advapi32.lib;iphlpapi.lib;psapi.lib;shell32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>deps\libuv\Release\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
+    </Link>
+    <PreBuildEvent>
+      <Command>python ../../libuv.py download
+python ../../libuv.py build -32</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\vm;..\..\..\src\optional;..\..\..\src\module;..\..\..\src\cli;deps\libuv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <StringPooling>true</StringPooling>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>libuv.lib;userenv.lib;advapi32.lib;iphlpapi.lib;psapi.lib;shell32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>deps\libuv\Release\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
+    </Link>
+    <PreBuildEvent>
+      <Command>python ../../libuv.py download
+python ../../libuv.py build -64</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\cli\modules.h" />
+    <ClInclude Include="..\..\..\src\cli\vm.h" />
+    <ClInclude Include="..\..\..\src\include\wren.h" />
+    <ClInclude Include="..\..\..\src\module\io.h" />
+    <ClInclude Include="..\..\..\src\module\os.h" />
+    <ClInclude Include="..\..\..\src\module\repl.h" />
+    <ClInclude Include="..\..\..\src\module\scheduler.h" />
+    <ClInclude Include="..\..\..\src\optional\wren_opt_meta.h" />
+    <ClInclude Include="..\..\..\src\optional\wren_opt_random.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_common.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_compiler.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_core.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_debug.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_opcodes.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_primitive.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_utils.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_value.h" />
+    <ClInclude Include="..\..\..\src\vm\wren_vm.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\cli\main.c" />
+    <ClCompile Include="..\..\..\src\cli\modules.c" />
+    <ClCompile Include="..\..\..\src\cli\vm.c" />
+    <ClCompile Include="..\..\..\src\module\io.c" />
+    <ClCompile Include="..\..\..\src\module\os.c" />
+    <ClCompile Include="..\..\..\src\module\repl.c" />
+    <ClCompile Include="..\..\..\src\module\scheduler.c" />
+    <ClCompile Include="..\..\..\src\module\timer.c" />
+    <ClCompile Include="..\..\..\src\optional\wren_opt_meta.c" />
+    <ClCompile Include="..\..\..\src\optional\wren_opt_random.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_compiler.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_core.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_debug.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_primitive.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_utils.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_value.c" />
+    <ClCompile Include="..\..\..\src\vm\wren_vm.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/util/vs2017/wren/wren.vcxproj.filters b/util/vs2017/wren/wren.vcxproj.filters
new file mode 100644
index 00000000..c963c93d
--- /dev/null
+++ b/util/vs2017/wren/wren.vcxproj.filters
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="cli">
+      <UniqueIdentifier>{5D66880B-C96F-887C-52EB-9E7CBEF3937C}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include">
+      <UniqueIdentifier>{89AF369E-F58E-B539-FEA6-40106A051C9B}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="module">
+      <UniqueIdentifier>{2BC7320E-1769-5DE4-0024-7138EC64E434}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="optional">
+      <UniqueIdentifier>{CB60FAAF-B72D-55BB-E046-4363CC728A49}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="vm">
+      <UniqueIdentifier>{E8795900-D405-880B-3DB4-880B295F880B}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\cli\modules.h">
+      <Filter>cli</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\cli\vm.h">
+      <Filter>cli</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\include\wren.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\module\io.h">
+      <Filter>module</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\module\os.h">
+      <Filter>module</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\module\repl.h">
+      <Filter>module</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\module\scheduler.h">
+      <Filter>module</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\optional\wren_opt_meta.h">
+      <Filter>optional</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\optional\wren_opt_random.h">
+      <Filter>optional</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_common.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_compiler.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_core.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_debug.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_opcodes.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_primitive.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_utils.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_value.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\vm\wren_vm.h">
+      <Filter>vm</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\cli\main.c">
+      <Filter>cli</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\cli\modules.c">
+      <Filter>cli</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\cli\vm.c">
+      <Filter>cli</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\module\io.c">
+      <Filter>module</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\module\os.c">
+      <Filter>module</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\module\repl.c">
+      <Filter>module</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\module\scheduler.c">
+      <Filter>module</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\module\timer.c">
+      <Filter>module</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\optional\wren_opt_meta.c">
+      <Filter>optional</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\optional\wren_opt_random.c">
+      <Filter>optional</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_compiler.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_core.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_debug.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_primitive.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_utils.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_value.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\vm\wren_vm.c">
+      <Filter>vm</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file