attempt to fix Ubuntu build cache fail: wx-config wrongly references the source/build instead of the installed product

creating a cludgy wx-config-install substitute
also USE_LIBSDL=OFF

Author: bbbradsmith

makefile.common

@@ -78,7 +78,7 @@ else
 	DLL_SUFFIX ?= .so
 	WXL_LIBDIR ?= .
 	# wx-config
-	WXL_CONFIG ?= $(WXL_DIR)/$(WXL_CMAKEDIR)/wx-config
+	WXL_CONFIG ?= $(WXL_DIR)/$(WXL_CMAKEDIR)/wx-config-install
 endif
 
 ifneq ("$(WXL_CONFIG)","")

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
 
@@ -61,8 +62,17 @@ submodules:
 wxlib: submodules
 	mkdir -p $(WXOUT)/$(WXCMAKE)
 	(cd $(WXOUT)/$(WXCMAKE) && cmake $(WXREL) $(WXCONF) $(WXCONF_EXTRA) $(WXBUILD_TYPE))
-	(cd $(WXOUT)/$(WXCMAKE) && cmake --build .)
+	(cd $(WXOUT)/$(WXCMAKE) && && cmake --build .)
 	(cd $(WXOUT)/$(WXCMAKE) && cmake --install . --prefix ..)
+	(cd $(WXOUT)/$(WXCMAKE) && echo '#!/bin/sh' > wx-config-install)
+	(cd $(WXOUT)/$(WXCMAKE) && echo "this_prefix=\"$PWD/..\"" >> wx-config-install)
+	(cd $(WXOUT)/$(WXCMAKE) && echo "this_exec_prefix=\"$PWD/..\"" >> wx-config-install)
+	(cd $(WXOUT)/$(WXCMAKE) && tail -n 2 wx-config | sed 's/\/lib\/wx\/config\//\/..\/$(WXCMAKE)\/lib\/wx\/config\//g' >> wx-config-install)
+	(cd $(WXOUT)/$(WXCMAKE) && chmod +x wx-config-install)
+
+# For some strange reason wx-config references the source and output folders of cmake,
+# rather than the products of --install. for this reason I've cobbled together wx-config-install
+# to act as a substitute.
 
 clean:
 	rm -f -r $(WXOUT)/$(WXCMAKE)

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