summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJames H. Hill <hillj@cs.iupui.edu>2015-10-16 16:46:01 -0400
committerJames H. Hill <hillj@cs.iupui.edu>2015-10-16 16:46:01 -0400
commitbdf346b36da05b3ca85b05eef4d82dfb6551d6d8 (patch)
tree7bf5ab58a76bca54dbd1fe5900873d6fc4a76aff /config
parentffa0b620162fa90cd50080406bb860e0cc1b2728 (diff)
parente214eb0a681a07cb9bc5a71e9b6ebb1873ad3099 (diff)
downloadMPC-bdf346b36da05b3ca85b05eef4d82dfb6551d6d8.tar.gz
Merge remote-tracking branch 'public/master'
Diffstat (limited to 'config')
-rw-r--r--config/wireshark.mpb11
1 files changed, 10 insertions, 1 deletions
diff --git a/config/wireshark.mpb b/config/wireshark.mpb
index 9fbc513f..807f8b44 100644
--- a/config/wireshark.mpb
+++ b/config/wireshark.mpb
@@ -14,8 +14,17 @@ project : glib {
specific(vc9) {
macros += MSC_VER_REQUIRED=1500
}
- specific(vc10, vc11, vc12, vc14) {
+ specific(vc10) {
macros += MSC_VER_REQUIRED=1600
+ }
+ specific(vc11) {
+ macros += MSC_VER_REQUIRED=1700
+ }
+ specific(vc12) {
+ macros += MSC_VER_REQUIRED=1800
+ }
+ specific(vc14) {
+ macros += MSC_VER_REQUIRED=1900
}
verbatim(nmake, top) {
include $(WIRESHARK_SRC)/config.nmake