From 0f45e7d659c224862f9ae652464fbc66149f8491 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 11 Nov 2020 12:33:56 +0100 Subject: Add a gnuace verbatim section so that we can remove the specific xsc handling from the gnuace template in ACE * config/xscdefaults.mpb: --- config/xscdefaults.mpb | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'config') diff --git a/config/xscdefaults.mpb b/config/xscdefaults.mpb index 70ce39d5..f55dedc8 100644 --- a/config/xscdefaults.mpb +++ b/config/xscdefaults.mpb @@ -1,19 +1,25 @@ // -*- MPC -*- project { - specific { - xsc_bin = $(XSC_ROOT)/bin/xsc - xsc_dep = $(XSC_ROOT)/bin/xsc - xsc_flags = --backend cxx - } + specific { + xsc_bin = $(XSC_ROOT)/bin/xsc + xsc_dep = $(XSC_ROOT)/bin/xsc + xsc_flags = --backend cxx + } - Define_Custom(XSC) { - automatic = 0 - dependent = $(XSC_DEP) - command = $(XSC_BIN) - commandflags = $(XSC_FLAGS) - inputext = .xsd - source_outputext = .cpp - header_outputext = .hpp - keyword xscflags = commandflags - } + verbatim(gnuace,macros,1) { + XSC_BIN = $(XSC_ROOT)/bin/xsc + XSC_DEP = $(XSC_ROOT)/bin/xsc$(EXEEXT) + XSC_FLAGS = --backend cxx + } + + Define_Custom(XSC) { + automatic = 0 + dependent = $(XSC_DEP) + command = $(XSC_BIN) + commandflags = $(XSC_FLAGS) + inputext = .xsd + source_outputext = .cpp + header_outputext = .hpp + keyword xscflags = commandflags + } } -- cgit v1.2.1 From 0f8e5825a525c65f75bafc1153035a39acf651a3 Mon Sep 17 00:00:00 2001 From: Caleb Kirby Date: Wed, 27 Jan 2021 10:06:37 -0500 Subject: updated to new pin for linux x64 arch should work with others but currently unable to test windows and vc --- config/pin_base.mpb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/pin_base.mpb b/config/pin_base.mpb index d583d2cb..1c4b9d31 100644 --- a/config/pin_base.mpb +++ b/config/pin_base.mpb @@ -4,9 +4,11 @@ project { includes += $(PIN_ROOT)/source/include \ $(PIN_ROOT)/source/include/pin \ $(PIN_ROOT)/source/include/pin/gen \ - $(PIN_ROOT)/extras/components/include + $(PIN_ROOT)/extras/components/include \ + .. - macros += BIGARRAY_MULTIPLIER=1 USING_XED + macros += BIGARRAY_MULTIPLIER=1 USING_XED PIN_CRT=1 __PIN__=1 + lit_libs += c-dynamic m-dynamic stlport-dynamic specific (vc9) { runtime_library = 0 @@ -34,7 +36,7 @@ project { } specific (gnuace, make) { - compile_flags += -O3 -fomit-frame-pointer -fno-strict-aliasing -Wno-unknown-pragmas -fno-stack-protector -fPIC + compile_flags += -O3 -funwind-tables -fno-stack-protector -fasynchronous-unwind-tables -fomit-frame-pointer -fno-strict-aliasing -fno-rtti -faligned-new -fPIC -isystem $(PIN_ROOT)/extras/stlport/include -isystem $(PIN_ROOT)/extras/libstdc++/include -isystem $(PIN_ROOT)/extras/crt/include -isystem $(PIN_ROOT)/extras/crt/include/arch-x86_64 -isystem $(PIN_ROOT)/extras/crt/include/kernel/uapi -isystem $(PIN_ROOT)/extras/crt/include/kernel/asm-x86_64 -I$(PIN_ROOT)/source/include/pin -I$(PIN_ROOT)/source/include/pin/gen -I$(PIN_ROOT)/extras/components/include -I$(PIN_ROOT)/extras/xed-intel64/include/xed -nostdlib compile_flags -= -Wunused-parameter libs += xed @@ -100,4 +102,5 @@ feature(intel64) { // DO NOT CHANGE ORDER lit_libs += libcpmt libcmt pinvm pin libxed ntdll-64 } + } -- cgit v1.2.1 From fc5c4f4269c353e22a03c2a4f47a0ca4e7732077 Mon Sep 17 00:00:00 2001 From: Caleb Kirby Date: Tue, 2 Feb 2021 12:51:12 -0500 Subject: update for pinpp on pin 3.14 --- config/pin_base.mpb | 4 ++-- config/pintool.mpb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/pin_base.mpb b/config/pin_base.mpb index 1c4b9d31..69389733 100644 --- a/config/pin_base.mpb +++ b/config/pin_base.mpb @@ -8,7 +8,7 @@ project { .. macros += BIGARRAY_MULTIPLIER=1 USING_XED PIN_CRT=1 __PIN__=1 - lit_libs += c-dynamic m-dynamic stlport-dynamic + lit_libs += c-dynamic m-dynamic stlport-dynamic dl-dynamic unwind-dynamic specific (vc9) { runtime_library = 0 @@ -36,7 +36,7 @@ project { } specific (gnuace, make) { - compile_flags += -O3 -funwind-tables -fno-stack-protector -fasynchronous-unwind-tables -fomit-frame-pointer -fno-strict-aliasing -fno-rtti -faligned-new -fPIC -isystem $(PIN_ROOT)/extras/stlport/include -isystem $(PIN_ROOT)/extras/libstdc++/include -isystem $(PIN_ROOT)/extras/crt/include -isystem $(PIN_ROOT)/extras/crt/include/arch-x86_64 -isystem $(PIN_ROOT)/extras/crt/include/kernel/uapi -isystem $(PIN_ROOT)/extras/crt/include/kernel/asm-x86_64 -I$(PIN_ROOT)/source/include/pin -I$(PIN_ROOT)/source/include/pin/gen -I$(PIN_ROOT)/extras/components/include -I$(PIN_ROOT)/extras/xed-intel64/include/xed -nostdlib + compile_flags += -O3 -funwind-tables -fno-stack-protector -fasynchronous-unwind-tables -fomit-frame-pointer -fno-strict-aliasing -fno-rtti -faligned-new -fPIC -isystem $(PIN_ROOT)/extras/stlport/include -isystem $(PIN_ROOT)/extras/libstdc++/include -isystem $(PIN_ROOT)/extras/crt/include -isystem $(PIN_ROOT)/extras/crt/include/arch-x86_64 -isystem $(PIN_ROOT)/extras/crt/include/kernel/uapi -isystem $(PIN_ROOT)/extras/crt/include/kernel/asm-x86_64 -I$(PIN_ROOT)/source/include/pin -I$(PIN_ROOT)/source/include/pin/gen -I$(PIN_ROOT)/extras/components/include -I$(PIN_ROOT)/extras/xed-intel64/include/xed -nostdlib -fpermissive -Wno-error=all -fno-exceptions compile_flags -= -Wunused-parameter libs += xed diff --git a/config/pintool.mpb b/config/pintool.mpb index e6b4bc10..00546a34 100644 --- a/config/pintool.mpb +++ b/config/pintool.mpb @@ -14,11 +14,11 @@ project : pin { verbatim (make, macros) { ifeq ($(shell uname -s), Darwin) CPPFLAGS += -DTARGET_MAC - LDFLAGS += -lpindwarf -lpinpthread -Wl,-exported_symbols_list -Wl,$(PIN_ROOT)/source/include/pin/pintool.exp + LDFLAGS += $(PIN_ROOT)/intel64/runtime/pincrt/crtbeginS.o -nostdlib -ldl-dynamic -lunwind-dynamic -lpin3dwarf -lpinpthread -Wl,-exported_symbols_list -Wl,$(PIN_ROOT)/source/include/pin/pintool.exp LDFLAGS -= -lpthread else - CPPFLAGS += -DTARGET_LINUX -Wl,--hash-style=sysv - LDLIBS += -lpindwarf + CPPFLAGS += -DTARGET_LINUX -fno-rtti -Wl,--hash-style=sysv $(PIN_ROOT)/intel64/runtime/pincrt/crtendS.o + LDLIBS += -nostdlib -ldl-dynamic -lunwind-dynamic -lpin3dwarf -L$(PIN_ROOT)/intel64/runtime/pincrt LDFLAGS += -Wl,-Bsymbolic -Wl,--version-script=$(PIN_ROOT)/source/include/pin/pintool.ver endif } @@ -30,7 +30,7 @@ project : pin { LDFLAGS -= -lpthread else CPPFLAGS += -DTARGET_LINUX -Wl,--hash-style=sysv - LIBS += -lpindwarf + LIBS += -lpindwarf -L$(PIN_ROOT)/intel64/runtime/pincrt LDFLAGS += -Wl,-Bsymbolic -Wl,--version-script=$(PIN_ROOT)/source/include/pin/pintool.ver endif } -- cgit v1.2.1 From 0bec2ed9c2f032d8a2157df302e80492d50ec251 Mon Sep 17 00:00:00 2001 From: Caleb Kirby Date: Wed, 3 Feb 2021 12:12:36 -0500 Subject: moved architecture specific commands to intel64 feature --- config/pin_base.mpb | 10 ++++++++-- config/pintool.mpb | 13 +++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/pin_base.mpb b/config/pin_base.mpb index 69389733..26bb6d5d 100644 --- a/config/pin_base.mpb +++ b/config/pin_base.mpb @@ -36,7 +36,8 @@ project { } specific (gnuace, make) { - compile_flags += -O3 -funwind-tables -fno-stack-protector -fasynchronous-unwind-tables -fomit-frame-pointer -fno-strict-aliasing -fno-rtti -faligned-new -fPIC -isystem $(PIN_ROOT)/extras/stlport/include -isystem $(PIN_ROOT)/extras/libstdc++/include -isystem $(PIN_ROOT)/extras/crt/include -isystem $(PIN_ROOT)/extras/crt/include/arch-x86_64 -isystem $(PIN_ROOT)/extras/crt/include/kernel/uapi -isystem $(PIN_ROOT)/extras/crt/include/kernel/asm-x86_64 -I$(PIN_ROOT)/source/include/pin -I$(PIN_ROOT)/source/include/pin/gen -I$(PIN_ROOT)/extras/components/include -I$(PIN_ROOT)/extras/xed-intel64/include/xed -nostdlib -fpermissive -Wno-error=all -fno-exceptions + compile_flags += -O3 -funwind-tables -fno-stack-protector -fasynchronous-unwind-tables -fomit-frame-pointer -fno-strict-aliasing -fno-rtti -faligned-new -fPIC -nostdlib -fpermissive -Wno-error=all -fno-exceptions + compile_flags += '-isystem $(PIN_ROOT)/extras/stlport/include -isystem $(PIN_ROOT)/extras/libstdc++/include -isystem $(PIN_ROOT)/extras/crt/include -isystem $(PIN_ROOT)/extras/crt/include/kernel/uapi' compile_flags -= -Wunused-parameter libs += xed @@ -88,7 +89,8 @@ feature(ia32) { } feature(intel64) { - includes += $(PIN_ROOT)/extras/xed-intel64/include + includes += $(PIN_ROOT)/extras/xed-intel64/include \ + $(PIN_ROOT)/extras/xed-intel64/include/xed libpaths += $(PIN_ROOT)/intel64/lib \ $(PIN_ROOT)/intel64/lib-ext \ @@ -103,4 +105,8 @@ feature(intel64) { lit_libs += libcpmt libcmt pinvm pin libxed ntdll-64 } + specific (make, gnuace) { + compile_flags += -isystem $(PIN_ROOT)/extras/crt/include/arch-x86_64 -isystem $(PIN_ROOT)/extras/crt/include/kernel/asm-x86_64 + } + } diff --git a/config/pintool.mpb b/config/pintool.mpb index 00546a34..bf795467 100644 --- a/config/pintool.mpb +++ b/config/pintool.mpb @@ -14,11 +14,11 @@ project : pin { verbatim (make, macros) { ifeq ($(shell uname -s), Darwin) CPPFLAGS += -DTARGET_MAC - LDFLAGS += $(PIN_ROOT)/intel64/runtime/pincrt/crtbeginS.o -nostdlib -ldl-dynamic -lunwind-dynamic -lpin3dwarf -lpinpthread -Wl,-exported_symbols_list -Wl,$(PIN_ROOT)/source/include/pin/pintool.exp + LDFLAGS += -nostdlib -ldl-dynamic -lunwind-dynamic -lpin3dwarf -lpinpthread -Wl,-exported_symbols_list -Wl,$(PIN_ROOT)/source/include/pin/pintool.exp LDFLAGS -= -lpthread else - CPPFLAGS += -DTARGET_LINUX -fno-rtti -Wl,--hash-style=sysv $(PIN_ROOT)/intel64/runtime/pincrt/crtendS.o - LDLIBS += -nostdlib -ldl-dynamic -lunwind-dynamic -lpin3dwarf -L$(PIN_ROOT)/intel64/runtime/pincrt + CPPFLAGS += -DTARGET_LINUX -fno-rtti -Wl,--hash-style=sysv + LDLIBS += -nostdlib -ldl-dynamic -lunwind-dynamic -lpin3dwarf LDFLAGS += -Wl,-Bsymbolic -Wl,--version-script=$(PIN_ROOT)/source/include/pin/pintool.ver endif } @@ -30,7 +30,7 @@ project : pin { LDFLAGS -= -lpthread else CPPFLAGS += -DTARGET_LINUX -Wl,--hash-style=sysv - LIBS += -lpindwarf -L$(PIN_ROOT)/intel64/runtime/pincrt + LIBS += -lpindwarf LDFLAGS += -Wl,-Bsymbolic -Wl,--version-script=$(PIN_ROOT)/source/include/pin/pintool.ver endif } @@ -54,4 +54,9 @@ feature (intel64) { specific (vc10, vc11, vc12, vc14, vs2017, vs2019) { EntryPointSymbol = Ptrace_DllMainCRTStartup } + + specific (make, gnuace) { + compile_flags += $(PIN_ROOT)/intel64/runtime/pincrt/crtendS.o + libpaths += $(PIN_ROOT)/intel64/runtime/pincrt + } } -- cgit v1.2.1 From f0380049c887971157b382ec333500c86259ade0 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 15 Mar 2021 13:09:35 +0100 Subject: Support and test zlib on windows * .github/workflows/windows.yml: * config/zlib.mpb: --- config/zlib.mpb | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/zlib.mpb b/config/zlib.mpb index af7711ac..ef207cb4 100644 --- a/config/zlib.mpb +++ b/config/zlib.mpb @@ -1,15 +1,24 @@ // -*- MPC -*- feature(zlib) { - includes += "$(ZLIB_ROOT)/include" - libpaths += "$(ZLIB_ROOT)/lib" + expand(ZLIB_INCDIR) { + ZLIB_INCDIR + $(ZLIB_ROOT)/include + } + expand(ZLIB_LIBDIR) { + ZLIB_LIBDIR + $(ZLIB_ROOT)/lib + } + + includes += "$(ZLIB_INCDIR)" + libpaths += "$(ZLIB_LIBDIR)" macros += ZLIB - // @@ Notice: If you are building with Cygwin, you may need to manually - // change the following library to zlib. specific(prop:windows) { zlibname = zlib - lit_libs += $(ZLIBNAME) + Debug::zlibname = zlibd + } else { - lit_libs += z + zlibname = z } + lit_libs += $(ZLIBNAME) } -- cgit v1.2.1 From fbff4b64fa9b24a602bd33f88691ab8fbeeb8cf7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 15 Mar 2021 13:24:55 +0100 Subject: Fix linux by reverting some change * config/zlib.mpb: --- config/zlib.mpb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/zlib.mpb b/config/zlib.mpb index ef207cb4..b761635f 100644 --- a/config/zlib.mpb +++ b/config/zlib.mpb @@ -16,9 +16,8 @@ feature(zlib) { specific(prop:windows) { zlibname = zlib Debug::zlibname = zlibd - + lit_libs += $(ZLIBNAME) } else { - zlibname = z + lit_libs += z } - lit_libs += $(ZLIBNAME) } -- cgit v1.2.1 From 2e515f1cf9327b1e8139893d050ce1771e47c6e4 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 15 Mar 2021 13:28:27 +0100 Subject: Windows fix * config/zlib.mpb: --- config/zlib.mpb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/zlib.mpb b/config/zlib.mpb index b761635f..76e2bb90 100644 --- a/config/zlib.mpb +++ b/config/zlib.mpb @@ -14,9 +14,8 @@ feature(zlib) { macros += ZLIB specific(prop:windows) { - zlibname = zlib - Debug::zlibname = zlibd - lit_libs += $(ZLIBNAME) + Debug::lit_libs += zlibd + Release::lit_libs += zlib } else { lit_libs += z } -- cgit v1.2.1 From 0b03e1dd5c42e2e292dde6968fdaa735f3028093 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 15 Mar 2021 17:07:43 +0100 Subject: Use variable * config/zlib.mpb: --- config/zlib.mpb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/zlib.mpb b/config/zlib.mpb index 76e2bb90..731935a3 100644 --- a/config/zlib.mpb +++ b/config/zlib.mpb @@ -1,11 +1,11 @@ // -*- MPC -*- feature(zlib) { expand(ZLIB_INCDIR) { - ZLIB_INCDIR + $ZLIB_INCDIR $(ZLIB_ROOT)/include } expand(ZLIB_LIBDIR) { - ZLIB_LIBDIR + $ZLIB_LIBDIR $(ZLIB_ROOT)/lib } -- cgit v1.2.1 From 59a3aec11c069ed9fc1e8348f9b991f8155af88f Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Fri, 19 Mar 2021 17:24:49 -0500 Subject: glib: support for finding headers directly in GLIB_ROOT/include conditional based on an MPC feature, default is to work as it did before this change --- config/glib.mpb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/glib.mpb b/config/glib.mpb index c7192cc7..0f9a9095 100644 --- a/config/glib.mpb +++ b/config/glib.mpb @@ -10,9 +10,16 @@ project { lib } - includes += $(GLIB_ROOT)/include/glib-$(GLIB_VERSION) \ - $(GLIB_ROOT)/$(GLIB_LIB_DIR)/glib-$(GLIB_VERSION)/include libpaths += $(GLIB_ROOT)/lib lit_libs += glib-$(GLIB_VERSION) } + +feature(glib_versioned_includes) { + includes += $(GLIB_ROOT)/include/glib-$(GLIB_VERSION) \ + $(GLIB_ROOT)/$(GLIB_LIB_DIR)/glib-$(GLIB_VERSION)/include +} + +feature(!glib_versioned_includes) { + includes += $(GLIB_ROOT)/include +} -- cgit v1.2.1 From f79c2228efd1e2d9a0da639a4c4b806d33b84192 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Fri, 19 Mar 2021 21:33:43 -0500 Subject: glib: lib is in debug subdirectory with vcpkg --- config/glib.mpb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config/glib.mpb b/config/glib.mpb index 0f9a9095..972f6083 100644 --- a/config/glib.mpb +++ b/config/glib.mpb @@ -22,4 +22,9 @@ feature(glib_versioned_includes) { feature(!glib_versioned_includes) { includes += $(GLIB_ROOT)/include + libpaths -= $(GLIB_ROOT)/lib + specific { + Debug::libpaths += $(GLIB_ROOT)/debug/lib + Release::libpaths += $(GLIB_ROOT)/lib + } } -- cgit v1.2.1 From 90d27bfe08cd862d48251396ee11db221ec13922 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 2 Jun 2021 10:46:12 +0200 Subject: Define WIN32_LEAN_AND_MEAN on Windows * config/nddslib.mpb: --- config/nddslib.mpb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/nddslib.mpb b/config/nddslib.mpb index fb4dcc9a..475b13a7 100644 --- a/config/nddslib.mpb +++ b/config/nddslib.mpb @@ -6,7 +6,7 @@ project { includes += $(NDDSHOME)/include $(NDDSHOME)/include/ndds specific(prop:windows) { - macros += RTI_WIN32 NDDS_DLL_VARIABLE + macros += RTI_WIN32 NDDS_DLL_VARIABLE WIN32_LEAN_AND_MEAN } verbatim(gnuace, circuit) { @@ -23,7 +23,7 @@ project { FLAGS_C_CC += -DRTI_LINUX endif ifeq ($(ACE_PLATFORM_CONFIG),config-win32.h) - FLAGS_C_CC += -DRTI_WIN32 + FLAGS_C_CC += -DRTI_WIN32 -DWIN32_LEAN_AND_MEAN else FLAGS_C_CC += -DRTI_UNIX endif -- cgit v1.2.1 From 7ac5f65d66146090573d322a58f7cdddc63556ca Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Tue, 9 Nov 2021 10:38:08 -0600 Subject: 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. --- config/pin_base.mpb | 2 +- config/pintool.mpb | 4 ++-- config/winapp.mpb | 5 +---- config/wireshark.mpb | 5 ++++- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'config') 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. -- cgit v1.2.1