@@ -24,10 +24,12 @@
 # Define the list of all packages, for cleaning purposes
 KITCREATOR_ALLPKGS="kitsh tcl tclvfs zlib tk itcl mk4tcl thread kitdll"
 for pkg in ${KITCREATOR_ALLPKGS}; do
 	rm -f "${pkg}/build.log"
 	rm -rf "${pkg}/out" "${pkg}/inst" "${pkg}/build"
+
+	rm -rf "${pkg}/src"/tmp-*
 
 	if [ "${mode}" = "distclean" ]; then
 		rm -rf "${pkg}/src"
 	fi
 done
@@ -82,10 +84,23 @@
 			STATICMK4="0"
 			export STATICMK4
 		fi
 	fi
 fi
+
+# Find Windows resource-related files
+if [ -f "kit.ico" ]; then
+	KITCREATOR_ICON="$(pwd)/kit.ico"
+else
+	KITCREATOR_ICON="$(echo "$(pwd)/kitsh/buildsrc"/kitsh-*/kit.ico)"
+fi
+if [ -f "kit.rc" ]; then
+	KITCREATOR_RC="$(pwd)/kit.rc"
+else
+	KITCREATOR_RC="$(echo "$(pwd)/kitsh/buildsrc"/kitsh-*/kit.rc)"
+fi
+export KITCREATOR_ICON KITCREATOR_RC
 
 failedpkgs=""
 buildfailed="0"
 for pkg in tcl tclvfs zlib ${KITCREATOR_PKGS} "${KITTARGET}"; do
 	echo -n "Building ${pkg} ..."