diff options
author | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:59:08 +0900 |
---|---|---|
committer | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:59:08 +0900 |
commit | 6e8e7a899a742f7f170ff6f07a26cf4832f4fdc9 (patch) | |
tree | 81f0750d91aa467df3ee81cf30d22a65db2e6685 /Makefile.msvc | |
parent | d82f8426a5e255f0533f07ee458870ba124f90e7 (diff) | |
parent | 45e88a8337839e5fd88519bc55467053d521c9f6 (diff) | |
download | c-ares-6e8e7a899a742f7f170ff6f07a26cf4832f4fdc9.tar.gz c-ares-6e8e7a899a742f7f170ff6f07a26cf4832f4fdc9.tar.bz2 c-ares-6e8e7a899a742f7f170ff6f07a26cf4832f4fdc9.zip |
Merge branch 'tizen' into tizen_3.0_basesubmit/tizen_3.0_base/20161116.053912submit/tizen_3.0.m2_base/20170104.073748submit/tizen_3.0.m2_base/20170104.072059accepted/tizen/3.0/base/20161118.080913accepted/tizen/3.0.m2/base/20170104.082100tizen_3.0.m2_baseaccepted/tizen_3.0.m2_base
Conflicts:
packaging/c-ares.spec
Change-Id: Id23d5351f77b4520d8bbcc4c0e1eb09136018b58
Diffstat (limited to 'Makefile.msvc')
-rw-r--r-- | Makefile.msvc | 72 |
1 files changed, 7 insertions, 65 deletions
diff --git a/Makefile.msvc b/Makefile.msvc index c83dd91..e05e317 100644 --- a/Makefile.msvc +++ b/Makefile.msvc @@ -18,12 +18,12 @@ # Makefile for building c-ares libraries and sample programs with MSVC. # # Usage: nmake /f makefile.msvc CFG=<config> <target> -# +# # <config> must be one of: [ lib-release | lib-debug | dll-release | dll-debug } # <target> must be one of: [ ALL | c-ares | acountry | adig | ahost | clean } -# +# # If a <target> other than ALL or clean is given, <config> becomes mandatory. -# +# # If neither <config> nor <target> are specified this results in # all targets being built for all <config> c-ares library types. # @@ -71,68 +71,10 @@ RTLIBD = /MTd USE_WATT32 = 0 -# ------------------------------------------- -# Detect NMAKE version deducing MSVC version -# ------------------------------------------- - -!IFNDEF _NMAKE_VER -! MESSAGE Macro _NMAKE_VER not defined. -! MESSAGE Use MSVC's NMAKE to process this makefile. -! ERROR See previous message. -!ENDIF - -!IF "$(_NMAKE_VER)" == "6.00.8168.0" -CC_VERS_NUM = 60 -!ELSEIF "$(_NMAKE_VER)" == "6.00.9782.0" -CC_VERS_NUM = 60 -!ELSEIF "$(_NMAKE_VER)" == "7.00.8882" -CC_VERS_NUM = 70 -!ELSEIF "$(_NMAKE_VER)" == "7.00.9466" -CC_VERS_NUM = 70 -!ELSEIF "$(_NMAKE_VER)" == "7.00.9955" -CC_VERS_NUM = 70 -!ELSEIF "$(_NMAKE_VER)" == "7.10.2240.8" -CC_VERS_NUM = 71 -!ELSEIF "$(_NMAKE_VER)" == "7.10.3077" -CC_VERS_NUM = 71 -!ELSEIF "$(_NMAKE_VER)" == "8.00.40607.16" -CC_VERS_NUM = 80 -!ELSEIF "$(_NMAKE_VER)" == "8.00.50727.42" -CC_VERS_NUM = 80 -!ELSEIF "$(_NMAKE_VER)" == "8.00.50727.762" -CC_VERS_NUM = 80 -!ELSEIF "$(_NMAKE_VER)" == "9.00.20706.01" -CC_VERS_NUM = 90 -!ELSEIF "$(_NMAKE_VER)" == "9.00.21022.08" -CC_VERS_NUM = 90 -!ELSEIF "$(_NMAKE_VER)" == "9.00.30729.01" -CC_VERS_NUM = 90 -!ELSEIF "$(_NMAKE_VER)" == "10.00.20506.01" -CC_VERS_NUM = 100 -!ELSEIF "$(_NMAKE_VER)" == "10.00.21003.01" -CC_VERS_NUM = 100 -!ELSEIF "$(_NMAKE_VER)" == "10.00.30128.01" -CC_VERS_NUM = 100 -!ELSEIF "$(_NMAKE_VER)" == "10.00.30319.01" -CC_VERS_NUM = 100 -!ELSEIF "$(_NMAKE_VER)" == "10.00.40219.01" -CC_VERS_NUM = 100 -!ELSEIF "$(_NMAKE_VER)" == "11.00.50522.1" -CC_VERS_NUM = 110 -!ELSEIF "$(_NMAKE_VER)" == "11.00.50727.1" -CC_VERS_NUM = 110 -!ELSEIF "$(_NMAKE_VER)" == "11.00.51106.1" -CC_VERS_NUM = 110 -!ELSEIF "$(_NMAKE_VER)" == "11.00.60315.1" -CC_VERS_NUM = 110 -!ELSE -! MESSAGE Unknown value for _NMAKE_VER macro: "$(_NMAKE_VER)" -! MESSAGE Please, report this condition on the c-ares development -! MESSAGE mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/ -! ERROR See previous message. -!ENDIF - -CC_VERS_STR = msvc$(CC_VERS_NUM) +# -------------------------------------------------------- +# Detect compiler version. +# -------------------------------------------------------- +!INCLUDE .\msvc_ver.inc # ---------------------------------------------------- # Verify that current subdir is the c-ares source one |