From 37c8aeafa9f98ef4a3d5d8dedafd1c3cf6fbe74b Mon Sep 17 00:00:00 2001
From: Don Cross <cosinekitty@gmail.com>
Date: Sun, 9 Jan 2022 12:55:41 -0500
Subject: [PATCH] Moved 'windows' directory away from root.

The 'windows' directory is mainly useful for
maintainers, not end users. So I moved it out of
the root to reduce distraction for a first-time
visitor.

While I was fixing up resulting breakage in
Visual Studio project files, I noticed I still had
some hard-coded absolute paths that would only work
on my own Windows laptop (e.g. "c:\don\github\astronomy").
I replaced those with relative paths that will work
regardless of what directory the repo is cloned into.
---
 generate/build.bat                            |  2 +-
 {windows => generate/windows}/.gitignore      |  0
 .../windows}/ctest/ctest.vcxproj              | 14 ++---
 .../windows}/ctest/ctest.vcxproj.filters      |  6 +-
 .../examples/culminate/culminate.vcxproj      | 18 +++---
 .../culminate/culminate.vcxproj.filters       | 10 +--
 .../windows}/examples/examples.sln            |  0
 .../examples/moonphase/moonphase.vcxproj      | 18 +++---
 .../moonphase/moonphase.vcxproj.filters       | 10 +--
 .../examples/positions/positions.vcxproj      | 18 +++---
 .../positions/positions.vcxproj.filters       | 10 +--
 .../windows}/examples/riseset/riseset.vcxproj | 10 +--
 .../examples/riseset/riseset.vcxproj.filters  | 10 +--
 .../windows}/examples/seasons/seasons.vcxproj | 10 +--
 .../examples/seasons/seasons.vcxproj.filters  | 10 +--
 .../windows}/generate/generate.sln            |  0
 .../windows}/generate/generate.vcxproj        | 62 +++++++++----------
 .../generate/generate.vcxproj.filters         | 54 ++++++++--------
 18 files changed, 131 insertions(+), 131 deletions(-)
 rename {windows => generate/windows}/.gitignore (100%)
 rename {windows => generate/windows}/ctest/ctest.vcxproj (91%)
 rename {windows => generate/windows}/ctest/ctest.vcxproj.filters (85%)
 rename {windows => generate/windows}/examples/culminate/culminate.vcxproj (86%)
 rename {windows => generate/windows}/examples/culminate/culminate.vcxproj.filters (78%)
 rename {windows => generate/windows}/examples/examples.sln (100%)
 rename {windows => generate/windows}/examples/moonphase/moonphase.vcxproj (87%)
 rename {windows => generate/windows}/examples/moonphase/moonphase.vcxproj.filters (78%)
 rename {windows => generate/windows}/examples/positions/positions.vcxproj (87%)
 rename {windows => generate/windows}/examples/positions/positions.vcxproj.filters (78%)
 rename {windows => generate/windows}/examples/riseset/riseset.vcxproj (95%)
 rename {windows => generate/windows}/examples/riseset/riseset.vcxproj.filters (78%)
 rename {windows => generate/windows}/examples/seasons/seasons.vcxproj (95%)
 rename {windows => generate/windows}/examples/seasons/seasons.vcxproj.filters (78%)
 rename {windows => generate/windows}/generate/generate.sln (100%)
 rename {windows => generate/windows}/generate/generate.vcxproj (74%)
 rename {windows => generate/windows}/generate/generate.vcxproj.filters (60%)

