Put Windows-specific stuff into win directory (#764)

.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 win\treesheets.sln /p:Configuration=Release /p:Platform=x64
         Remove-Item TS\*.pdb
         Remove-Item TS\*.ipdb
         Remove-Item TS\*.iobj
@@ -80,7 +80,7 @@ jobs:
     - name: Create installer
       uses: joncloud/makensis-action@v4
       with:
-        script-file: "TS_installer.nsi"
+        script-file: "win/TS_installer.nsi"
         arguments: "/V3"
     - name: upload build artifacts
       if: github.ref == 'refs/heads/master'

README.md

@@ -72,10 +72,10 @@ 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. `win` 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)
+7. To distribute, build an installer with `win\TS_installer.nsi` (requires nsis.sourceforge.net)
 
 Linux / MacOS X:
 

src/stdafx.h

@@ -81,7 +81,7 @@
 #include "tools.h"
 
 #ifdef _WIN32
-    #include "..\treesheets\resource.h"
+    #include "..\win\resource.h"
     #include "StackWalker\StackWalkerHelpers.h"
 #endif
 

TS_installer.nsi → win/TS_installer.nsi

@@ -2,11 +2,11 @@
 !include "MUI2.nsh"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\TreeSheets.exe"
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "TreeSheets\tsinst.bmp"
-!define MUI_ICON "TreeSheets\icon1.ico"
+!define MUI_HEADERIMAGE_BITMAP "tsinst.bmp"
+!define MUI_ICON "icon1.ico"
 /*
 doesn't show?
-!define MUI_HEADERIMAGE_UNBITMAP "TreeSheets\tsinst.bmp"
+!define MUI_HEADERIMAGE_UNBITMAP "tsinst.bmp"
 */
 
 Unicode true
@@ -49,12 +49,12 @@ SetCompressor /SOLID lzma
 AddBrandingImage top 65
 
 Function ba
-	File TreeSheets\dot3.bmp
-  SetBrandingImage TreeSheets\dot3.bmp
+	File dot3.bmp
+  SetBrandingImage dot3.bmp
 FunctionEnd
 
 Function un.ba
-  SetBrandingImage TreeSheets\dot3.bmp
+  SetBrandingImage dot3.bmp
 FunctionEnd
 */
 
@@ -83,7 +83,7 @@ Section "TreeSheets (required)"
 
   SetOutPath $INSTDIR
 
-  File /r "TS\*.*"
+  File /r "..\TS\*.*"
 
   WriteRegStr HKCU SOFTWARE\TreeSheets "Install_Dir" "$INSTDIR"