Ubuntu caching needs to include source wx/include as well

add wxUSE_LIBSDL=OFF to prevent SDL dependency

.github/workflows/build.yml

@@ -153,8 +153,12 @@ jobs:
         id: cache-wx
         uses: actions/cache@v4
         with:
-          path: wxlib
+          path: |
+            wxlib
+            wx/include
           key: wx-ubuntu-${{ env.WXHASH }}
+        # Cache needs the source include because wx-config does not reference the cmake --install
+        # directories, only the source build, for some reason?
       - name: Build wxWidgets
         if: steps.cache-wx.outputs.cache-hit != 'true'
         run: make wxlib

makefile.wx

@@ -29,7 +29,8 @@ WXCONF ?= \
 	-DwxUSE_LIBTIFF=OFF \
 	-DwxUSE_NANOSVG=OFF \
 	-DwxUSE_LIBLZMA=OFF \
-	-DwxUSE_WXHTML_HELP=OFF
+	-DwxUSE_WXHTML_HELP=OFF \
+	-DwxUSE_LIBSDL=OFF
 
 # WXCONF_EXTRA can be be used to provide extra configuration
 

readme.md

@@ -69,7 +69,7 @@ Otherwise on other platforms there is probably some wxWidgets library package yo
   * `export WXL_CONFIG=/path/to/wx-config`
   * `make`
 
-On Windows (including MSYS2), you don't need to keep the cmake generated directories in wxlib once you've built the libraries. Everything needed will be in `wxlib\include` and `wxlib\lib`, and the other folders can be deleted, if you'd like to recover some space (wxWidgets is unfortunately large). On other platforms, the `wx-config` utility will be contained there, so you should at least keep that and whatever other files it uses to determine its build configuration.
+On Windows (including MSYS2), you don't need to keep the cmake generated directories in wxlib once you've built the libraries. Everything needed will be in `wxlib\include` and `wxlib\lib`, and the other folders can be deleted, if you'd like to recover some space (wxWidgets is unfortunately large). On other platforms, the `wx-config` utility will be contained there, so you should at least keep that and whatever other files it uses to determine its build configuration. (`wx-config` does not appear to be aware of `cmake --install` and will reference the source includes, and uninstalled library binaries.)
 
 ### Make Targets
 

wxlib.bat

@@ -37,6 +37,7 @@
 @set WXCONF=%WXCONF% -DwxUSE_NANOSVG=OFF
 @set WXCONF=%WXCONF% -DwxUSE_LIBLZMA=OFF
 @set WXCONF=%WXCONF% -DwxUSE_WXHTML_HELP=OFF
+@set WXCONF=%WXCONF% -DwxUSE_LIBSDL=OFF
 @echo set WXCONF=%WXCONF%
 
 REM ensure wx exists