diff --git a/generate/build.bat b/generate/build.bat
index a79d30c0..87a2ba88 100644
--- a/generate/build.bat
+++ b/generate/build.bat
@@ -9,7 +9,7 @@ if not exist "!msbuild!" (
 echo.Building C code
 
 set OUTDIR=%cd%\bin\
-"!msbuild!" ..\windows\generate\generate.sln /p:Configuration=Release /v:quiet /nologo /p:clp=Summary
+"!msbuild!" windows\generate\generate.sln /p:Configuration=Release /v:quiet /nologo /p:clp=Summary
 if errorlevel 1 (
     echo.BUILD FAILED.
     exit /b 1
diff --git a/windows/.gitignore b/generate/windows/.gitignore
similarity index 100%
rename from windows/.gitignore
rename to generate/windows/.gitignore
diff --git a/windows/ctest/ctest.vcxproj b/generate/windows/ctest/ctest.vcxproj
similarity index 91%
rename from windows/ctest/ctest.vcxproj
rename to generate/windows/ctest/ctest.vcxproj
index a901d157..fd4d3af1 100644
--- a/windows/ctest/ctest.vcxproj
+++ b/generate/windows/ctest/ctest.vcxproj
@@ -88,7 +88,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
@@ -103,7 +103,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
@@ -120,7 +120,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
@@ -139,7 +139,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
@@ -150,11 +150,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\generate\ctest.c" />
-    <ClCompile Include="..\..\source\c\astronomy.c" />
+    <ClCompile Include="..\..\..\generate\ctest.c" />
+    <ClCompile Include="..\..\..\source\c\astronomy.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\source\c\astronomy.h" />
+    <ClInclude Include="..\..\..\source\c\astronomy.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/windows/ctest/ctest.vcxproj.filters b/generate/windows/ctest/ctest.vcxproj.filters
similarity index 85%
rename from windows/ctest/ctest.vcxproj.filters
rename to generate/windows/ctest/ctest.vcxproj.filters
index f6e9e9d3..1d689187 100644
--- a/windows/ctest/ctest.vcxproj.filters
+++ b/generate/windows/ctest/ctest.vcxproj.filters
@@ -15,15 +15,15 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\source\c\astronomy.c">
+    <ClCompile Include="..\..\..\source\c\astronomy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\ctest.c">
+    <ClCompile Include="..\..\..\generate\ctest.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\source\c\astronomy.h">
+    <ClInclude Include="..\..\..\source\c\astronomy.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/windows/examples/culminate/culminate.vcxproj b/generate/windows/examples/culminate/culminate.vcxproj
similarity index 86%
rename from windows/examples/culminate/culminate.vcxproj
rename to generate/windows/examples/culminate/culminate.vcxproj
index 2fae14c4..8382119d 100644
--- a/windows/examples/culminate/culminate.vcxproj
+++ b/generate/windows/examples/culminate/culminate.vcxproj
@@ -74,7 +74,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\demo\c;C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\demo\c;C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -83,7 +83,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\demo\c;C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\c;C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -94,7 +94,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\demo\c;C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\demo\c;C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -109,7 +109,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\demo\c;C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\demo\c;C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -118,13 +118,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demo\c\astro_demo_common.c" />
-    <ClCompile Include="..\..\..\demo\c\culminate.c" />
-    <ClCompile Include="..\..\..\source\c\astronomy.c" />
+    <ClCompile Include="..\..\..\..\demo\c\astro_demo_common.c" />
+    <ClCompile Include="..\..\..\..\demo\c\culminate.c" />
+    <ClCompile Include="..\..\..\..\source\c\astronomy.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\demo\c\astro_demo_common.h" />
-    <ClInclude Include="..\..\..\source\c\astronomy.h" />
+    <ClInclude Include="..\..\..\..\demo\c\astro_demo_common.h" />
+    <ClInclude Include="..\..\..\..\source\c\astronomy.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/windows/examples/culminate/culminate.vcxproj.filters b/generate/windows/examples/culminate/culminate.vcxproj.filters
similarity index 78%
rename from windows/examples/culminate/culminate.vcxproj.filters
rename to generate/windows/examples/culminate/culminate.vcxproj.filters
index 5b8c5bb8..532790dc 100644
--- a/windows/examples/culminate/culminate.vcxproj.filters
+++ b/generate/windows/examples/culminate/culminate.vcxproj.filters
@@ -15,21 +15,21 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demo\c\culminate.c">
+    <ClCompile Include="..\..\..\..\demo\c\culminate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\demo\c\astro_demo_common.c">
+    <ClCompile Include="..\..\..\..\demo\c\astro_demo_common.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\c\astronomy.c">
+    <ClCompile Include="..\..\..\..\source\c\astronomy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\demo\c\astro_demo_common.h">
+    <ClInclude Include="..\..\..\..\demo\c\astro_demo_common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\c\astronomy.h">
+    <ClInclude Include="..\..\..\..\source\c\astronomy.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/windows/examples/examples.sln b/generate/windows/examples/examples.sln
similarity index 100%
rename from windows/examples/examples.sln
rename to generate/windows/examples/examples.sln
diff --git a/windows/examples/moonphase/moonphase.vcxproj b/generate/windows/examples/moonphase/moonphase.vcxproj
similarity index 87%
rename from windows/examples/moonphase/moonphase.vcxproj
rename to generate/windows/examples/moonphase/moonphase.vcxproj
index 101a43d1..5bed5ce9 100644
--- a/windows/examples/moonphase/moonphase.vcxproj
+++ b/generate/windows/examples/moonphase/moonphase.vcxproj
@@ -75,7 +75,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -84,7 +84,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -95,7 +95,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -110,7 +110,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -119,13 +119,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demo\c\astro_demo_common.c" />
-    <ClCompile Include="..\..\..\demo\c\moonphase.c" />
-    <ClCompile Include="..\..\..\source\c\astronomy.c" />
+    <ClCompile Include="..\..\..\..\demo\c\astro_demo_common.c" />
+    <ClCompile Include="..\..\..\..\demo\c\moonphase.c" />
+    <ClCompile Include="..\..\..\..\source\c\astronomy.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\demo\c\astro_demo_common.h" />
-    <ClInclude Include="..\..\..\source\c\astronomy.h" />
+    <ClInclude Include="..\..\..\..\demo\c\astro_demo_common.h" />
+    <ClInclude Include="..\..\..\..\source\c\astronomy.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/windows/examples/moonphase/moonphase.vcxproj.filters b/generate/windows/examples/moonphase/moonphase.vcxproj.filters
similarity index 78%
rename from windows/examples/moonphase/moonphase.vcxproj.filters
rename to generate/windows/examples/moonphase/moonphase.vcxproj.filters
index 5c4493ea..e7c63c97 100644
--- a/windows/examples/moonphase/moonphase.vcxproj.filters
+++ b/generate/windows/examples/moonphase/moonphase.vcxproj.filters
@@ -15,21 +15,21 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demo\c\moonphase.c">
+    <ClCompile Include="..\..\..\..\demo\c\moonphase.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\c\astronomy.c">
+    <ClCompile Include="..\..\..\..\source\c\astronomy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\demo\c\astro_demo_common.c">
+    <ClCompile Include="..\..\..\..\demo\c\astro_demo_common.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\c\astronomy.h">
+    <ClInclude Include="..\..\..\..\source\c\astronomy.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\demo\c\astro_demo_common.h">
+    <ClInclude Include="..\..\..\..\demo\c\astro_demo_common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/windows/examples/positions/positions.vcxproj b/generate/windows/examples/positions/positions.vcxproj
similarity index 87%
rename from windows/examples/positions/positions.vcxproj
rename to generate/windows/examples/positions/positions.vcxproj
index 14739d2d..a782f656 100644
--- a/windows/examples/positions/positions.vcxproj
+++ b/generate/windows/examples/positions/positions.vcxproj
@@ -74,7 +74,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -83,7 +83,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -94,7 +94,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -109,7 +109,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\source\c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -118,13 +118,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demo\c\astro_demo_common.c" />
-    <ClCompile Include="..\..\..\demo\c\positions.c" />
-    <ClCompile Include="..\..\..\source\c\astronomy.c" />
+    <ClCompile Include="..\..\..\..\demo\c\astro_demo_common.c" />
+    <ClCompile Include="..\..\..\..\demo\c\positions.c" />
+    <ClCompile Include="..\..\..\..\source\c\astronomy.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\demo\c\astro_demo_common.h" />
-    <ClInclude Include="..\..\..\source\c\astronomy.h" />
+    <ClInclude Include="..\..\..\..\demo\c\astro_demo_common.h" />
+    <ClInclude Include="..\..\..\..\source\c\astronomy.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/windows/examples/positions/positions.vcxproj.filters b/generate/windows/examples/positions/positions.vcxproj.filters
similarity index 78%
rename from windows/examples/positions/positions.vcxproj.filters
rename to generate/windows/examples/positions/positions.vcxproj.filters
index 21a64aa9..e3d131d5 100644
--- a/windows/examples/positions/positions.vcxproj.filters
+++ b/generate/windows/examples/positions/positions.vcxproj.filters
@@ -15,21 +15,21 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demo\c\positions.c">
+    <ClCompile Include="..\..\..\..\demo\c\positions.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\c\astronomy.c">
+    <ClCompile Include="..\..\..\..\source\c\astronomy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\demo\c\astro_demo_common.c">
+    <ClCompile Include="..\..\..\..\demo\c\astro_demo_common.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\demo\c\astro_demo_common.h">
+    <ClInclude Include="..\..\..\..\demo\c\astro_demo_common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\c\astronomy.h">
+    <ClInclude Include="..\..\..\..\source\c\astronomy.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/windows/examples/riseset/riseset.vcxproj b/generate/windows/examples/riseset/riseset.vcxproj
similarity index 95%
rename from windows/examples/riseset/riseset.vcxproj
rename to generate/windows/examples/riseset/riseset.vcxproj
index 58f7cf7b..7ba2cdf5 100644
--- a/windows/examples/riseset/riseset.vcxproj
+++ b/generate/windows/examples/riseset/riseset.vcxproj
@@ -118,13 +118,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demo\c\astro_demo_common.c" />
-    <ClCompile Include="..\..\..\demo\c\riseset.c" />
-    <ClCompile Include="..\..\..\source\c\astronomy.c" />
+    <ClCompile Include="..\..\..\..\demo\c\astro_demo_common.c" />
+    <ClCompile Include="..\..\..\..\demo\c\riseset.c" />
+    <ClCompile Include="..\..\..\..\source\c\astronomy.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\demo\c\astro_demo_common.h" />
-    <ClInclude Include="..\..\..\source\c\astronomy.h" />
+    <ClInclude Include="..\..\..\..\demo\c\astro_demo_common.h" />
+    <ClInclude Include="..\..\..\..\source\c\astronomy.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/windows/examples/riseset/riseset.vcxproj.filters b/generate/windows/examples/riseset/riseset.vcxproj.filters
similarity index 78%
rename from windows/examples/riseset/riseset.vcxproj.filters
rename to generate/windows/examples/riseset/riseset.vcxproj.filters
index 0c51754e..4f211b00 100644
--- a/windows/examples/riseset/riseset.vcxproj.filters
+++ b/generate/windows/examples/riseset/riseset.vcxproj.filters
@@ -15,21 +15,21 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demo\c\astro_demo_common.c">
+    <ClCompile Include="..\..\..\..\demo\c\astro_demo_common.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\demo\c\riseset.c">
+    <ClCompile Include="..\..\..\..\demo\c\riseset.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\c\astronomy.c">
+    <ClCompile Include="..\..\..\..\source\c\astronomy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\c\astronomy.h">
+    <ClInclude Include="..\..\..\..\source\c\astronomy.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\demo\c\astro_demo_common.h">
+    <ClInclude Include="..\..\..\..\demo\c\astro_demo_common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/windows/examples/seasons/seasons.vcxproj b/generate/windows/examples/seasons/seasons.vcxproj
similarity index 95%
rename from windows/examples/seasons/seasons.vcxproj
rename to generate/windows/examples/seasons/seasons.vcxproj
index 4e38e900..0f8d7b10 100644
--- a/windows/examples/seasons/seasons.vcxproj
+++ b/generate/windows/examples/seasons/seasons.vcxproj
@@ -118,13 +118,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demo\c\astro_demo_common.c" />
-    <ClCompile Include="..\..\..\demo\c\seasons.c" />
-    <ClCompile Include="..\..\..\source\c\astronomy.c" />
+    <ClCompile Include="..\..\..\..\demo\c\astro_demo_common.c" />
+    <ClCompile Include="..\..\..\..\demo\c\seasons.c" />
+    <ClCompile Include="..\..\..\..\source\c\astronomy.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\demo\c\astro_demo_common.h" />
-    <ClInclude Include="..\..\..\source\c\astronomy.h" />
+    <ClInclude Include="..\..\..\..\demo\c\astro_demo_common.h" />
+    <ClInclude Include="..\..\..\..\source\c\astronomy.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/windows/examples/seasons/seasons.vcxproj.filters b/generate/windows/examples/seasons/seasons.vcxproj.filters
similarity index 78%
rename from windows/examples/seasons/seasons.vcxproj.filters
rename to generate/windows/examples/seasons/seasons.vcxproj.filters
index 898a068f..2818fced 100644
--- a/windows/examples/seasons/seasons.vcxproj.filters
+++ b/generate/windows/examples/seasons/seasons.vcxproj.filters
@@ -15,21 +15,21 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demo\c\astro_demo_common.c">
+    <ClCompile Include="..\..\..\..\demo\c\astro_demo_common.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\demo\c\seasons.c">
+    <ClCompile Include="..\..\..\..\demo\c\seasons.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\c\astronomy.c">
+    <ClCompile Include="..\..\..\..\source\c\astronomy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\c\astronomy.h">
+    <ClInclude Include="..\..\..\..\source\c\astronomy.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\demo\c\astro_demo_common.h">
+    <ClInclude Include="..\..\..\..\demo\c\astro_demo_common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/windows/generate/generate.sln b/generate/windows/generate/generate.sln
similarity index 100%
rename from windows/generate/generate.sln
rename to generate/windows/generate/generate.sln
diff --git a/windows/generate/generate.vcxproj b/generate/windows/generate/generate.vcxproj
similarity index 74%
rename from windows/generate/generate.vcxproj
rename to generate/windows/generate/generate.vcxproj
index 407c650a..e67d3a3b 100644
--- a/windows/generate/generate.vcxproj
+++ b/generate/windows/generate/generate.vcxproj
@@ -88,7 +88,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\generate\vsop;C:\don\github\astronomy\generate\novas;C:\don\github\astronomy\generate\top2013;C:\don\github\astronomy\generate;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\vsop;..\..\novas;..\..\top2013;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
@@ -103,7 +103,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\generate\vsop;C:\don\github\astronomy\generate\novas;C:\don\github\astronomy\generate\top2013;C:\don\github\astronomy\generate;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\vsop;..\..\novas;..\..\top2013;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
@@ -120,7 +120,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\generate\vsop;C:\don\github\astronomy\generate\novas;C:\don\github\astronomy\generate\top2013;C:\don\github\astronomy\generate;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\vsop;..\..\novas;..\..\top2013;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
@@ -139,7 +139,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\don\github\astronomy\generate\vsop;C:\don\github\astronomy\generate\novas;C:\don\github\astronomy\generate\top2013;C:\don\github\astronomy\generate;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\vsop;..\..\novas;..\..\top2013;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
@@ -150,35 +150,35 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\generate\astro_vector.c" />
-    <ClCompile Include="..\..\generate\chebyshev.c" />
-    <ClCompile Include="..\..\generate\codegen.c" />
-    <ClCompile Include="..\..\generate\earth.c" />
-    <ClCompile Include="..\..\generate\ephfile.c" />
-    <ClCompile Include="..\..\generate\generate.c" />
-    <ClCompile Include="..\..\generate\novas\eph_manager.c" />
-    <ClCompile Include="..\..\generate\novas\novas.c" />
-    <ClCompile Include="..\..\generate\novas\novascon.c" />
-    <ClCompile Include="..\..\generate\novas\nutation.c" />
-    <ClCompile Include="..\..\generate\novas\readeph0.c" />
-    <ClCompile Include="..\..\generate\novas\solsys1.c" />
-    <ClCompile Include="..\..\generate\top2013\top2013.c" />
-    <ClCompile Include="..\..\generate\vsop\vsop.c" />
+    <ClCompile Include="..\..\astro_vector.c" />
+    <ClCompile Include="..\..\chebyshev.c" />
+    <ClCompile Include="..\..\codegen.c" />
+    <ClCompile Include="..\..\earth.c" />
+    <ClCompile Include="..\..\ephfile.c" />
+    <ClCompile Include="..\..\generate.c" />
+    <ClCompile Include="..\..\novas\eph_manager.c" />
+    <ClCompile Include="..\..\novas\novas.c" />
+    <ClCompile Include="..\..\novas\novascon.c" />
+    <ClCompile Include="..\..\novas\nutation.c" />
+    <ClCompile Include="..\..\novas\readeph0.c" />
+    <ClCompile Include="..\..\novas\solsys1.c" />
+    <ClCompile Include="..\..\top2013\top2013.c" />
+    <ClCompile Include="..\..\vsop\vsop.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\generate\astro_vector.h" />
-    <ClInclude Include="..\..\generate\chebyshev.h" />
-    <ClInclude Include="..\..\generate\codegen.h" />
-    <ClInclude Include="..\..\generate\earth.h" />
-    <ClInclude Include="..\..\generate\ephfile.h" />
-    <ClInclude Include="..\..\generate\novas\eph_manager.h" />
-    <ClInclude Include="..\..\generate\novas\novas.h" />
-    <ClInclude Include="..\..\generate\novas\novascon.h" />
-    <ClInclude Include="..\..\generate\novas\nutation.h" />
-    <ClInclude Include="..\..\generate\novas\solarsystem.h" />
-    <ClInclude Include="..\..\generate\novas_body.h" />
-    <ClInclude Include="..\..\generate\top2013\top2013.h" />
-    <ClInclude Include="..\..\generate\vsop\vsop.h" />
+    <ClInclude Include="..\..\astro_vector.h" />
+    <ClInclude Include="..\..\chebyshev.h" />
+    <ClInclude Include="..\..\codegen.h" />
+    <ClInclude Include="..\..\earth.h" />
+    <ClInclude Include="..\..\ephfile.h" />
+    <ClInclude Include="..\..\novas\eph_manager.h" />
+    <ClInclude Include="..\..\novas\novas.h" />
+    <ClInclude Include="..\..\novas\novascon.h" />
+    <ClInclude Include="..\..\novas\nutation.h" />
+    <ClInclude Include="..\..\novas\solarsystem.h" />
+    <ClInclude Include="..\..\novas_body.h" />
+    <ClInclude Include="..\..\top2013\top2013.h" />
+    <ClInclude Include="..\..\vsop\vsop.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/windows/generate/generate.vcxproj.filters b/generate/windows/generate/generate.vcxproj.filters
similarity index 60%
rename from windows/generate/generate.vcxproj.filters
rename to generate/windows/generate/generate.vcxproj.filters
index 08c7bce9..dfdac087 100644
--- a/windows/generate/generate.vcxproj.filters
+++ b/generate/windows/generate/generate.vcxproj.filters
@@ -15,87 +15,87 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\generate\astro_vector.c">
+    <ClCompile Include="..\..\..\astro_vector.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\chebyshev.c">
+    <ClCompile Include="..\..\..\chebyshev.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\codegen.c">
+    <ClCompile Include="..\..\..\codegen.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\earth.c">
+    <ClCompile Include="..\..\..\earth.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\ephfile.c">
+    <ClCompile Include="..\..\..\ephfile.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\generate.c">
+    <ClCompile Include="..\..\..\generate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\novas\eph_manager.c">
+    <ClCompile Include="..\..\..\novas\eph_manager.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\novas\novas.c">
+    <ClCompile Include="..\..\..\novas\novas.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\novas\novascon.c">
+    <ClCompile Include="..\..\..\novas\novascon.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\novas\nutation.c">
+    <ClCompile Include="..\..\..\novas\nutation.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\novas\solsys1.c">
+    <ClCompile Include="..\..\..\novas\solsys1.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\vsop\vsop.c">
+    <ClCompile Include="..\..\..\vsop\vsop.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\novas\readeph0.c">
+    <ClCompile Include="..\..\..\novas\readeph0.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\generate\top2013\top2013.c">
+    <ClCompile Include="..\..\..\top2013\top2013.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\generate\astro_vector.h">
+    <ClInclude Include="..\..\..\astro_vector.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\chebyshev.h">
+    <ClInclude Include="..\..\..\chebyshev.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\codegen.h">
+    <ClInclude Include="..\..\..\codegen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\earth.h">
+    <ClInclude Include="..\..\..\earth.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\ephfile.h">
+    <ClInclude Include="..\..\..\ephfile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\novas_body.h">
+    <ClInclude Include="..\..\..\novas_body.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\vsop\vsop.h">
+    <ClInclude Include="..\..\..\vsop\vsop.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\novas\eph_manager.h">
+    <ClInclude Include="..\..\..\novas\eph_manager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\novas\novas.h">
+    <ClInclude Include="..\..\..\novas\novas.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\novas\novascon.h">
+    <ClInclude Include="..\..\..\novas\novascon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\novas\nutation.h">
+    <ClInclude Include="..\..\..\novas\nutation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\novas\solarsystem.h">
+    <ClInclude Include="..\..\..\novas\solarsystem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\generate\top2013\top2013.h">
+    <ClInclude Include="..\..\..\top2013\top2013.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>