aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/portableapps
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-04-12 22:33:35 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2015-04-12 21:30:54 +0000
commit0c700d895898e629dbf747716d62fadcde5f187f (patch)
treeb45f3d4791b65ac04ab176a2111b7a4c2b9649c8 /packaging/portableapps
parentc0d94c2a75adff93fc0307946e88081332dd28fd (diff)
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 'packaging/portableapps')
-rw-r--r--packaging/portableapps/Makefile.nmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/portableapps/Makefile.nmake b/packaging/portableapps/Makefile.nmake
index f5add0b0d3..efe08ea07e 100644
--- a/packaging/portableapps/Makefile.nmake
+++ b/packaging/portableapps/Makefile.nmake
@@ -69,6 +69,7 @@ dirs:
#!IFDEF UPX
# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe
# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.dll
+# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\extcap\*.dll
# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\plugins\$(VERSION)\*.dll
# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\*.dll
# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\*.dll
@@ -98,7 +99,6 @@ applauncher: appinfo
appbinaries: applauncher
xcopy $(TOPDIR)\wireshark-qt-release $(WIRESHARK_DIR) /D /I /E /Y
- xcopy $(TOPDIR)\extcap\androiddump.exe $(WIRESHARK_DIR)\extcap /d
xcopy $(TOPDIR)\capinfos.exe $(WIRESHARK_DIR) /d
xcopy $(TOPDIR)\captype.exe $(WIRESHARK_DIR) /d
xcopy $(TOPDIR)\dumpcap.exe $(WIRESHARK_DIR) /d