Index: /trunk/tools/bin/gen-slickedit-workspace.sh
===================================================================
--- /trunk/tools/bin/gen-slickedit-workspace.sh	(revision 41826)
+++ /trunk/tools/bin/gen-slickedit-workspace.sh	(revision 41827)
@@ -369,16 +369,28 @@
     # Probe the slickedit user config, picking the most recent version.
     #
-    if test -d "${HOME}/Library/Application Support/Slickedit"; then
-        MY_SLICKDIR_="${HOME}/Library/Application Support/Slickedit"
-        MY_USERCPP_H="unxcpp.h"
-        MY_VSLICK_DB="vslick.stu"
-    elif test -d "${HOMEDRIVE}${HOMEPATH}/Documents/My SlickEdit Config"; then
-        MY_SLICKDIR_="${HOMEDRIVE}${HOMEPATH}/Documents/My SlickEdit Config"
-        MY_USERCPP_H="usercpp.h"
-        MY_VSLICK_DB="vslick.sta"
+    if test -z "${MY_SLICK_CONFIG}"; then
+        if test -d "${HOME}/Library/Application Support/Slickedit"; then
+            MY_SLICKDIR_="${HOME}/Library/Application Support/Slickedit"
+            MY_USERCPP_H="unxcpp.h"
+            MY_VSLICK_DB="vslick.stu"
+        elif test -d "${HOMEDRIVE}${HOMEPATH}/Documents/My SlickEdit Config"; then
+            MY_SLICKDIR_="${HOMEDRIVE}${HOMEPATH}/Documents/My SlickEdit Config"
+            MY_USERCPP_H="usercpp.h"
+            MY_VSLICK_DB="vslick.sta"
+        else
+            MY_SLICKDIR_="${HOME}/.slickedit"
+            MY_USERCPP_H="unxcpp.h"
+            MY_VSLICK_DB="vslick.stu"
+        fi
     else
-        MY_SLICKDIR_="${HOME}/.slickedit"
-        MY_USERCPP_H="unxcpp.h"
-        MY_VSLICK_DB="vslick.stu"
+        MY_SLICKDIR_="${MY_SLICK_CONFIG}"
+        if test -n "${MY_WINDOWS_HOST}"; then
+            MY_USERCPP_H="usercpp.h"
+            MY_VSLICK_DB="vslick.sta"
+        else
+            MY_USERCPP_H="unxcpp.h"
+            MY_VSLICK_DB="vslick.stu"
+        fi
+        # MacOS: Implement me!
     fi
 
@@ -695,7 +707,12 @@
             ;;
 
+        --slickedit-config)
+            MY_SLICK_CONFIG="$1"
+            shift
+            ;;
+
         # usage
         --h*|-h*|-?|--?)
-            echo "usage: $0 [--rootdir <rootdir>] [--outdir <outdir>] [--project-base <prefix>] [--workspace <name>] [--minimal]"
+            echo "usage: $0 [--rootdir <rootdir>] [--outdir <outdir>] [--project-base <prefix>] [--workspace <name>] [--minimal] [--slickedit-config <DIR>]"
             echo ""
             echo "If --outdir is specified, you must specify a --rootdir relative to it as well."
@@ -781,5 +798,5 @@
     --end-includes \
     "src/recompiler" \
-    "src/VBox/VMM/include/REMInternal.h" \
+    "src/VBox/VMM/REMInternal.h" \
     "src/VBox/VMM/VMMAll/REMAll.cpp"