... | ... |
@@ -102,10 +102,11 @@ platform_make() |
102 | 102 |
|
103 | 103 |
case "${UNAME}" in |
104 | 104 |
mingw) |
105 |
- case "${name}" in |
|
106 |
- ""|cl|cl.exe) |
|
105 |
+ case "${name%.*}" in |
|
106 |
+ ""|cl|clang-cl|mulle-clang-cl) |
|
107 | 107 |
echo "nmake" |
108 | 108 |
;; |
109 |
+ |
|
109 | 110 |
*) |
110 | 111 |
echo "mingw32-make" |
111 | 112 |
;; |
... | ... |
@@ -128,8 +129,8 @@ platform_cmake_generator() |
128 | 129 |
name="`basename -- "${makepath}"`" |
129 | 130 |
case "${UNAME}" in |
130 | 131 |
mingw) |
131 |
- case "${name}" in |
|
132 |
- nmake|*nmake.exe) |
|
132 |
+ case "${name%.*}" in |
|
133 |
+ nmake) |
|
133 | 134 |
echo "NMake Makefiles" |
134 | 135 |
;; |
135 | 136 |
|
... | ... |
@@ -654,7 +654,7 @@ paths_main() |
654 | 654 |
local OPTION_WITH_LIBRARIES="NO" |
655 | 655 |
local OPTION_WITH_LIBRARYPATHS="YES" |
656 | 656 |
local OPTION_WITH_MISSING_PATHS="NO" |
657 |
- local OPTION_PATH_SEPARATOR=":" |
|
657 |
+ local OPTION_PATH_SEPARATOR="${PATH_SEPARATOR}" |
|
658 | 658 |
local OPTION_QUOTE="" |
659 | 659 |
local OPTION_SHELL_QUOTE="\"" |
660 | 660 |
local OPTION_LINE_SEPERATOR=" " |
... | ... |
@@ -663,7 +663,7 @@ paths_main() |
663 | 663 |
|
664 | 664 |
log_debug ":paths_main:" |
665 | 665 |
|
666 |
- [ -z "${MULLE_BOOTSTRAP_FUNCTIONS_SH}" ] && . mulle-bootstrap-functions.sh |
|
666 |
+ [ -z "${MULLE_BOOTSTRAP_FUNCTIONS_SH}" ] && . mulle-bootstrap-functions.sh |
|
667 | 667 |
[ -z "${MULLE_BOOTSTRAP_COMMON_SETTINGS_SH}" ] && . mulle-bootstrap-common-settings.sh |
668 | 668 |
|
669 | 669 |
OPTION_WITH_HEADERPATHS="YES" |
... | ... |
@@ -776,7 +776,6 @@ paths_main() |
776 | 776 |
OPTION_SDK="$1" |
777 | 777 |
;; |
778 | 778 |
|
779 |
- |
|
780 | 779 |
--shell-quote) |
781 | 780 |
shift |
782 | 781 |
[ $# -eq 0 ] && fail "quote missing" |
... | ... |
@@ -800,7 +799,6 @@ paths_main() |
800 | 799 |
[ -z "${DEPENDENCIES_DIR}" ] && internal_fail "missing DEPENDENCIES_DIR" |
801 | 800 |
[ -z "${ADDICTIONS_DIR}" ] && internal_fail "missing ADDICTIONS_DIR" |
802 | 801 |
|
803 |
- |
|
804 | 802 |
local type |
805 | 803 |
local values |
806 | 804 |
local result |
... | ... |
@@ -808,7 +806,6 @@ paths_main() |
808 | 806 |
result="" |
809 | 807 |
type="${1:-run}" |
810 | 808 |
|
811 |
- |
|
812 | 809 |
# |
813 | 810 |
# if there is no "root", then pick the first configuration/sdk |
814 | 811 |
# for the dependencies paths |