diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-04-12 22:33:35 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-04-12 21:30:54 +0000 |
| commit | 0c700d895898e629dbf747716d62fadcde5f187f (patch) | |
| tree | b45f3d4791b65ac04ab176a2111b7a4c2b9649c8 /Makefile.nmake | |
| parent | c0d94c2a75adff93fc0307946e88081332dd28fd (diff) | |
| download | wireshark-0c700d895898e629dbf747716d62fadcde5f187f.tar.gz | |
Windows: fix generation of PortableApps.com installer
Change-Id: I249268ce21ddfbdc7f149609a950736b4fe2ae07
Reviewed-on: https://code.wireshark.org/review/8036
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index ec82c16dcb..92581610f7 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -535,6 +535,8 @@ PYTHON = $(PYTHON) MSVC_VARIANT = $(MSVC_VARIANT) MSVCR_DLL = "$(MSVCR_DLL:\=/)" +WIRESHARK_TARGET_PLATFORM = $(WIRESHARK_TARGET_PLATFORM) + QMAKE_CFLAGS *= $(STANDARD_CFLAGS) # NOMINMAX keeps windows.h from defining "min" and "max" via windef.h. # This avoids conflicts with the C++ standard library. |