aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-06-08 15:57:00 +0200
committerMichael Mann <mmann78@netscape.net>2016-06-15 19:21:57 +0000
commit6baa1b544c84a766d9f9d356e9940eccaf0a128f (patch)
treefc5431419180335703edcbf01e6b260d2c0dcbfd /ui
parent88bd50c592b0d24a12dd178ae2858444400a012f (diff)
Remove Nmake build system
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'ui')
-rw-r--r--ui/Makefile.am1
-rw-r--r--ui/Makefile.nmake85
-rw-r--r--ui/cli/Makefile.am3
-rw-r--r--ui/cli/Makefile.nmake63
-rw-r--r--ui/gtk/Makefile.am1
-rw-r--r--ui/gtk/Makefile.nmake176
-rw-r--r--ui/qt/Makefile.am2
-rw-r--r--ui/qt/Wireshark.pro189
-rw-r--r--ui/win32/Makefile.nmake40
9 files changed, 5 insertions, 555 deletions
diff --git a/ui/Makefile.am b/ui/Makefile.am
index a1185688bf..befc051784 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -86,5 +86,4 @@ EXTRA_DIST = \
CMakeLists.txt \
doxygen.cfg.in \
Makefile.common \
- Makefile.nmake \
win32
diff --git a/ui/Makefile.nmake b/ui/Makefile.nmake
deleted file mode 100644
index 55fe06d036..0000000000
--- a/ui/Makefile.nmake
+++ /dev/null
@@ -1,85 +0,0 @@
-## Makefile for building wireshark.exe with Microsoft C and nmake
-## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
-#
-
-include ..\config.nmake
-include ..\Makefile.nmake.inc
-
-############### no need to modify below this line #########
-
-# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
-GENERATED_CFLAGS=\
- $(STANDARD_CFLAGS) \
- /Zm800 \
- /I.. $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \
- /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
- /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
- /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
- $(PORTAUDIO_CFLAGS) $(GEOIP_CFLAGS) $(WINSPARKLE_CFLAGS) \
- $(HHC_CFLAGS)
-
-CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
-
-.c.obj::
- $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
-
-include Makefile.common
-
-
-# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST
-WIRESHARK_UI_OBJECTS = \
- $(WIRESHARK_UI_SRC:.c=.obj) \
- $(GENERATED_C_FILES:.c=.obj) \
- $(DIRTY_GENERATED_C_FILES:.c=.obj)
-
-RUNLEX=../tools/runlex.sh
-
-text_import_scanner.h: text_import_scanner.c
-text_import_scanner_lex.h: text_import_scanner.c
-text_import_scanner.obj : text_import_scanner.c
- $(CC) $(GENERATED_CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $?
-
-libui.lib : ..\config.h $(WIRESHARK_UI_OBJECTS)
- link /lib /out:libui.lib $(WIRESHARK_UI_OBJECTS)
-
-clean:
- rm -f $(WIRESHARK_UI_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libui.lib \
- *.nativecodeanalysis.xml *.pdb *.sbr \
- doxygen.cfg html/*.* wireshark-tap-register-cache.pkl
- if exist html rmdir html
-
-distclean: clean
-
-maintainer-clean: distclean
- rm -f $(GENERATED_FILES)
-
-# convert doxygen.cfg.in to doxygen.cfg with stamped version info
-doxygen.cfg: ..\config.nmake doxygen.cfg.in
-!IFDEF DOXYGEN
- sed -e s/@VERSION@/$(VERSION)/ \
- < doxygen.cfg.in > $@
-!ENDIF
-
-doxygen-run:
-!IFDEF DOXYGEN
- $(DOXYGEN) doxygen.cfg
-!ENDIF
-
-# MS html help compiler hhc returns 1 on success, but as nmake expects 0 it would stop here.
-# the prepended -1 will raise the accepted error levels of nmake, so it will continue
-doxygen.chm:
-!IFDEF HHC
- -1 $(HHC) html\index.hhp
-!ENDIF
-
-doxygen: doxygen.cfg doxygen-run doxygen.chm
-
-checkapi: checkapi-base checkapi-todo
-
-checkapi-base:
- $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk -build \
- $(WIRESHARK_UI_SRC)
-
-checkapi-todo:
- $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \
- $(WIRESHARK_UI_SRC)
diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am
index a10dd5d6fb..8140d3850b 100644
--- a/ui/cli/Makefile.am
+++ b/ui/cli/Makefile.am
@@ -76,5 +76,4 @@ checkapi:
EXTRA_DIST = \
.editorconfig \
$(GENERATOR_FILES) \
- Makefile.common \
- Makefile.nmake
+ Makefile.common
diff --git a/ui/cli/Makefile.nmake b/ui/cli/Makefile.nmake
deleted file mode 100644
index e3e24b2476..0000000000
--- a/ui/cli/Makefile.nmake
+++ /dev/null
@@ -1,63 +0,0 @@
-## Makefile for building wireshark.exe with Microsoft C and nmake
-## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
-#
-
-include ..\..\config.nmake
-include ..\..\Makefile.nmake.inc
-
-############### no need to modify below this line #########
-
-# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
-GENERATED_CFLAGS=\
- $(STANDARD_CFLAGS) \
- /Zm800 \
- /I../.. $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \
- /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
- /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
- /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
- $(PORTAUDIO_CFLAGS) $(GEOIP_CFLAGS) \
- $(HHC_CFLAGS)
-
-CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
-
-.c.obj::
- $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
-
-include Makefile.common
-
-
-# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST
-TSHARK_TAP_OBJECTS = $(TSHARK_TAP_SRC:.c=.obj)
-
-
-libcliui.lib : ..\..\config.h $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj
- link /lib /out:libcliui.lib $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj
-
-#
-# Build "tshark-tap-register.c", which contains a function
-# "register_all_tap_listeners()"
-# that calls the register routines for all TShark tap listeners.
-#
-# We do this by grepping through sources.
-#
-# Formatting conventions: The name of the tap_listener_register_*
-# routines must start in column zero, or must be preceded only by
-# "void " starting in column zero, and must not be inside #if.
-#
-tshark-tap-register.c: Makefile.common $(TSHARK_TAP_SRC) ..\..\tools\make-tap-reg.py
- @echo Making tshark-tap-register.c
- @$(PYTHON) ..\..\tools\make-tap-reg.py . tshark-taps $(TSHARK_TAP_SRC)
-
-clean:
- rm -f $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj libcliui.lib *.pdb \
- *.nativecodeanalysis.xml *.sbr doxygen.cfg html/*.* tshark-tap-register-cache.pkl \
- tshark-tap-register.c-tmp
- if exist html rmdir html
-
-distclean: clean
-
-maintainer-clean: distclean
- rm -f $(GENERATED_FILES)
-
-checkapi:
- $(PERL) ../../tools/checkAPIs.pl -build $(TSHARK_TAP_SRC)
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index 2ccbd86919..c9c8b071e6 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -67,7 +67,6 @@ EXTRA_DIST = \
main_airpcap_toolbar.c \
main_airpcap_toolbar.h \
Makefile.common \
- Makefile.nmake \
Makefile_custom.common \
pixbuf-csource.c \
pixbuf-csource.h
diff --git a/ui/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake
deleted file mode 100644
index f2cf3968ee..0000000000
--- a/ui/gtk/Makefile.nmake
+++ /dev/null
@@ -1,176 +0,0 @@
-## Makefile for building wireshark.exe with Microsoft C and nmake
-## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
-#
-
-include ..\..\config.nmake
-include ..\..\Makefile.nmake.inc
-
-############### no need to modify below this line #########
-
-# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
-GENERATED_CFLAGS=\
- $(STANDARD_CFLAGS) \
- /Zm800 \
- /I../.. $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \
- $(ZLIB_CFLAGS) /I$(PCAP_DIR)\WPCAP\LIBPCAP \
- /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
- /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
- /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
- $(PORTAUDIO_CFLAGS) $(GEOIP_CFLAGS) \
- $(HHC_CFLAGS)
-
-CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
-
-.c.obj::
- $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
-
-include Makefile.common
-
-
-# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST
-WIRESHARK_CLEAN_LIBGTKUI_SRC = \
- $(WIRESHARK_COMMON_GTK_SRC) \
- $(WIRESHARK_TAP_SRC) \
- $(GENERATED_FILES) \
- airpcap_dlg.c \
- airpcap_gui_utils.c \
- capture_if_details_dlg_win32.c \
- main_airpcap_toolbar.c \
- pixbuf-csource.c \
- extcap_gtk.c
-
-WIRESHARK_LIBGTKUI_SRC = \
- $(WIRESHARK_CLEAN_LIBGTKUI_SRC)
-
-PORT_AUDIO_SRC = \
-!IFDEF PORTAUDIO_DIR
-!IF "$(PORTAUDIO_VERSION)" == "18"
- pa_lib.c \
-!ELSE
- pa_allocation.c \
- pa_converters.c \
- pa_cpuload.c \
- pa_dither.c \
- pa_front.c \
- pa_process.c \
- pa_skeleton.c \
- pa_stream.c \
- pa_trace.c \
- pa_win_util.c \
- pa_win_hostapis.c \
- pa_x86_plain_converters.c \
- pa_win_waveformat.c \
-!ENDIF
- pa_win_wmme.c
-!ENDIF
-
-WIRESHARK_LIBGTKUI_OBJECTS = \
- $(WIRESHARK_LIBGTKUI_SRC:.c=.obj) \
- $(PORT_AUDIO_SRC:.c=.obj)
-
-libgtkui.lib: ..\..\config.h $(WIRESHARK_LIBGTKUI_OBJECTS)
- link /lib /out:libgtkui.lib $(WIRESHARK_LIBGTKUI_OBJECTS) winmm.lib
-
-# The first argument is the directory in which the source files live.
-# The second argument is "taps", to indicate that we should build
-# a tap register file.
-# All subsequent arguments are the files to scan.
-#
-wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) Makefile.common Makefile_custom.common ../../tools/make-tap-reg.py
- @echo Making wireshark-tap-register.c
- @$(PYTHON) "../../tools/make-tap-reg.py" . taps $(WIRESHARK_TAP_SRC)
-
-!IF "$(PORTAUDIO_VERSION)" == "18"
-pa_lib.obj: $(PORTAUDIO_DIR)\pa_common\pa_lib.c
- $(CC) -c $(LOCAL_CFLAGS) $?
-
-pa_win_wmme.obj: $(PORTAUDIO_DIR)\pa_win_wmme\pa_win_wmme.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-!ELSE
-pa_front.obj: $(PORTAUDIO_DIR)\src\common\pa_front.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_allocation.obj: $(PORTAUDIO_DIR)\src\common\pa_allocation.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_converters.obj: $(PORTAUDIO_DIR)\src\common\pa_converters.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_cpuload.obj: $(PORTAUDIO_DIR)\src\common\pa_cpuload.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_dither.obj: $(PORTAUDIO_DIR)\src\common\pa_dither.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_process.obj: $(PORTAUDIO_DIR)\src\common\pa_process.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_skeleton.obj: $(PORTAUDIO_DIR)\src\common\pa_skeleton.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_stream.obj: $(PORTAUDIO_DIR)\src\common\pa_stream.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_trace.obj: $(PORTAUDIO_DIR)\src\common\pa_trace.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_win_wmme.obj: $(PORTAUDIO_DIR)\src\hostapi\wmme\pa_win_wmme.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_win_util.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_util.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_win_hostapis.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_hostapis.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_x86_plain_converters.obj: $(PORTAUDIO_DIR)\src\os\win\pa_x86_plain_converters.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-pa_win_waveformat.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_waveformat.c
- $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $?
-
-!ENDIF
-
-clean:
- rm -f $(WIRESHARK_LIBGTKUI_OBJECTS) libgtkui.lib *.nativecodeanalysis.xml *.pdb *.sbr \
- doxygen.cfg html/*.* wireshark-tap-register-cache.pkl \
- wireshark-tap-register.c-tmp
- if exist html rmdir html
-
-distclean: clean
-
-maintainer-clean: distclean
- rm -f $(GENERATED_FILES)
-
-# convert doxygen.cfg.in to doxygen.cfg with stamped version info
-doxygen.cfg: ..\..\config.nmake doxygen.cfg.in
-!IFDEF DOXYGEN
- sed -e s/@VERSION@/$(VERSION)/ \
- < doxygen.cfg.in > $@
-!ENDIF
-
-doxygen-run:
-!IFDEF DOXYGEN
- $(DOXYGEN) doxygen.cfg
-!ENDIF
-
-# MS html help compiler hhc returns 1 on success, but as nmake expects 0 it would stop here.
-# the prepended -1 will raise the accepted error levels of nmake, so it will continue
-doxygen.chm:
-!IFDEF HHC
- -1 $(HHC) html\index.hhp
-!ENDIF
-
-doxygen: doxygen.cfg doxygen-run doxygen.chm
-
-checkapi: checkapi-base checkapi-todo
-
-checkapi-base:
- $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk -build \
- $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \
- $(WIRESHARK_TAP_SRC)
-
-checkapi-todo:
- $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \
- $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \
- $(WIRESHARK_TAP_SRC)
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index 90633af04c..435d494e16 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -326,8 +326,6 @@ endif # HAVE_DOXYGEN
#checkapi: checkapi-base checkapi-todo
-# XXX to be created
-# Makefile.nmake
EXTRA_DIST = \
$(GENERATOR_FILES) \
$(UI_FILES) \
diff --git a/ui/qt/Wireshark.pro b/ui/qt/Wireshark.pro
index adcc95eaf9..d99cb17a53 100644
--- a/ui/qt/Wireshark.pro
+++ b/ui/qt/Wireshark.pro
@@ -29,11 +29,7 @@ isEqual(QT_MAJOR_VERSION, 4) {
QT += core widgets printsupport multimedia
}
-isEqual(QT_MAJOR_VERSION, 5): greaterThan(QT_MINOR_VERSION, 1): win32 {
- QT += winextras
-}
-
-win32|macx {
+macx {
TARGET = Wireshark
} else {
TARGET = wireshark
@@ -62,8 +58,6 @@ xxx {
isEmpty (QMAKE_EXTENSION_SHLIB) {
macx {
QMAKE_EXTENSION_SHLIB=".dylib"
- } else: win32 {
- QMAKE_EXTENSION_SHLIB=".dll"
} else { # Everyone else runs Linux or Solaris, right?
QMAKE_EXTENSION_SHLIB=".so"
}
@@ -111,55 +105,6 @@ unix {
}
}
-win32 {
- # Note:
- # Windows Wireshark is compiled with /MD and thus must
- # be linked with the "release" versions of the Qt libraries
- # which are also compiled with /MD.
- #
- # Also: Windows Wireshark is compiled with /Zi and linked with /DEBUG
- # which enables source level Wireshark debugging using the
- # Windows Visual Studio debugger.
- # So: QMAKE_CFLAGS, QMAKE_CXXFLAGS and QMAKE_LFLAGS are set to match
- # those used building Windows Wireshark. (See config.pri).
- # Among other things source-level debugging of the Qt version of Wireshark
- # (including the ui/qt source) is thus enabled.
- #
- # Note that in this case source level debugging of the Qt
- # *libraries* will not be possible since the Qt release libs are
- # not compiled with /Zi (and not linked with /DEBUG).
- # The Qt "debug" libraries are compiled with /MDd. To build a
- # Wireshark-Qt debug version with the ability to do source level debugging
- # of the Qt libraries themselves requires that Wireshark first be built with /MDd.
- # Presumably doing source-level Qt library debugging shoyuld rarely be needed.
-
- # We want to build only the Wireshark linked with the Qt "release" libraries
- # so disable debug & etc.
-## CONFIG -= release
- CONFIG -= debug
- CONFIG -= debug_and_release
-
- # Use only Wireshark CFLAGS, CXXFLAGS and LDFLAGS from config.nmake (as provided via config.pri)
- # for building the "release" version of Wireshark-Qt
- # (e.g., so we don't get the Qt release CFLAGS [specifically /O2]
- QMAKE_CFLAGS_RELEASE = ""
- QMAKE_CXXFLAGS_RELEASE = ""
- QMAKE_LFLAGS_RELEASE = ""
-
- # XXX We need to figure out how to pull this in from config.nmake.
- !include( config.pri ) {
- error("Can't find config.pri. Have you run 'nmake -f Makefile.nmake' two directories up?")
- }
-
- !wireshark_manifest_info_required {
- CONFIG -= embed_manifest_dll
- CONFIG -= embed_manifest_exe
- }
-
- # Use xcopy instead of copy so as to ensure that newer version of files are copied
- QMAKE_COPY_FILE = xcopy /d /y
-}
-
SOURCES_TAP = \
"stats_tree_dialog.cpp"
@@ -167,23 +112,11 @@ tap_register.name = Generate wireshark-tap-register.c
tap_register.input = SOURCES_TAP
tap_register.output = wireshark-tap-register.c
tap_register.variable_out = SOURCES
-win32 {
- tap_register.commands = $${PYTHON} "../../tools/make-tap-reg.py" "\"""$$PWD""\"" taps $$SOURCES_TAP
-} else {
- tap_register.commands = python ../../tools/make-tap-reg.py "\"""$$PWD""\"" taps $$SOURCES_TAP
-}
+tap_register.commands = python ../../tools/make-tap-reg.py "\"""$$PWD""\"" taps $$SOURCES_TAP
#tap_register.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += tap_register
INCLUDEPATH += ../..
-win32:INCLUDEPATH += \
- $${WIRESHARK_LIB_DIR}/gtk2/include/glib-2.0 $${WIRESHARK_LIB_DIR}/gtk2/lib/glib-2.0/include \
- $${WIRESHARK_LIB_DIR}/gtk3/include/glib-2.0 $${WIRESHARK_LIB_DIR}/gtk3/lib/glib-2.0/include \
- $${WIRESHARK_LIB_DIR}/WpdPack/Include \
- $${WIRESHARK_LIB_DIR}/AirPcap_Devpack_4_1_0_1622/Airpcap_Devpack/include \
- $${GNUTLS_DIR}/include \
- $${GEOIP_DIR}/include \
- $${ZLIB_DIR}
# We have to manually trigger relinking each time one of these is modified.
# Is there any way to do this automatically?
@@ -201,10 +134,6 @@ SOURCES_WS_C = \
../../sync_pipe_write.c \
../../ws_version_info.c
-win32:SOURCES_WS_C += \
- ../../ui/win32/console_win32.c \
- ../../ui/win32/file_dlg_win32.c
-
HEADERS_WS_C = \
../../wsutil/privileges.h
@@ -388,15 +317,8 @@ HEADERS += $$HEADERS_WS_C \
wireless_frame.h \
wlan_statistics_dialog.h
-win32 {
- OBJECTS_WS_C = $$SOURCES_WS_C
- OBJECTS_WS_C ~= s/[.]c/.obj/g
- OBJECTS_WS_C ~= s,/,\\,g
- OBJECTS_WS_C += ../../image/file_dlg_win32.res
-} else {
## XXX: Shouldn't need to (re)compile WS_C sources ??
- SOURCES += $$SOURCES_WS_C
-}
+SOURCES += $$SOURCES_WS_C
DEFINES += REENTRANT
unix:DEFINES += _U_=\"__attribute__((unused))\"
@@ -481,106 +403,6 @@ macx {
QMAKE_POST_LINK += $$quote(chmod 444 \"$${FRAMEWORKS_DIR}/\"*.dylib$$escape_expand(\\n\\t))
}
-win32 {
- DEFINES+=HAVE_PCAP_REMOTE
- DEFINES+=HAVE_PCAP_SETSAMPLING
- # Add the wireshark objects to LIBS
- LIBS += $$OBJECTS_WS_C
- LIBS += $$PA_OBJECTS
- LIBS += \
- $${guilibsdll} $${HHC_LIBS} \
- -L../../epan -llibwireshark -L../../wsutil -llibwsutil \
- -L../../wiretap -lwiretap-$${WTAP_VERSION} \
- -L../../capchild -llibcapchild -L../../caputils -llibcaputils \
- -L.. -llibui -L../../codecs -llibwscodecs \
- -L$${GLIB_DIR}/lib -lglib-2.0 -lgmodule-2.0 \
- -L$${ZLIB_DIR}/lib -lzdll \
- -L$${WINSPARKLE_DIR} -lWinSparkle
-
- !isEmpty(MSVCR_DLL) {
- EXTRA_BINFILES += \"$${MSVCR_DLL}\"
- }
-
- PLATFORM_DLL_DIR = $(DESTDIR)platforms
- CONFIG(debug, debug|release) {
- isEqual(QT_MAJOR_VERSION, 4) {
- EXTRA_DLLS = QtCored4 QtGuid4
- } else: lessThan(QT_MINOR_VERSION, 3) {
- # The QT lib parts are copied by windeployqt post 5.3
- EXTRA_DLLS = Qt5Cored Qt5Guid Qt5Widgetsd Qt5PrintSupportd Qt5Multimediad
- EXTRA_PLATFORM_DLLS = qwindowsd
- QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLATFORM_DLL_DIR} $(MKDIR) $${PLATFORM_DLL_DIR}$$escape_expand(\\n\\t))
- }
- }
- CONFIG(release, debug|release) {
- isEqual(QT_MAJOR_VERSION, 4) {
- EXTRA_DLLS = QtCore4 QtGui4
- } else: lessThan(QT_MINOR_VERSION, 3) {
- # The QT lib parts are copied by windeployqt post 5.3
- EXTRA_DLLS = Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport Qt5Multimedia
- EXTRA_PLATFORM_DLLS = qwindows
- QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLATFORM_DLL_DIR} $(MKDIR) $${PLATFORM_DLL_DIR}$$escape_expand(\\n\\t))
- }
- }
- for(DLL,EXTRA_DLLS){
- EXTRA_BINFILES += $$[QT_INSTALL_BINS]/$${DLL}.dll
- }
- INSTALL_PLATFORM_DIR = $$[QT_INSTALL_PLUGINS]/platforms
- INSTALL_PLATFORM_DIR ~= s,/,\\,g
- for(DLL,EXTRA_PLATFORM_DLLS){
- QMAKE_POST_LINK +=$$quote($(COPY_FILE) $${INSTALL_PLATFORM_DIR}\\$${DLL}.dll $${PLATFORM_DLL_DIR}$$escape_expand(\\n\\t))
- EXTRA_BINFILES +=
- }
-
- EXTRA_BINFILES += \
- ../../dumpcap.exe \
- ../../epan/libwireshark.dll ../../wiretap/wiretap-$${WTAP_VERSION}.dll \
- ../../wsutil/libwsutil.dll ../../codecs/libwscodecs.dll \
- $${GLIB_DIR}/bin/libglib-2.0-0.dll $${GLIB_DIR}/bin/libgmodule-2.0-0.dll \
- $${GLIB_DIR}/bin/$${INTL_DLL} \
- $${GLIB_DIR}/bin/gspawn-$${WIRESHARK_TARGET_PLATFORM}-helper.exe \
- $${GLIB_DIR}/bin/gspawn-$${WIRESHARK_TARGET_PLATFORM}-helper-console.exe \
- $${C_ARES_DIR}/bin/libcares-2.dll $${ZLIB_DIR}/zlib1.dll \
- $${GNUTLS_DIR}/bin/libffi-6.dll $${GNUTLS_DIR}/bin/$${GCC_DLL} \
- $${GNUTLS_DIR}/bin/libgcrypt-20.dll $${GNUTLS_DIR}/bin/libgmp-10.dll \
- $${GNUTLS_DIR}/bin/libgnutls-28.dll $${GNUTLS_DIR}/bin/$${GPGERROR_DLL} \
- $${GNUTLS_DIR}/bin/libhogweed-2-4.dll $${GNUTLS_DIR}/bin/libnettle-4-6.dll \
- $${GNUTLS_DIR}/bin/libp11-kit-0.dll $${GNUTLS_DIR}/bin/libtasn1-6.dll \
- $${GNUTLS_DIR}/bin/libintl-8.dll $${SMI_DIR}/bin/libsmi-2.dll \
- $${LUA_DIR}/lua52.dll \
- $${GEOIP_DIR}/bin/libGeoIP-1.dll \
- $${LIBSSH_DIR}/bin/libssh.dll \
- $${WINSPARKLE_DIR}/WinSparkle.dll \
- ../../colorfilters ../../dfilters ../../cfilters
-
- wireshark_use_kfw {
- EXTRA_BINFILES += \
- $${KFW_DIR}/bin/$${COMERR_DLL} $${KFW_DIR}/bin/$${KRB5_DLL} $${KFW_DIR}/bin/$${K5SPRT_DLL}
- }
-
- EXTRA_BINFILES ~= s,/,\\,g
- for(FILE,EXTRA_BINFILES){
- QMAKE_POST_LINK +=$$quote($(COPY_FILE) $${FILE} $(DESTDIR)$$escape_expand(\\n\\t))
- }
- PLUGINS_DIR = $(DESTDIR)plugins
- QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLUGINS_DIR} $(MKDIR) $${PLUGINS_DIR}$$escape_expand(\\n\\t))
- QMAKE_POST_LINK +=$$quote($(COPY_FILE) ..\\..\\$${INSTALL_DIR}\\plugins\\*.dll $(DESTDIR)plugins$$escape_expand(\\n\\t))
-
- # This doesn't depend on wireshark-gtk2. It also doesn't work.
- #PLUGINS_IN_PWD=$${IN_PWD}
- #PLUGINS_OUT_PWD=$${OUT_PWD}
- #QMAKE_POST_LINK +=$$quote(cd $$replace(PLUGINS_IN_PWD, /, \\)\\..\\..\\plugins$$escape_expand(\\n\\t))
- #QMAKE_POST_LINK +=$$quote(nmake -f Makefile.nmake INSTALL_DIR=$$replace(PLUGINS_OUT_PWD, /, \\)\\$(DESTDIR)$$escape_expand(\\n\\t))
- #QMAKE_POST_LINK +=$$quote(cd $$replace(PLUGINS_IN_PWD, /, \\)$$escape_expand(\\n\\t))
-
- # Use windeployqt to copy the required QT libs.
- # Currently the QT bin dir has to be on the path for windeployqt to work
- isEqual(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 2) {
- QMAKE_POST_LINK +=$$quote(set PATH=%PATH%;$${QT5_BASE_DIR}\\bin$$escape_expand(\\n\\t))
- QMAKE_POST_LINK +=$$quote(windeployqt --release --no-compiler-runtime --verbose 10 $(DESTDIR)wireshark.exe)$$escape_expand(\\n\\t))
- }
-}
-
RESOURCES += \
../../image/about.qrc \
../../image/languages/languages.qrc \
@@ -609,8 +431,7 @@ RC_FILE = ../../image/wireshark.rc
!isEmpty(TRANSLATIONS) {
isEmpty(QMAKE_LRELEASE) {
- win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
- else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+ QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
}
isEmpty(TS_DIR):TS_DIR = Translations
@@ -626,8 +447,6 @@ RC_FILE = ../../image/wireshark.rc
message(No translation files in project)
}
-win32: QMAKE_CLEAN += *.pdb *.pri
-
HEADERS += \
byte_view_tab.h \
byte_view_text.h \
diff --git a/ui/win32/Makefile.nmake b/ui/win32/Makefile.nmake
deleted file mode 100644
index 136d7efea0..0000000000
--- a/ui/win32/Makefile.nmake
+++ /dev/null
@@ -1,40 +0,0 @@
-## Makefile for building wireshark.exe with Microsoft C and nmake
-## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
-#
-
-include ..\..\config.nmake
-include ..\..\Makefile.nmake.inc
-
-############### no need to modify below this line #########
-
-CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
- /Zm800 \
- /I../.. $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \
- /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
- /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
- /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS)
-
-.c.obj::
- $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
-
-# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST in the main Wireshark directory
-WIRESHARK_WIN32_SRC = \
- console_win32.c \
- file_dlg_win32.c \
- print_win32.c \
-
-WIRESHARK_WIN32_OBJECTS = $(WIRESHARK_WIN32_SRC:.c=.obj)
-
-libgtkui_win32.lib : ..\..\config.h $(WIRESHARK_WIN32_OBJECTS)
- link /lib /out:libgtkui_win32.lib $(WIRESHARK_WIN32_OBJECTS) winmm.lib
-
-clean:
- rm -f $(WIRESHARK_WIN32_OBJECTS) libgtkui_win32.lib *.nativecodeanalysis.xml *.pdb *.sbr
-
-distclean: clean
-
-maintainer-clean: distclean
-
-checkapi:
- $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk -build \
- $(WIRESHARK_WIN32_SRC)