Move platform-specific files into separate directory

.github/workflows/build.yml

@@ -67,7 +67,7 @@ jobs:
       run: msbuild.exe build/msw/wx_vc14.sln /p:Configuration=Release /p:Platform=x64 /p:RuntimeLibrary=MultiThreaded
     - name: build TreeSheets
       run: |
-        msbuild.exe TreeSheets\treesheets.sln /p:Configuration=Release /p:Platform=x64
+        msbuild.exe platforms\win32\treesheets.sln /p:Configuration=Release /p:Platform=x64
         Remove-Item TS\*.pdb
         Remove-Item TS\*.ipdb
         Remove-Item TS\*.iobj
@@ -109,9 +109,9 @@ jobs:
     - uses: actions/checkout@v4
     - name: Prepare Plist
       run: |
-        /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $(date +'%Y%m%d%H%M%S')" osx/Info.plist
-        /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $(date +'%Y.%m.%d')" osx/Info.plist
-        /usr/libexec/PlistBuddy -c "Set :LSMinimumSystemVersion $minmac" osx/Info.plist
+        /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $(date +'%Y%m%d%H%M%S')" platforms/osx/Info.plist
+        /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $(date +'%Y.%m.%d')" platforms/osx/Info.plist
+        /usr/libexec/PlistBuddy -c "Set :LSMinimumSystemVersion $minmac" platforms/osx/Info.plist
     - name: cmake
       run: cmake -S . -B _build -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET="$minmac" -DCMAKE_INSTALL_PREFIX=macos-bundle
     - name: Build TreeSheets

CMakeLists.txt

@@ -103,12 +103,12 @@ if(APPLE)
         TreeSheets
         MACOSX_BUNDLE
         src/main.cpp
-        osx/App.icns
+        platforms/osx/App.icns
     )
