@@ -102,10 +102,11 @@ platform_make()

    case "${UNAME}" in

       mingw)

-         case "${name}" in

-            ""|cl|cl.exe)

+         case "${name%.*}" in

+            ""|cl|clang-cl|mulle-clang-cl)

                echo "nmake"

             ;;

+

             *)

                echo "mingw32-make"

             ;;

@@ -128,8 +129,8 @@ platform_cmake_generator()

    name="`basename -- "${makepath}"`"

    case "${UNAME}" in

       mingw)

-         case "${name}" in

-            nmake|*nmake.exe)

+         case "${name%.*}" in

+            nmake)

                echo "NMake Makefiles"

             ;;

@@ -93,6 +93,8 @@ mingw_mangle_compiler()

 #

 setup_mingw_buildenvironment()

 {

+   log_debug "setup_mingw_buildenvironment"

+   

    local linker

    if [ -z "${LIBPATH}" -o  -z "${INCLUDE}" ] && [ -z "${DONT_USE_VS}" ]

@@ -654,7 +654,7 @@ paths_main()

    local OPTION_WITH_LIBRARIES="NO"

    local OPTION_WITH_LIBRARYPATHS="YES"

    local OPTION_WITH_MISSING_PATHS="NO"

-   local OPTION_PATH_SEPARATOR=":"

+   local OPTION_PATH_SEPARATOR="${PATH_SEPARATOR}"

    local OPTION_QUOTE=""

    local OPTION_SHELL_QUOTE="\""

    local OPTION_LINE_SEPERATOR=" "

@@ -663,7 +663,7 @@ paths_main()

    log_debug ":paths_main:"

-   [ -z "${MULLE_BOOTSTRAP_FUNCTIONS_SH}" ] && . mulle-bootstrap-functions.sh

+   [ -z "${MULLE_BOOTSTRAP_FUNCTIONS_SH}" ]       && . mulle-bootstrap-functions.sh

    [ -z "${MULLE_BOOTSTRAP_COMMON_SETTINGS_SH}" ] && . mulle-bootstrap-common-settings.sh

    OPTION_WITH_HEADERPATHS="YES"

@@ -776,7 +776,6 @@ paths_main()

             OPTION_SDK="$1"

          ;;

-

          --shell-quote)

             shift

             [ $# -eq 0 ] && fail "quote missing"

@@ -800,7 +799,6 @@ paths_main()

    [ -z "${DEPENDENCIES_DIR}" ] && internal_fail "missing DEPENDENCIES_DIR"

    [ -z "${ADDICTIONS_DIR}" ]   && internal_fail "missing ADDICTIONS_DIR"

-

    local type

    local values

    local result

@@ -808,7 +806,6 @@ paths_main()

    result=""

    type="${1:-run}"

-

    #

    # if there is no "root", then pick the first configuration/sdk

    # for the dependencies paths