diff options
author | stallions <stallions@a3e5c962-4219-0410-a828-e124f845ac39> | 2010-02-16 04:39:19 +0000 |
---|---|---|
committer | stallions <stallions@a3e5c962-4219-0410-a828-e124f845ac39> | 2010-02-16 04:39:19 +0000 |
commit | e66c0c5a7fa9a427d6fc16c4f34c07deb32af23f (patch) | |
tree | 471a37baf85d22fa450bf8c7063d587f632c6244 | |
parent | fc777abf0641aa0fa74c65340de9b96c1cbad7d7 (diff) | |
download | MPC-e66c0c5a7fa9a427d6fc16c4f34c07deb32af23f.tar.gz |
Tue Feb 16 04:36:04 UTC 2010 Steven Stallion <stallions@ociweb.com>
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | config/wireshark.mpb | 16 |
2 files changed, 11 insertions, 13 deletions
@@ -1,3 +1,9 @@ +Tue Feb 16 04:36:04 UTC 2010 Steven Stallion <stallions@ociweb.com> + + * config/wireshark.mpb: + + Fixed whitespace problems introduced in previous commit. + Tue Feb 16 00:56:18 UTC 2010 Chad Elliott <elliott_c@ociweb.com> * templates/make.mpd: @@ -15,7 +21,7 @@ Mon Feb 15 19:23:45 UTC 2010 Steven Stallion <stallions@ociweb.com> * config/wireshark.mpb: - Final round of updates for Wireshark support on Windows. + Final round of updates for Wireshark support on Windows. Mon Feb 15 04:59:26 UTC 2010 Steven Stallion <stallions@ociweb.com> diff --git a/config/wireshark.mpb b/config/wireshark.mpb index 17106406..63039348 100644 --- a/config/wireshark.mpb +++ b/config/wireshark.mpb @@ -12,29 +12,21 @@ project : glib { verbatim(nmake, top) { include $(WIRESHARK_SRC)/config.nmake } - 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(vc71, vc8, vc9, vc10, nmake) { - libpaths += $(WIRESHARK_SRC)/wiretap $(WIRESHARK_SRC)/epan - lit_libs += wiretap-$(WIRETAP_VERSION) libwireshark - + specific(vc71,vc8,vc9,nmake) { + libpaths += $(WIRESHARK_SRC)/wiretap $(WIRESHARK_SRC)/epan + lit_libs += wiretap-$(WIRETAP_VERSION) libwireshark } else { libpaths += $(WIRESHARK_SRC)/wiretap/.libs $(WIRESHARK_SRC)/epan/.libs - lit_libs += wiretap wireshark + lit_libs += wiretap wireshark } } |