-    set_source_files_properties(osx/App.icns PROPERTIES
+    set_source_files_properties(platforms/osx/App.icns PROPERTIES
         MACOSX_PACKAGE_LOCATION "Resources")
     set_target_properties(TreeSheets PROPERTIES
-        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/osx/Info.plist"
+        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/platforms/osx/Info.plist"
     )
 else()
     add_executable(
@@ -154,9 +154,9 @@ if(LINUX AND NOT TREESHEETS_RELOCATABLE_INSTALLATION)
     target_compile_definitions(TreeSheets PRIVATE "TREESHEETS_DOCDIR=\"${TREESHEETS_FULL_DOCDIR}\"")
     target_compile_definitions(TreeSheets PRIVATE "TREESHEETS_DATADIR=\"${TREESHEETS_FULL_PKGDATADIR}\"")
 
-    install(FILES linux/com.strlen.TreeSheets.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
-    install(FILES linux/com.strlen.TreeSheets.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
-    install(FILES linux/com.strlen.TreeSheets.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
+    install(FILES platforms/linux/com.strlen.TreeSheets.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
+    install(FILES platforms/linux/com.strlen.TreeSheets.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+    install(FILES platforms/linux/com.strlen.TreeSheets.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
 elseif(APPLE)
     set(TREESHEETS_BINDIR ${CMAKE_INSTALL_PREFIX})
     set(TREESHEETS_DOCDIR ${CMAKE_INSTALL_PREFIX}/TreeSheets.app/Contents/Resources)

README.md

@@ -72,7 +72,7 @@ Windows:
       to Multithreaded
 4. Build solution in both x64 Debug and Release
 5. Close the wxWidgets solution
-6. "treesheets" contains the Visual Studio 2022 files for treesheets, open the .sln.
+6. `platforms/win32` contains the Visual Studio 2022 files for treesheets, open the .sln.
     If you've done the above correctly, TreeSheets will now compile and pick up
     the wxWidgets libraries.
 7. To distribute, build an installer with `TS_installer.nsi` (requires nsis.sourceforge.net)

treesheets/treesheets.sln → platforms/win32/treesheets.sln

@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "treesheets", "treesheets.vc
 		{2C576764-3A5A-4CCD-B50D-C7C9C0349282} = {2C576764-3A5A-4CCD-B50D-C7C9C0349282}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "language", "..\lobster\lobster\language.vcxproj", "{2C576764-3A5A-4CCD-B50D-C7C9C0349282}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "language", "..\..\lobster\lobster\language.vcxproj", "{2C576764-3A5A-4CCD-B50D-C7C9C0349282}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

treesheets/treesheets.vcxproj → platforms/win32/treesheets.vcxproj

@@ -49,15 +49,15 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TreeSheetsDBG</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>..\TS\</OutDir>
+    <OutDir>..\..\TS\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>..\TS\</OutDir>
+    <OutDir>..\..\TS\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\wxWidgets\include;..\wxWidgets\lib\vc_x64_lib\mswud;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\wxWidgets\include;..\..\wxWidgets\lib\vc_x64_lib\mswud;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WINVER=0x0400;wxUSE_GUI=1;__WXDEBUG__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -73,9 +73,9 @@
       <AdditionalIncludeDirectories>C:\Program Files\wxWidgets-2.8.8\include\;C:\Program Files\wxWidgets-2.8.8\lib\vc_lib\mswd;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>../build/treesheets/language/languageDBG64.lib;libcmtd.lib;libcpmtd.lib;comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;wxmsw33ud_core.lib;wxbase33ud.lib;wxmsw33ud_adv.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;wxbase33ud_xml.lib;wxexpatd.lib;wxmsw33ud_aui.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\TS\TreeSheetsDBG.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\wxWidgets\lib\vc_x64_lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>../../build/treesheets/language/languageDBG64.lib;libcmtd.lib;libcpmtd.lib;comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;wxmsw33ud_core.lib;wxbase33ud.lib;wxmsw33ud_adv.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;wxbase33ud_xml.lib;wxexpatd.lib;wxmsw33ud_aui.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\..\TS\TreeSheetsDBG.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\wxWidgets\lib\vc_x64_lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -87,7 +87,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\wxWidgets\include;..\wxWidgets\lib\vc_x64_lib\mswu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\wxWidgets\include;..\..\wxWidgets\lib\vc_x64_lib\mswu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WINVER=0x0400;wxUSE_GUI=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
@@ -102,9 +102,9 @@
       <AdditionalIncludeDirectories>C:\Program Files\wxWidgets-2.8.8\include\;C:\Program Files\wxWidgets-2.8.8\lib\vc_lib\msw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>../build/treesheets/language/language64.lib;libcmt.lib;libcpmt.lib;comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;wxmsw33u_core.lib;wxbase33u.lib;wxmsw33u_adv.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;wxbase33u_xml.lib;wxexpat.lib;wxmsw33u_aui.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\TS\TreeSheets.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\wxWidgets\lib\vc_x64_lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>../../build/treesheets/language/language64.lib;libcmt.lib;libcpmt.lib;comctl32.lib;rpcrt4.lib;winmm.lib;advapi32.lib;wsock32.lib;wxmsw33u_core.lib;wxbase33u.lib;wxmsw33u_adv.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;wxbase33u_xml.lib;wxexpat.lib;wxmsw33u_aui.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\..\TS\TreeSheets.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\wxWidgets\lib\vc_x64_lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -118,64 +118,64 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\lobster_impl.cpp">
+    <ClCompile Include="..\..\src\lobster_impl.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lobster\src;..\lobster\include</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lobster\src;..\lobster\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lobster\src;..\..\lobster\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lobster\src;..\..\lobster\include</AdditionalIncludeDirectories>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ignore.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ignore.h</PrecompiledHeaderFile>
       <IgnoreStandardIncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</IgnoreStandardIncludePath>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;WINVER=0x0400;wxUSE_GUI=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\src\main.cpp">
+    <ClCompile Include="..\..\src\main.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\lobster\src</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\lobster\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\lobster\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\lobster\src</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;WINVER=0x0400;wxUSE_GUI=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\src\StackWalker\StackWalker.cpp">
+    <ClCompile Include="..\..\src\StackWalker\StackWalker.cpp">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;WINVER=0x0400;wxUSE_GUI=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\src\StackWalker\StackWalkerHelpers.cpp">
+    <ClCompile Include="..\..\src\StackWalker\StackWalkerHelpers.cpp">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;WINVER=0x0400;wxUSE_GUI=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\src\stdafx.cpp">
+    <ClCompile Include="..\..\src\stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;WINVER=0x0400;wxUSE_GUI=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\lobster\src\lobster\string_tools.h" />
-    <ClInclude Include="..\src\script_interface.h" />
-    <ClInclude Include="..\src\StackWalker\StackWalker.h" />
-    <ClInclude Include="..\src\StackWalker\StackWalkerHelpers.h" />
-    <ClInclude Include="..\src\stdafx.h" />
-    <ClInclude Include="..\src\tools.h" />
-    <ClInclude Include="..\src\cell.h" />
-    <ClInclude Include="..\src\document.h" />
-    <ClInclude Include="..\src\evaluator.h" />
-    <ClInclude Include="..\src\grid.h" />
-    <ClInclude Include="..\src\selection.h" />
-    <ClInclude Include="..\src\system.h" />
-    <ClInclude Include="..\src\text.h" />
-    <ClInclude Include="..\src\myapp.h" />
-    <ClInclude Include="..\src\mycanvas.h" />
-    <ClInclude Include="..\src\myevents.h" />
-    <ClInclude Include="..\src\myframe.h" />
-    <ClInclude Include="..\src\mywxtools.h" />
-    <ClInclude Include="..\src\treesheets_impl.h" />
+    <ClInclude Include="..\..\lobster\src\lobster\string_tools.h" />
+    <ClInclude Include="..\..\src\script_interface.h" />
+    <ClInclude Include="..\..\src\StackWalker\StackWalker.h" />
+    <ClInclude Include="..\..\src\StackWalker\StackWalkerHelpers.h" />
+    <ClInclude Include="..\..\src\stdafx.h" />
+    <ClInclude Include="..\..\src\tools.h" />
+    <ClInclude Include="..\..\src\cell.h" />
+    <ClInclude Include="..\..\src\document.h" />
+    <ClInclude Include="..\..\src\evaluator.h" />
+    <ClInclude Include="..\..\src\grid.h" />
+    <ClInclude Include="..\..\src\selection.h" />
+    <ClInclude Include="..\..\src\system.h" />
+    <ClInclude Include="..\..\src\text.h" />
+    <ClInclude Include="..\..\src\myapp.h" />
+    <ClInclude Include="..\..\src\mycanvas.h" />
+    <ClInclude Include="..\..\src\myevents.h" />
+    <ClInclude Include="..\..\src\myframe.h" />
+    <ClInclude Include="..\..\src\mywxtools.h" />
+    <ClInclude Include="..\..\src\treesheets_impl.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\.clang-format" />
-    <None Include="..\TODO.txt" />
+    <None Include="..\..\.clang-format" />
+    <None Include="..\..\TODO.txt" />
     <None Include="icon1.ico" />
   </ItemGroup>
   <ItemGroup>

treesheets/treesheets.vcxproj.filters → platforms/win32/treesheets.vcxproj.filters

@@ -21,76 +21,76 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\main.cpp">
+    <ClCompile Include="..\..\src\main.cpp">
       <Filter>std</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\stdafx.cpp">
+    <ClCompile Include="..\..\src\stdafx.cpp">
       <Filter>std</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\StackWalker\StackWalker.cpp">
+    <ClCompile Include="..\..\src\StackWalker\StackWalker.cpp">
       <Filter>std\StackWalker</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\StackWalker\StackWalkerHelpers.cpp">
+    <ClCompile Include="..\..\src\StackWalker\StackWalkerHelpers.cpp">
       <Filter>std\StackWalker</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lobster_impl.cpp">
+    <ClCompile Include="..\..\src\lobster_impl.cpp">
       <Filter>script</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\stdafx.h">
+    <ClInclude Include="..\..\src\stdafx.h">
       <Filter>std</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\tools.h">
+    <ClInclude Include="..\..\src\tools.h">
       <Filter>std</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\cell.h">
+    <ClInclude Include="..\..\src\cell.h">
       <Filter>treesheets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\document.h">
+    <ClInclude Include="..\..\src\document.h">
       <Filter>treesheets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\evaluator.h">
+    <ClInclude Include="..\..\src\evaluator.h">
       <Filter>treesheets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\grid.h">
+    <ClInclude Include="..\..\src\grid.h">
       <Filter>treesheets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\selection.h">
+    <ClInclude Include="..\..\src\selection.h">
       <Filter>treesheets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\system.h">
+    <ClInclude Include="..\..\src\system.h">
       <Filter>treesheets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\text.h">
+    <ClInclude Include="..\..\src\text.h">
       <Filter>treesheets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\myapp.h">
+    <ClInclude Include="..\..\src\myapp.h">
       <Filter>wxwidgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\mycanvas.h">
+    <ClInclude Include="..\..\src\mycanvas.h">
       <Filter>wxwidgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\myevents.h">
+    <ClInclude Include="..\..\src\myevents.h">
       <Filter>wxwidgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\myframe.h">
+    <ClInclude Include="..\..\src\myframe.h">
       <Filter>wxwidgets</Filter>
     </ClInclude>
     <ClInclude Include="resource.h" />
-    <ClInclude Include="..\src\mywxtools.h">
+    <ClInclude Include="..\..\src\mywxtools.h">
       <Filter>wxwidgets</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\StackWalker\StackWalker.h">
+    <ClInclude Include="..\..\src\StackWalker\StackWalker.h">
       <Filter>std\StackWalker</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\StackWalker\StackWalkerHelpers.h">
+    <ClInclude Include="..\..\src\StackWalker\StackWalkerHelpers.h">
       <Filter>std\StackWalker</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\script_interface.h">
+    <ClInclude Include="..\..\src\script_interface.h">
       <Filter>script</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\treesheets_impl.h">
+    <ClInclude Include="..\..\src\treesheets_impl.h">
       <Filter>script</Filter>
     </ClInclude>
   </ItemGroup>
@@ -99,7 +99,7 @@
       <Filter>data</Filter>
     </None>
     <None Include="icon1.ico" />
-    <None Include="..\.clang-format" />
+    <None Include="..\..\.clang-format" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="boar.rc" />