git.samba.org / obnox / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
From Stefan Metzmacher:
[obnox/wireshark/wip.git] / Makefile.nmake
diff --git a/Makefile.nmake b/Makefile.nmake
index 6bdb268a482872a8432cdd79afe5073f3612a7ed..b8570767bb842a41b82bb07d33cff07e2e245c8c 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -167,7 +167,7 @@ wireshark.exe       :
 wireshark.exe  : config.h svnversion.h $(wireshark_OBJECTS) getopt.obj codecs epan gtk image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib gtk\libui.lib plugins
        @echo Linking $@
        $(LINK) @<<
-               /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) getopt.obj $(GTK1_LIBS) codecs\codecs.lib gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res
+               /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) getopt.obj $(GTK1_LIBS) codecs\codecs.lib gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res
 <<
 !ENDIF
 
@@ -177,14 +177,14 @@ wireshark-gtk2.exe        :
 wireshark-gtk2.exe     : config.h svnversion.h $(wireshark_OBJECTS) getopt.obj codecs epan gtk2 image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib gtk2.tmp\libui.lib plugins
        @echo Linking $@
        $(LINK) @<<
-               /OUT:wireshark-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) getopt.obj $(GTK2_LIBS) codecs\codecs.lib gtk2.tmp\libui.lib $(wireshark_OBJECTS) image\wireshark.res
+               /OUT:wireshark-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) getopt.obj $(GTK2_LIBS) codecs\codecs.lib gtk2.tmp\libui.lib $(wireshark_OBJECTS) image\wireshark.res
 <<
 !ENDIF
 
 tshark.exe     : config.h svnversion.h $(tshark_OBJECTS) getopt.obj epan image\tshark.res wiretap\wiretap-$(WTAP_VERSION).lib plugins
        @echo Linking $@
        $(LINK) @<<
-               /OUT:tshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(tshark_LIBS) $(tshark_OBJECTS) getopt.obj image\tshark.res
+               /OUT:tshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console $(tshark_LIBS) $(tshark_OBJECTS) getopt.obj image\tshark.res
 <<
 
 capinfos.exe   : config.h capinfos.obj getopt.obj wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
@@ -503,11 +503,12 @@ verify_tools:
 # Download and install all the required libraries into WIRESHARK_LIBS.
 # If you used this setup target before, consider doing a clean_setup.
 setup: verify_tools
+    if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
 !IF "$(GTK2_INST_VERSION)" == "2.8"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               glib gtk2.8/glib-2.12.1.zip
+               glib gtk2.8/glib-2.12.4.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               glib gtk2.8/glib-dev-2.12.1.zip
+               glib gtk2.8/glib-dev-2.12.4.zip
 !ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.6/glib-2.6.6.zip
@@ -580,9 +581,9 @@ setup: verify_tools
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/gtk+-dev-2.8.20.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.8/cairo-1.2.2.zip
+               gtk2 gtk2.8/cairo-1.2.6.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.8/cairo-dev-1.2.2.zip
+               gtk2 gtk2.8/cairo-dev-1.2.6.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/atk-1.10.3.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
@@ -617,11 +618,11 @@ setup: verify_tools
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2/atk-dev-1.4.0.zip
 !ENDIF
-!IF "$(PANGO_INST_VERSION)" == "1.12"
+!IF "$(PANGO_INST_VERSION)" == "1.14"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.8/pango-1.12.3.zip
+               gtk2 gtk2.8/pango-1.14.5.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.8/pango-dev-1.12.3.zip
+               gtk2 gtk2.8/pango-dev-1.14.5.zip
 !ELSEIF "$(PANGO_INST_VERSION)" == "1.10"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/pango-1.10.1.zip
@@ -655,9 +656,9 @@ setup: verify_tools
 # downloaded zip files.
 clean_setup:
     rm -r -f $(WIRESHARK_LIBS)/adns-1.0-win32-05
-    rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.13.1
+    rm -r -f $(WIRESHARK_LIBS)/gettext-0.14.5
     rm -r -f $(WIRESHARK_LIBS)/glib
