aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
2012-06-25Revert 43481: linking dftest against libui was not the problem.Jeff Morriss1-1/+1
svn path=/trunk/; revision=43488
2012-06-25From Tony Trinh:Anders Broman1-1/+1
Update Lua from 5.1 to 5.2 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400 svn path=/trunk/; revision=43482
2012-06-25Move get_args_as_string from ui/util.c into wsutil (maybe not to the bestJeff Morriss1-1/+1
module, but...). This makes dftest no longer dependent on libui, so stop linking against it. svn path=/trunk/; revision=43481
2012-06-21Move a bunch of common code in the file chooser dialog loops into aGuy Harris1-1/+1
routine to run a file chooser dialog. On Windows, add to that code to resolve shell links ("shortcuts"), adopted from the Sylpheed mail reader. (That code requires a pile of OLE stuff, so link with the OLE library.) Make it a bit easier to configure ui/gtk/capture_file_dlg.c to use GTK+ dialogs on Windows, but continue to default to using the Win32 dialogs, at least for now. svn path=/trunk/; revision=43439
2012-06-21Try to fix tarball compilation on Windows.Gerald Combs1-2/+0
svn path=/trunk/; revision=43428
2012-06-20Remove HAVE_WIRELESS_TOOLBAR from the other build systems.Jörg Mayer1-1/+0
svn path=/trunk/; revision=43419
2012-06-19Start to have an generic wireless toolbar. Sligtly modified patch from Anders Broman1-0/+1
Pontus Fuchs. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973 svn path=/trunk/; revision=43354
2012-06-13Add a comment as to .bsc files seemingly not usable with VS2010.Bill Meier1-0/+3
svn path=/trunk/; revision=43232
2012-06-13wireshark.bsc dependencies: fix a typo; add 2 which are missing.Bill Meier1-4/+6
svn path=/trunk/; revision=43229
2012-06-05Add the GeoIP DLL.Gerald Combs1-0/+1
svn path=/trunk/; revision=43128
2012-06-05Pass WTAP_VERSION to Qt. (WTAP_VERSION should probably match the GNUGerald Combs1-0/+1
toolchain version but that's a separate issue.) svn path=/trunk/; revision=43124
2012-06-04Make it possible to build with GTK3 on WindowsAnders Broman1-1/+23
svn path=/trunk/; revision=43083
2012-06-01No more GIOP plugins, no more GIOP plugin directory.Guy Harris1-1/+0
svn path=/trunk/; revision=42980
2012-05-31Clean GeoIP-1.4.8-*-win??ws folder with setup targetPascal Quantin1-0/+1
svn path=/trunk/; revision=42938
2012-05-30Back out previous change.Gerald Combs1-1/+1
svn path=/trunk/; revision=42907
2012-05-30Extract into the right directory.Gerald Combs1-1/+1
svn path=/trunk/; revision=42906
2012-05-29Use GeoIP 1.4.8 which includes a DLL instead of a static library.Gerald Combs1-1/+5
svn path=/trunk/; revision=42905
2012-05-14Try using an OBS-derived Gtk2 bundle, second try.Gerald Combs1-13/+28
svn path=/trunk/; revision=42623
2012-04-21Make it possible to download the GTK3 packageAnders Broman1-1/+2
svn path=/trunk/; revision=42174
2012-04-20Switch back to the gtk.org version of the GTK+ bundle since its CairoGerald Combs1-29/+14
doesn't crash. svn path=/trunk/; revision=42171
2012-04-20Clean gnutls-2.12.18-*-win??ws folder with setup targetpascal1-0/+1
svn path=/trunk/; revision=42170
2012-04-19Switch to our custom GTK+ bundles derived from openSUSE Build ServiceGerald Combs1-14/+29
packages. Sort and normalize our DLL lists. Add several new required DLLs. svn path=/trunk/; revision=42143
2012-04-04Add a "-build" argument to checkAPIs.pl. Use that argument when buildingJeff Morriss1-1/+1
from makefiles (and thus from the buildbot). The intention is to be able to tell when a human is running the tool so we can provide more code-review guidance. As a starter, enable the "too many proto_tree_add_text() calls" check when a human is running the tool. svn path=/trunk/; revision=41943
2012-03-25Give qmake a VERSION it will accept.Gerald Combs1-1/+3
svn path=/trunk/; revision=41762
2012-03-25Fix the Qt build for Win64.Gerald Combs1-0/+5
svn path=/trunk/; revision=41761
2012-03-16Capitalize "Wireshark" in various package names.Gerald Combs1-2/+2
svn path=/trunk/; revision=41621
2012-03-01CVARSDLL hasn't been used (is undefined) for a while....Bill Meier1-2/+2
(This commit should have been part of SVNB #41180). svn path=/trunk/; revision=41254
2012-03-01Update clean_setup list of win32-libs to be deleted.Bill Meier1-8/+10
svn path=/trunk/; revision=41252
2012-02-19Build the TShark taps into a static libcliui library in the ui/cliGuy Harris1-22/+14
directory, and link TShark with that; let's see if this fixes the Windows buildbots. svn path=/trunk/; revision=41070
2012-02-18Create a libui (static) library in the ui directory, which contains theGuy Harris1-19/+52
object files from all the source files in the ui directory (but not in its subdirectories), and link the programs that need it with them. This cleans things up a little bit, and may also fix the Windows build. svn path=/trunk/; revision=41061
2012-02-18Rename the (static) library built from stuff in ui/gtk to "libgtkui" inGuy Harris1-4/+4
automake/autoconf and nmake builds, to match the name in CMake builds. (Forgot Makefile.nmake.) svn path=/trunk/; revision=41059
2012-02-02Revert file commited by mistake.Anders Broman1-2/+2
svn path=/trunk/; revision=40804
2012-02-02Update the protocol name as per commit rev 40801.Anders Broman1-2/+2
svn path=/trunk/; revision=40802
2012-02-01Fix some Windows qmake and Qt Wireshark build issues:Bill Meier1-0/+3
If 'MANIFEST_INFO_REQUIRED' not defined in config.nmake, don't do 'mt ...' for Wireshark Qt; Add '*.pdb' to QMAKE_CLEAN; Fix 'Unescaped backslashes are deprecated' qmake warnings; Remove "debug" message() statements from QtShark.pro. svn path=/trunk/; revision=40797
2012-01-30Rework optional generation of .sbr & .bsc files.Bill Meier1-5/+14
svn path=/trunk/; revision=40779
2012-01-30Rework Windows Wireshark Qt build configuration a bit:Bill Meier1-6/+4
1. Compile and link with (almost exactly) the same options as used when building Windows Wireshark Gtk. The options used allow debugging of the exe using Visual Studio exactly as is done for Wireshark Gtk. Essentially: configure the "release" version to compile and link with symbols. (See ui\qt\QtShark for the details). 2. Update QtShark.pro to create a Makefile only for 1 version of Wireshark Qt which is linked against the "release" Qt libraries. (IOW: don't create a "debug" Makefile). 3. Remove unused variable assignments from config.pri. (They can be added back if needed in the future). svn path=/trunk/; revision=40768
2012-01-30(Trivial) use same "Directory Separator" for dependency and target.Bill Meier1-1/+1
svn path=/trunk/; revision=40767
2012-01-29Part of "Build Browse Information File per default" fromAnders Broman1-2/+4
Kovarththanan Rajaratnam applied. It's still not the default but easier to make it so. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3480 svn path=/trunk/; revision=40765
2012-01-24Compile PortAudio if it's available.Gerald Combs1-3/+4
svn path=/trunk/; revision=40708
2012-01-20Add more configuration information to config.pri which lets us removeGerald Combs1-10/+22
more hard-coded definitions from QtShark.pro. Quote an error message to fix a Qt Creator complaint. Add ui\qt\config.pri to the top-level "all" nmake target. Update README.qt. svn path=/trunk/; revision=40607
2012-01-20Try copying our plugins to an accessible directory. This assumes you've setGerald Combs1-0/+12
WIRESHARK_RUN_FROM_BUILD_DIRECTORY in your run environment. On Windows, generate a QMake include file (config.pri) from config.nmake. svn path=/trunk/; revision=40600
2012-01-16Another fixup for the move of win32 to ui\win32.Guy Harris1-1/+1
svn path=/trunk/; revision=40539
2012-01-16Make the win32 directory a subdirectory of the ui directory.Guy Harris1-11/+11
svn path=/trunk/; revision=40531
2012-01-15The name of the target for ui/gtk/libui.lib is "gtk", not "ui\gtk".Guy Harris1-1/+1
svn path=/trunk/; revision=40526
2012-01-15cd ../gtk ==> cd ../ui/gtkBill Meier1-1/+1
svn path=/trunk/; revision=40525
2012-01-15Move gtk to ui/gtk.Jörg Mayer1-17/+17
This looses the last checkin to gtk, will add this manually back. svn path=/trunk/; revision=40518
2012-01-06Quote some filename usage.Bill Meier1-4/+4
svn path=/trunk/; revision=40397
2012-01-06Remove support for MSVC < MSVC2005; Update Developer's Guide.Bill Meier1-11/+2
svn path=/trunk/; revision=40395
2011-12-28Simplify wireshark.nsi a bit by copying DLLs from the wireshark-gtk2Gerald Combs1-0/+2
directory. This picks up any DEP/ASLR-related changes. Run peflags on more DLLs. svn path=/trunk/; revision=40317
2011-12-28Add "peflags" to the list of required executables. Use it to make sureGerald Combs1-0/+4
the DLLs we use have DEP and ASLR enabled. svn path=/trunk/; revision=40316
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 03:52:23 +0000