Browse code

* improvements for mingw

Nat! authored on 04/09/2017 20:14:46
Showing 3 changed files
... ...
@@ -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 128
    name="`basename -- "${makepath}"`"
129 129
    case "${UNAME}" in
130 130
       mingw)
131
-         case "${name}" in
132
-            nmake|*nmake.exe)
131
+         case "${name%.*}" in
132
+            nmake)
133 133
                echo "NMake Makefiles"
134 134
             ;;
135 135
 
... ...
@@ -93,6 +93,8 @@ mingw_mangle_compiler()
93 93
 #
94 94
 setup_mingw_buildenvironment()
95 95
 {
96
+   log_debug "setup_mingw_buildenvironment"
97
+   
96 98
    local linker
97 99
 
98 100
    if [ -z "${LIBPATH}" -o  -z "${INCLUDE}" ] && [ -z "${DONT_USE_VS}" ]
... ...
@@ -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 800
    [ -z "${DEPENDENCIES_DIR}" ] && internal_fail "missing DEPENDENCIES_DIR"
801 801
    [ -z "${ADDICTIONS_DIR}" ]   && internal_fail "missing ADDICTIONS_DIR"
802 802
 
803
-
804 803
    local type
805 804
    local values
806 805
    local result
... ...
@@ -808,7 +806,6 @@ paths_main()
808 808
    result=""
809 809
    type="${1:-run}"
810 810
 
811
-
812 811
    #
813 812
    # if there is no "root", then pick the first configuration/sdk
814 813
    # for the dependencies paths