-    rm -r -f $(WIRESHARK_LIBS)/gnutls-1.5.0-1
+    rm -r -f $(WIRESHARK_LIBS)/gnutls-1.5.1-1
     rm -r -f $(WIRESHARK_LIBS)/gtk2
     rm -r -f $(WIRESHARK_LIBS)/gtk+
     rm -r -f $(WIRESHARK_LIBS)/gtk-wimp
@@ -752,7 +753,6 @@ install-common-files:
        xcopy ".\diameter\*.dtd" $(INSTALL_DIR)\diameter /d
        xcopy ".\diameter\*.xml" $(INSTALL_DIR)\diameter /d
        if not exist $(INSTALL_DIR)\plugins\$(VERSION) mkdir $(INSTALL_DIR)\plugins\$(VERSION)
-       xcopy ".\plugins\acn\acn.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
        xcopy ".\plugins\agentx\agentx.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
        xcopy ".\plugins\artnet\artnet.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
        xcopy ".\plugins\asn1\asn1.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
@@ -805,14 +805,14 @@ install-deps2: install-common-deps2
        if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR) mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)
        if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders
        if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules
-       if not exist $(INSTALL2_DIR)\lib\pango mkdir $(INSTALL2_DIR)\lib\pango
-       if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR) mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)
-       if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules
+#      if not exist $(INSTALL2_DIR)\lib\pango mkdir $(INSTALL2_DIR)\lib\pango
+#      if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR) mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)
+#      if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules
        xcopy $(GTK2_DIR)\etc\gtk-2.0\*.* $(INSTALL2_DIR)\etc\gtk-2.0 /d
        xcopy $(GTK2_DIR)\etc\pango\pango.* $(INSTALL2_DIR)\etc\pango /d
        xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders /d
        xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules /d
-       xcopy $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules /d
+#      xcopy $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules /d
 !IFDEF NEED_LIBPNG_DLL
        xcopy $(GTK2_DIR)\bin\libpng13.dll $(INSTALL2_DIR) /d
 !ENDIF
@@ -820,11 +820,11 @@ install-deps2: install-common-deps2
        xcopy $(GTK2_DIR)\bin\libcairo-2.dll $(INSTALL2_DIR)  /d
        xcopy $(GTK2_DIR)\bin\libpangocairo-1.0-0.dll $(INSTALL2_DIR) /d
 !ENDIF
-       if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines
-       xcopy "$(GTK_WIMP_DIR)\libwimp.dll" $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines /d
-!IF "$(GTK2_INST_VERSION)" != "2.8"
-       if not exist $(INSTALL2_DIR)\share\themes\Default\gtk-2.0 mkdir $(INSTALL2_DIR)\share\themes\Default\gtk-2.0
-       xcopy "$(GTK_WIMP_DIR)\Theme\gtk-2.0\gtkrc" $(INSTALL2_DIR)\share\themes\Default\gtk-2.0 /d
+!IFDEF GTK_WIMP_DIR
+       if not exist $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR) mkdir $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR)
+       xcopy "$(GTK_WIMP_DLLSRC_DIR)\libwimp.dll" $(INSTALL2_DIR)\$(GTK_WIMP_DLLDST_DIR) /d
+       if not exist $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR) mkdir $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR)
+       xcopy "$(GTK_WIMP_RCSRC_DIR)\gtkrc" $(INSTALL2_DIR)\$(GTK_WIMP_RCDST_DIR) /d
 !ENDIF
 !ENDIF
 
@@ -871,8 +871,9 @@ install-common-deps:
        xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d
 !ENDIF
 !IFDEF NET_SNMP_DIR
-       if not exist $(INSTALL_DIR)\mibs mkdir $(INSTALL_DIR)\mibs
-       xcopy "$(NET_SNMP_DIR)\mibs\*.txt" $(INSTALL_DIR)\mibs /d
+       if not exist $(INSTALL_DIR)\snmp mkdir $(INSTALL_DIR)\snmp
+       if not exist $(INSTALL_DIR)\snmp\mibs mkdir $(INSTALL_DIR)\snmp\mibs
+       xcopy "$(NET_SNMP_DIR)\mibs\*.txt" $(INSTALL_DIR)\snmp\mibs /d
 !ENDIF
 !IFDEF LUA_DIR
        xcopy "$(LUA_DIR)\lib\dll\lua5.1.dll" $(INSTALL_DIR) /d
git mirror of the wireshark svn