forked from osmocom/wireshark
Copy over the C runtime DLLs if MSVCR_DLL is defined.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44544 f5534014-38df-0310-8fa8-9805f1628bb7
This commit is contained in:
parent
014d087e6e
commit
a08815ab36
|
@ -453,6 +453,7 @@ GEOIP_DIR = $(GEOIP_DIR:\=/)
|
|||
INTL_DLL = $(INTL_DLL)
|
||||
|
||||
MSVC_VARIANT = $(MSVC_VARIANT)
|
||||
MSVCR_DLL = "$(MSVCR_DLL:\=/)"
|
||||
|
||||
QMAKE_CFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/)
|
||||
QMAKE_CXXFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/)
|
||||
|
|
|
@ -319,6 +319,10 @@ win32 {
|
|||
-L../../epan -llibwireshark -L../../wsutil -llibwsutil -L../../wiretap -lwiretap-$${WTAP_VERSION} \
|
||||
-L$${GLIB_DIR}/lib -lglib-2.0 -lgmodule-2.0
|
||||
|
||||
!isEmpty(MSVCR_DLL) {
|
||||
EXTRA_BINFILES += \"$${MSVCR_DLL}\"
|
||||
}
|
||||
|
||||
CONFIG(debug, debug|release) {
|
||||
EXTRA_BINFILES += \
|
||||
$$QMAKE_LIBDIR_QT/QtCored4.dll \
|
||||
|
|
Loading…
Reference in New Issue