Update Windows support (ray-project#317)

chagge · Jul 28, 2016 · 1961dee · 1961dee
1 parent 8248013
commit 1961dee
Show file tree

Hide file tree

Showing 12 changed files with 166 additions and 124 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -5,3 +5,7 @@ root = true
 indent_style = space
 indent_size = 2
 indent_brace_style = K&R
+
+[*.py]
+indent_style = space
+indent_size = 2
diff --git a/.gitignore b/.gitignore
@@ -50,6 +50,8 @@
 /packages
 *.suo
 *.user
+*.VC.db
+*.VC.opendb
 
 # Protobuf-generated files
 *_pb2.py

diff --git a/Ray.sln b/Ray.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ray", "vsprojects\ray.vcxproj", "{C002F9F6-8447-4B95-AA18-FB781F4A7865}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -52,19 +52,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GRPC", "GRPC", "{42700964-8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Arrow", "Arrow", "{C9B26FA8-8665-4806-872F-347ACB231CAD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arrow", "thirdparty\arrow\vsprojects\Arrow.vcxproj", "{10E7D8E8-0EEB-46EA-A58D-F9236B5960AD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arrow", "thirdparty\arrow\vsprojects\arrow.vcxproj", "{10E7D8E8-0EEB-46EA-A58D-F9236B5960AD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5B5857E1-64E2-4CED-A12E-45E1B3880496} = {5B5857E1-64E2-4CED-A12E-45E1B3880496}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flatc", "thirdparty\arrow\cpp\thirdparty\flatbuffers\build_ide\VS2010\flatc.vcxproj", "{5B5857E1-64E2-4CED-A12E-45E1B3880496}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Flat Buffers", "Flat Buffers", "{ACA43A22-BCCD-487F-B92F-8EB0D6FF1DA4}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "protobuf", "protobuf", "{B60F9088-C9BD-4D2B-ADE7-2FE1F993FE06}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GRPC ProtoC Plugins", "GRPC ProtoC Plugins", "{27D6F599-4536-4C67-85E5-3B1FD6A1D5A9}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_plugin_support", "thirdparty\grpc\vsprojects\vcxproj\grpc_plugin_support\grpc_plugin_support.vcxproj", "{B6E81D84-2ACB-41B8-8781-493A944C7817}"
 	ProjectSection(myProperties) = preProject
 		        	lib = "True"
@@ -88,6 +82,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotobuf", "thirdparty\g
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotoc", "thirdparty\grpc\third_party\protobuf\vsprojects\libprotoc.vcxproj", "{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "numbuf", "thirdparty\numbuf\vsprojects\numbuf.vcxproj", "{609D1438-D42D-4CBA-80A5-A1398C3BCC85}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -208,6 +204,14 @@ Global
 		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}.Release|Win32.Build.0 = Release|Win32
 		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}.Release|x64.ActiveCfg = Release|x64
 		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087}.Release|x64.Build.0 = Release|x64
+		{609D1438-D42D-4CBA-80A5-A1398C3BCC85}.Debug|Win32.ActiveCfg = Debug|Win32
+		{609D1438-D42D-4CBA-80A5-A1398C3BCC85}.Debug|Win32.Build.0 = Debug|Win32
+		{609D1438-D42D-4CBA-80A5-A1398C3BCC85}.Debug|x64.ActiveCfg = Debug|x64
+		{609D1438-D42D-4CBA-80A5-A1398C3BCC85}.Debug|x64.Build.0 = Debug|x64
+		{609D1438-D42D-4CBA-80A5-A1398C3BCC85}.Release|Win32.ActiveCfg = Release|Win32
+		{609D1438-D42D-4CBA-80A5-A1398C3BCC85}.Release|Win32.Build.0 = Release|Win32
+		{609D1438-D42D-4CBA-80A5-A1398C3BCC85}.Release|x64.ActiveCfg = Release|x64
+		{609D1438-D42D-4CBA-80A5-A1398C3BCC85}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -217,14 +221,11 @@ Global
 		{29D16885-7228-4C31-81ED-5F9187C7F2A9} = {42700964-831F-4B47-B556-75CBCCA48D8E}
 		{C187A093-A0FE-489D-A40A-6E33DE0F9FEB} = {42700964-831F-4B47-B556-75CBCCA48D8E}
 		{10E7D8E8-0EEB-46EA-A58D-F9236B5960AD} = {C9B26FA8-8665-4806-872F-347ACB231CAD}
-		{5B5857E1-64E2-4CED-A12E-45E1B3880496} = {ACA43A22-BCCD-487F-B92F-8EB0D6FF1DA4}
-		{ACA43A22-BCCD-487F-B92F-8EB0D6FF1DA4} = {C9B26FA8-8665-4806-872F-347ACB231CAD}
-		{B60F9088-C9BD-4D2B-ADE7-2FE1F993FE06} = {27D6F599-4536-4C67-85E5-3B1FD6A1D5A9}
-		{27D6F599-4536-4C67-85E5-3B1FD6A1D5A9} = {42700964-831F-4B47-B556-75CBCCA48D8E}
-		{B6E81D84-2ACB-41B8-8781-493A944C7817} = {27D6F599-4536-4C67-85E5-3B1FD6A1D5A9}
-		{7E51A25F-AC59-488F-906C-C60FAAE706AA} = {27D6F599-4536-4C67-85E5-3B1FD6A1D5A9}
-		{DB653289-E887-4B13-AC08-EE3EAC1F34C9} = {B60F9088-C9BD-4D2B-ADE7-2FE1F993FE06}
-		{07ABD431-1515-4140-932E-E8C150FF7D1A} = {B60F9088-C9BD-4D2B-ADE7-2FE1F993FE06}
-		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087} = {B60F9088-C9BD-4D2B-ADE7-2FE1F993FE06}
+		{5B5857E1-64E2-4CED-A12E-45E1B3880496} = {C9B26FA8-8665-4806-872F-347ACB231CAD}
+		{B6E81D84-2ACB-41B8-8781-493A944C7817} = {42700964-831F-4B47-B556-75CBCCA48D8E}
+		{7E51A25F-AC59-488F-906C-C60FAAE706AA} = {42700964-831F-4B47-B556-75CBCCA48D8E}
+		{DB653289-E887-4B13-AC08-EE3EAC1F34C9} = {42700964-831F-4B47-B556-75CBCCA48D8E}
+		{07ABD431-1515-4140-932E-E8C150FF7D1A} = {42700964-831F-4B47-B556-75CBCCA48D8E}
+		{2B4F3BB4-ADDE-4CB7-B832-C964DE4E0087} = {42700964-831F-4B47-B556-75CBCCA48D8E}
 	EndGlobalSection
 EndGlobal
diff --git a/thirdparty/download_thirdparty.bat b/thirdparty/download_thirdparty.bat
@@ -1,12 +1,9 @@
 @SetLocal
 	@Echo Off
 	@PushD "%~dp0"
-		If Not Exist "arrow\.git"  git clone  --recursive --branch windows_with_submodules "https://github.com/pcmoritz/arrow.git"
-		If Not Exist "python\.git" git clone                                               "https://github.com/austinsc/python.git"
-		git                                                     submodule update --init
-		git -C "arrow"                                          submodule update --init
-		git -C "grpc"                                           submodule update --init "third_party/protobuf"
-		git -C "grpc"                                           submodule update --init "third_party/nanopb"
+		git                                                     submodule update --init --jobs="%NUMBER_OF_PROCESSORS%"
+		git -C "arrow"                                          submodule update --init --jobs="%NUMBER_OF_PROCESSORS%"
+		git -C "grpc"                                           submodule update --init --jobs="%NUMBER_OF_PROCESSORS%" -- "third_party/nanopb" "third_party/protobuf"
 		Call :GitApply "grpc"                                   "%CD%/patches/grpc-source.patch"
 		Call :GitApply "grpc"                                   "%CD%/patches/windows/grpc-projects.patch"
 		Call :GitApply "grpc/third_party/protobuf"              "%CD%/patches/windows/protobuf-projects.patch"
@@ -18,5 +15,5 @@
 
 :GitApply <ChangeToFolder> <Patch>
 	@REM Check if patch already applied by attempting to apply it in reverse; if not, then force-reapply it
-	git -C "%~1" apply --3way "%~2" -R --check 2> NUL || git -C "%~1" reset --hard && git -C "%~1" apply --3way "%~2"
+	git -C "%~1" apply "%~2" -R --check 2> NUL || git -C "%~1" apply "%~2" --3way 2> NUL || git -C "%~1" reset --hard && git -C "%~1" apply "%~2" --3way
 @GoTo :EOF
diff --git a/vsprojects/base.props b/vsprojects/base.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <THIRD_PARTY>$(ProjectDir)..\thirdparty\</THIRD_PARTY>
+    <THIRD_PARTY>$(SolutionDir)thirdparty\</THIRD_PARTY>
   </PropertyGroup>
   <PropertyGroup>
     <OutDir>$(SolutionDir)build\$(Platform)\$(Configuration)\</OutDir>
@@ -16,7 +16,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(PYTHONHOME)\Lib\site-packages\numpy\core\include;$(THIRD_PARTY)python\inc;$(THIRD_PARTY)python\inc\Windows;$(ProjectDir)..\build\generated;$(ProjectDir)..\include;$(THIRD_PARTY)numbuf\cpp\src;$(THIRD_PARTY)numbuf\python\src;$(THIRD_PARTY)grpc\include;$(THIRD_PARTY)grpc\third_party\protobuf\src;$(THIRD_PARTY)arrow\cpp\src;$(BOOST_ROOT);$(BOOST_ROOT)\libs\interprocess\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(PYTHONHOME)\Lib\site-packages\numpy\core\include;$(THIRD_PARTY)python\inc;$(THIRD_PARTY)python\inc\Windows;$(ProjectDir)..\build\generated;$(ProjectDir)..\include;$(THIRD_PARTY)numbuf\cpp\src;$(THIRD_PARTY)numbuf\python\src;$(THIRD_PARTY)grpc\include;$(THIRD_PARTY)grpc\third_party\protobuf\src;$(BOOST_ROOT);$(BOOST_ROOT)\libs\interprocess\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0600;BOOST_DATE_TIME_NO_LIB=1;HAVE_ROUND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4191;;4100;4371;4514;4571;4619;4668;4710;4820</DisableSpecificWarnings>
       <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>

diff --git a/vsprojects/objstore.vcxproj b/vsprojects/objstore.vcxproj
@@ -34,7 +34,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="base.props" />
+    <Import Project="$(SolutionDir)vsprojects\base.props" Condition="exists('$(SolutionDir)vsprojects\base.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>

diff --git a/vsprojects/ray.vcxproj b/vsprojects/ray.vcxproj
@@ -35,7 +35,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Base.props" />
+    <Import Project="$(SolutionDir)vsprojects\base.props" Condition="exists('$(SolutionDir)vsprojects\base.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
@@ -79,6 +79,8 @@
     <ClInclude Include="..\build\generated\ray.pb.h" />
     <ClInclude Include="..\build\generated\types.grpc.pb.h" />
     <ClInclude Include="..\build\generated\types.pb.h" />
+    <ClInclude Include="..\include\ray\logging.h" />
+    <ClInclude Include="..\include\ray\ray.h" />
     <ClInclude Include="..\src\ipc.h" />
     <ClInclude Include="..\src\utils.h" />
   </ItemGroup>
@@ -113,9 +115,6 @@ protoc --proto_path="$(SolutionDir)protos" --python_out="$(ProjectDir)..\lib\pyt
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\thirdparty\arrow\vsprojects\Arrow.vcxproj">
-      <Project>{10e7d8e8-0eeb-46ea-a58d-f9236b5960ad}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\thirdparty\grpc\third_party\protobuf\vsprojects\libprotobuf.vcxproj">
       <Project>{07abd431-1515-4140-932e-e8c150ff7d1a}</Project>
     </ProjectReference>

diff --git a/vsprojects/ray.vcxproj.filters b/vsprojects/ray.vcxproj.filters
@@ -74,6 +74,12 @@
     <ClInclude Include="..\build\generated\types.pb.h">
       <Filter>Header Files\protobufs</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\ray\logging.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\ray\ray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\protos\ray.proto" />

diff --git a/vsprojects/raylib.vcxproj b/vsprojects/raylib.vcxproj
@@ -34,7 +34,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="base.props" />
+    <Import Project="$(SolutionDir)vsprojects\base.props" Condition="exists('$(SolutionDir)vsprojects\base.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -49,31 +49,14 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\src\worker.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\dict.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\metadata.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\tensor.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\types.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\buffer.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\logging.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\utils.h" />
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\numpy.h" />
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\python.h" />
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\serialize.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\raylib.cc" />
     <ClCompile Include="..\src\worker.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\dict.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\metadata.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\tensor.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\types.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\numpy.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\python.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\serialize.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\thirdparty\arrow\vsprojects\Arrow.vcxproj">
-      <Project>{10e7d8e8-0eeb-46ea-a58d-f9236b5960ad}</Project>
+    <ProjectReference Include="..\thirdparty\numbuf\vsprojects\numbuf.vcxproj">
+      <Project>{609d1438-d42d-4cba-80a5-a1398c3bcc85}</Project>
     </ProjectReference>
     <ProjectReference Include="Ray.vcxproj">
       <Project>{c002f9f6-8447-4b95-aa18-fb781f4a7865}</Project>

diff --git a/vsprojects/raylib.vcxproj.filters b/vsprojects/raylib.vcxproj.filters
@@ -13,27 +13,6 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Header Files\pynumbuf">
-      <UniqueIdentifier>{670b10a8-e1e8-4cba-ab9f-13bcd990ccec}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\pynumbuf">
-      <UniqueIdentifier>{c187b201-02bc-4abc-a53c-f7173bd7520a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\numbuf">
-      <UniqueIdentifier>{d6d2cf0f-350f-4ba4-a009-23342f47a731}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\numbuf">
-      <UniqueIdentifier>{43371834-59c6-46eb-a97b-0a17501d3175}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\numbuf\util">
-      <UniqueIdentifier>{873d1bc4-095c-407b-a6ff-066cb88ca022}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\pynumbuf\adapters">
-      <UniqueIdentifier>{3222a6d7-2377-4be1-8aa1-d856d756047d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\pynumbuf\adapters">
-      <UniqueIdentifier>{052fd44b-f361-47b9-b341-140b050baa85}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\raylib.cc">
@@ -42,61 +21,10 @@
     <ClCompile Include="..\src\worker.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\serialize.cc">
-      <Filter>Source Files\pynumbuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\dict.cc">
-      <Filter>Source Files\numbuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\metadata.cc">
-      <Filter>Source Files\numbuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\tensor.cc">
-      <Filter>Source Files\numbuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\types.cc">
-      <Filter>Source Files\numbuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\numpy.cc">
-      <Filter>Source Files\pynumbuf\adapters</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\python.cc">
-      <Filter>Source Files\pynumbuf\adapters</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\worker.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\serialize.h">
-      <Filter>Header Files\pynumbuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\dict.h">
-      <Filter>Header Files\numbuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\metadata.h">
-      <Filter>Header Files\numbuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\tensor.h">
-      <Filter>Header Files\numbuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\types.h">
-      <Filter>Header Files\numbuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\buffer.h">
-      <Filter>Header Files\numbuf\util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\logging.h">
-      <Filter>Header Files\numbuf\util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\utils.h">
-      <Filter>Header Files\numbuf\util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\numpy.h">
-      <Filter>Header Files\pynumbuf\adapters</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\python.h">
-      <Filter>Header Files\pynumbuf\adapters</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/vsprojects/scheduler.vcxproj b/vsprojects/scheduler.vcxproj
@@ -34,7 +34,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="base.props" />
+    <Import Project="$(SolutionDir)vsprojects\base.props" Condition="exists('$(SolutionDir)vsprojects\base.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>