diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2021-11-09 10:38:08 -0600 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2021-11-09 10:38:08 -0600 |
| commit | 7ac5f65d66146090573d322a58f7cdddc63556ca (patch) | |
| tree | cff089da04552f7067e54994704167efb19b1322 /config | |
| parent | 22ad1c833ed7ef0909363175e698477dbe3f9e3a (diff) | |
| download | MPC-7ac5f65d66146090573d322a58f7cdddc63556ca.tar.gz | |
mpb updates for vs2022
In some cases, these no longer distinguish between pre-vc10 (vcproj) and
modern (vcxproj) versions. Since vc10 is no longer supported, this will
make for easier maintenance going forward.
Diffstat (limited to 'config')
| -rw-r--r-- | config/pin_base.mpb | 2 | ||||
| -rw-r--r-- | config/pintool.mpb | 4 | ||||
| -rw-r--r-- | config/winapp.mpb | 5 | ||||
| -rw-r--r-- | config/wireshark.mpb | 5 |
4 files changed, 8 insertions, 8 deletions
diff --git a/config/pin_base.mpb b/config/pin_base.mpb index 26bb6d5d..261b367e 100644 --- a/config/pin_base.mpb +++ b/config/pin_base.mpb @@ -15,7 +15,7 @@ project { compile_flags += /Oy } - specific (vc10, vc11, vc12, vc14, vs2017, vs2019) { + specific (prop:microsoft) { runtime_library = MultiThreaded ImageHasSafeExceptionHandlers = false diff --git a/config/pintool.mpb b/config/pintool.mpb index bf795467..23229bc0 100644 --- a/config/pintool.mpb +++ b/config/pintool.mpb @@ -41,7 +41,7 @@ feature (ia32) { link_options += /ENTRY:Ptrace_DllMainCRTStartup@12 } - specific (vc10, vc11, vc12, vc14, vs2017, vs2019) { + specific (prop:microsoft) { EntryPointSymbol = Ptrace_DllMainCRTStartup@12 } } @@ -51,7 +51,7 @@ feature (intel64) { link_options += /ENTRY:Ptrace_DllMainCRTStartup } - specific (vc10, vc11, vc12, vc14, vs2017, vs2019) { + specific (prop:microsoft) { EntryPointSymbol = Ptrace_DllMainCRTStartup } diff --git a/config/winapp.mpb b/config/winapp.mpb index b87b3d42..cacbfb2f 100644 --- a/config/winapp.mpb +++ b/config/winapp.mpb @@ -1,11 +1,8 @@ // -*- MPC -*- project { - specific(em3, nmake, vc6) { + specific(nmake) { subsystem = windows } else { - subsystem = 2 - } - specific(vc10, vc11, vc12, vc14, vs2017, vs2019) { subsystem = Windows } } diff --git a/config/wireshark.mpb b/config/wireshark.mpb index 0a8c24ef..85d2d2b3 100644 --- a/config/wireshark.mpb +++ b/config/wireshark.mpb @@ -32,13 +32,16 @@ project : glib { specific(vs2019) { macros += MSC_VER_REQUIRED=1920 } + specific(vs2022) { + macros += MSC_VER_REQUIRED=1930 + } verbatim(nmake, top, 1) { include $(WIRESHARK_SRC)/config.nmake } } // Autoconf / In Source Wireshark Build Method -// This feasture works with how Wireshark Developers Guide says to build +// This feature works with how Wireshark Developers Guide says to build // Wireshark on Linux (autogen.sh). This is also used for older 1.x Wireshark // Windows builds and if Wireshark headers are installed on the system. // On Windows $(WIRETAP_VERSION) also has to be specified as well. |