diff options
| author | Frederick Hornsey <fred@hornsey.us> | 2018-01-05 14:13:14 -0600 |
|---|---|---|
| committer | Frederick Hornsey <fred@hornsey.us> | 2018-01-05 14:13:14 -0600 |
| commit | cbbf0e91fc00276a086b2257c94a873c79aa2f66 (patch) | |
| tree | a6c41860e75b7086d37da7e7ea67aa99b92b7e21 | |
| parent | 78e0a66333262217e08fd0ab69f879617914f663 (diff) | |
| download | MPC-cbbf0e91fc00276a086b2257c94a873c79aa2f66.tar.gz | |
wireshark.mpb Line Endings Fix
| -rw-r--r-- | config/wireshark.mpb | 144 |
1 files changed, 72 insertions, 72 deletions
diff --git a/config/wireshark.mpb b/config/wireshark.mpb index df392261..061bfb55 100644 --- a/config/wireshark.mpb +++ b/config/wireshark.mpb @@ -1,72 +1,72 @@ -feature(!wireshark, !wireshark2) {
- requires += wireshark_any
-}
-
-project : glib {
- requires += wireshark_any
-
- // Unfortunately Wireshark does not install headers for plugin
- // development; instead we rely on the source distribution:
- includes += $(WIRESHARK_SRC)
-
- specific(vc71) {
- macros += MSC_VER_REQUIRED=1310
- }
- specific(vc8) {
- macros += MSC_VER_REQUIRED=1400
- }
- specific(vc9) {
- macros += MSC_VER_REQUIRED=1500
- }
- 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
- }
- specific(vs2017) {
- macros += MSC_VER_REQUIRED=1910
- }
- verbatim(nmake, top, 1) {
- include $(WIRESHARK_SRC)/config.nmake
- }
-
- specific(!prop:windows) {
- libpaths += $(WIRESHARK_SRC)/wiretap/.libs $(WIRESHARK_SRC)/epan/.libs
- lit_libs += wiretap wireshark
- }
-}
-
-feature(wireshark) {
- avoids += wireshark2
- specific(prop:windows) {
- libpaths += $(WIRESHARK_SRC)/wiretap $(WIRESHARK_SRC)/epan
- lit_libs += wiretap-$(WIRETAP_VERSION) libwireshark
- }
-}
-
-feature(wireshark2) {
- avoids += wireshark
- // Because building Wireshark 2 on Windows is a CMake out of source build, we
- // need a few more parameters:
- // WIRESHARK2_BUILD is the build folder, which should contain config.h
- // WIRESHARK2_BIN is the folder where the executables and libraries were
- // placed. This is likely $WIRESHARK2_BUILD\run\RelWithDebInfo, so it is
- // the default, but is left as an option in case the build configuration is
- // different.
- expand(WIRESHARK2_BIN) {
- $WIRESHARK2_BIN
- $WIRESHARK2_BUILD\run\RelWithDebInfo
- }
- specific(prop:windows) {
- includes += $(WIRESHARK2_BUILD)
- libpaths += $(WIRESHARK2_BIN)
- lit_libs += wiretap wireshark wsutil
- }
-}
+feature(!wireshark, !wireshark2) { + requires += wireshark_any +} + +project : glib { + requires += wireshark_any + + // Unfortunately Wireshark does not install headers for plugin + // development; instead we rely on the source distribution: + includes += $(WIRESHARK_SRC) + + specific(vc71) { + macros += MSC_VER_REQUIRED=1310 + } + specific(vc8) { + macros += MSC_VER_REQUIRED=1400 + } + specific(vc9) { + macros += MSC_VER_REQUIRED=1500 + } + 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 + } + specific(vs2017) { + macros += MSC_VER_REQUIRED=1910 + } + verbatim(nmake, top, 1) { + include $(WIRESHARK_SRC)/config.nmake + } + + specific(!prop:windows) { + libpaths += $(WIRESHARK_SRC)/wiretap/.libs $(WIRESHARK_SRC)/epan/.libs + lit_libs += wiretap wireshark + } +} + +feature(wireshark) { + avoids += wireshark2 + specific(prop:windows) { + libpaths += $(WIRESHARK_SRC)/wiretap $(WIRESHARK_SRC)/epan + lit_libs += wiretap-$(WIRETAP_VERSION) libwireshark + } +} + +feature(wireshark2) { + avoids += wireshark + // Because building Wireshark 2 on Windows is a CMake out of source build, we + // need a few more parameters: + // WIRESHARK2_BUILD is the build folder, which should contain config.h + // WIRESHARK2_BIN is the folder where the executables and libraries were + // placed. This is likely $WIRESHARK2_BUILD\run\RelWithDebInfo, so it is + // the default, but is left as an option in case the build configuration is + // different. + expand(WIRESHARK2_BIN) { + $WIRESHARK2_BIN + $WIRESHARK2_BUILD\run\RelWithDebInfo + } + specific(prop:windows) { + includes += $(WIRESHARK2_BUILD) + libpaths += $(WIRESHARK2_BIN) + lit_libs += wiretap wireshark wsutil + } +} |