Constify some arguments.

[obnox/wireshark/wip.git] / Makefile.nmake

diff --git a/Makefile.nmake b/Makefile.nmake
index f0079f0a74b75ed6d821c9991864dc9f62513b7c..cbc3522e4b6002de4f8f5235721104f45e1e574f 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -93,7 +93,7 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 !ENDIF
 
 tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
-       wsock32.lib user32.lib shell32.lib \
+       wsock32.lib user32.lib \
        $(GLIB_LIBS) \
        wsutil\libwsutil.lib \
        $(GNUTLS_LIBS) \
@@ -113,7 +113,7 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 !ENDIF
 
 rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
-       wsock32.lib user32.lib shell32.lib \
+       wsock32.lib user32.lib \
        $(GLIB_LIBS) \
        wsutil\libwsutil.lib \
        $(GNUTLS_LIBS) \
@@ -144,17 +144,17 @@ editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
        $(GLIB_LIBS)
 
 mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
-       wsock32.lib user32.lib shell32.lib \
+       wsock32.lib user32.lib \
        wsutil\libwsutil.lib \
        $(GLIB_LIBS)
 
 text2pcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
-       wsock32.lib user32.lib shell32.lib \
+       wsock32.lib user32.lib \
        wsutil\libwsutil.lib \
        $(GLIB_LIBS)
 
 dumpcap_LIBS= \
-       wsock32.lib user32.lib shell32.lib \
+       wsock32.lib user32.lib \
        wsutil\libwsutil.lib \
        $(GLIB_LIBS) \
        $(GTHREAD_LIBS)
@@ -178,7 +178,7 @@ dftest_LIBS=  wiretap\wiretap-$(WTAP_VERSION).lib \
 !ENDIF
 
 randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
-       user32.lib shell32.lib \
+       user32.lib \
        wsutil\libwsutil.lib \
        $(GLIB_LIBS)
 
@@ -359,7 +359,6 @@ config.h    : config.h.win32 config.nmake
            -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \
            -e "s/@HAVE_NETTLE@/$(NETTLE_CONFIG)/" \
            -e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \
-           -e "s/@HAVE_GZCLEARERR@/$(ZLIB_GZCLEARERR_CONFIG)/" \
            -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \
            -e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \
            -e "s/@HAVE_PCAP_DATALINK_NAME_TO_VAL@/$(PCAP_DATALINK_NAME_TO_VAL_CONFIG)/" \
@@ -389,6 +388,8 @@ config.h    : config.h.win32 config.nmake
            -e "s/@HAVE_GEOIP@/$(GEOIP_CONFIG)/" \
            -e "s/@INET6@/$(INET6_CONFIG)/" \
            -e "s/@HAVE_NTDDNDIS_H@/$(NTDDNDIS_CONFIG)/" \
+           -e "s/@MAIN_MENU_USE_UIMANAGER@/$(MAIN_MENU_USE_UIMANAGER)/" \
+           -e "s/@WANT_PACKET_EDITOR@/$(WANT_PACKET_EDITOR)/" \
            < config.h.win32 > $@
 
 
@@ -621,7 +622,11 @@ $(ADNS_DLL):
 $(ZLIB_DLL):
        xcopy $(ZLIB_DIR) zlib.tmp /D /I /E /Y
        cd zlib.tmp
-       $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="$(LOCAL_CFLAGS)"
+!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
+       $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj" 
+!else
+       $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"
+!endif 
        if not exist $(ZLIB_DIR) mkdir $(ZLIB_DIR)
        if not exist $(ZLIB_DIR)\lib mkdir $(ZLIB_DIR)\lib
        if not exist $(ZLIB_DIR)\include mkdir $(ZLIB_DIR)\include
@@ -807,7 +812,11 @@ process_libs:
 !ENDIF
 !IFDEF ZLIB_DIR
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               zlib123 zlib123ws.zip
+!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
+               zlib125 zlib-1.2.5.zip
+!else
+               zlib125 zlib125ws.zip
+!endif
 !ENDIF
 !IFDEF LUA_DIR
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -832,7 +841,7 @@ process_libs:
 !ENDIF
 !IFDEF HHC_DIR
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               user-guide user-guide-34434.zip
+               user-guide user-guide-37310.zip
 !ENDIF
 !IFDEF UPX
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -840,7 +849,7 @@ process_libs:
 !ENDIF
 !IFDEF NASM
        @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               . nasm-2.02-win32.zip
+               . nasm-2.09.08-win32.zip
 !ENDIF
 !IF "$(WIN_SETUP_OPT)" == "--download"
        @$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIBS)"
@@ -880,6 +889,7 @@ clean_setup:
     rm -r -f libsmi-0.4.8
     rm -r -f nasm-2.00
     rm -r -f nasm-2.02
+    rm -r -f nasm-2.09.08
     rm -r -f pcre-6.4
     rm -r -f pcre-7.0
     rm -r -f portaudio_v19
@@ -890,6 +900,7 @@ clean_setup:
     rm -r -f AirPcap_Devpack_4_0_0_1480
     rm -r -f AirPcap_Devpack_4_1_0_1622
     rm -r -f zlib123
+    rm -r -f zlib-1.2.5
     rm -r -f zlib123-dll
     rm -r -f upx301w
     rm -r -f upx303w
@@ -949,6 +960,7 @@ install-generated-files:
        xcopy "doc\AUTHORS-SHORT" $(INSTALL_DIR) /d
        xcopy ".\manuf" $(INSTALL_DIR) /d
        xcopy ".\services" $(INSTALL_DIR) /d
+       xcopy ".\pdml2html.xsl" $(INSTALL_DIR) /d
        $(TEXTIFY) "./COPYING" $(INSTALL_DIR)
        $(TEXTIFY) "./NEWS" $(INSTALL_DIR)
        $(TEXTIFY) "./README" $(INSTALL_DIR)