aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
AgeCommit message (Collapse)AuthorFilesLines
2011-09-25Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGERJörg Mayer1-3/+0
as it is the only option left. svn path=/trunk/; revision=39138
2011-08-21Make MAIN_MENU_USE_UIMANAGER the default.Anders Broman1-1/+1
svn path=/trunk/; revision=38650
2011-08-17Always build with -DGTK_DISABLE_DEPRECATED. The files thatJörg Mayer1-3/+1
fail when built in specific configurations will disable this option when required. svn path=/trunk/; revision=38588
2011-08-08MAIN_MENU_USE_UIMANAGER is also used in some includes, not onlyJörg Mayer1-2/+3
in .c files, so the aproach to #undef GTK_DISABLE_DEPRECATED was wrong. Only enable GTK_DISABLE_DEPRECATED if MAIN_MENU_USE_UIMANAGER is defined. svn path=/trunk/; revision=38420
2011-08-08Looks like the Windows code isn't as clean as the Unix path:Jörg Mayer1-1/+2
Comment out GTK_DISABLE_DEPRECATED svn path=/trunk/; revision=38405
2011-08-08GTK3 stuff:Jörg Mayer1-0/+2
- Update Status file - configure.in: start GSEALing with 2.20 and not 2.22 - configure.in/config.nmake/CMakeLists.txt: enable GTK_DISABLE_SINGLE_INCLUDE and GTK_DISABLE_DEPRECATED - menus.c: If not building with UI_MANAGER, disable GTK_DISABLE_DEPRECATED svn path=/trunk/; revision=38404
2011-08-07svn path=/trunk/; revision=38396Anders Broman1-1/+2
2011-08-07Revert previous commit.Anders Broman1-2/+1
(Note to self read the description first) "Returns : a newly-allocated string, with all the upper case characters in str converted to lower case, with semantics that exactly match g_ascii_tolower(). (Note that this is unlike the old g_strdown(), which modified the string in place.)" svn path=/trunk/; revision=38395
2011-08-07 Replace deprecated glib functions.Anders Broman1-1/+2
set DG_DISABLE_DEPRECATED for windows build. svn path=/trunk/; revision=38394
2011-08-03- Get rid of deprecated functions.Anders Broman1-0/+1
- Include pangocairo. svn path=/trunk/; revision=38317
2011-07-29 - Always build with GSEAL_ENABLEAnders Broman1-1/+2
svn path=/trunk/; revision=38252
2011-07-19Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmakeGerald Combs1-34/+34
use WIRESHARK_LIB_DIR for the location of our external libraries. svn path=/trunk/; revision=38119
2011-07-19Pull WIRESHARK_LIBS from the system environment if it's available.Gerald Combs1-0/+3
svn path=/trunk/; revision=38114
2011-07-17Include Cairo lib to be able to use caro functions.Anders Broman1-0/+1
svn path=/trunk/; revision=38066
2011-06-27Use the latest libsmi package. Note that we now support OID resolutionGerald Combs1-4/+6
on 64-bit Windows. svn path=/trunk/; revision=37808
2011-06-23Remove old PCRE references from the Windows build environment. We're notGerald Combs1-36/+0
likely to add it back to wireshark-win32-libs and it was never available in wireshark-win64-libs. svn path=/trunk/; revision=37778
2011-06-17Make pcap-ng the default. Add a compile-time option to prefer pcap-ng orGerald Combs1-0/+3
pcap. Add a "-P" capture option which tries to use pcap instead of pcap-ng ("-P" seemed to be the best option but we may want to use a different letter). Update the documentation and release notes. svn path=/trunk/; revision=37696
2011-06-06Bump the wiretap version.Gerald Combs1-3/+3
svn path=/trunk/; revision=37571
2011-05-31Remove HAVE_AIRPDCAPAnders Broman1-2/+0
svn path=/trunk/; revision=37495
2011-05-19FOP 0.95 → 1.0.Gerald Combs1-1/+1
svn path=/trunk/; revision=37300
2011-05-141.5.2 → 1.7.0.Gerald Combs1-2/+2
svn path=/trunk/; revision=37148
2011-05-14Move MAIN_MENU_USE_UI_MANAGER outside of if win32.Anders Broman1-3/+3
svn path=/trunk/; revision=37141
2011-05-12Conditional support for packet-editor [default=no].Jakub Zawadzki1-0/+4
svn path=/trunk/; revision=37084
2011-05-12Make the use of UIManager a configure option.Anders Broman1-0/+3
NOTE Only for Windows. Additional moves to UIManager. svn path=/trunk/; revision=37072
2011-04-29On Windows: don't (try but fail--the code did not work) to defineJeff Morriss1-1/+0
HAVE_GZLCEARERR. Define HAVE_INFLATEPRIME if we HAVE_LIBZ. svn path=/trunk/; revision=36954
2011-04-20Only add /SafeSEH to LDFLAGS if WIRESHARK_TARGET_PLATFORM != win64. The Chris Maynard1-0/+2
Windows-7-x64 buildbot doesn't like it and reports the following: LINK : fatal error LNK1246: '/SAFESEH' not compatible with 'x64' target machine; link without '/SAFESEH' svn path=/trunk/; revision=36730
2011-04-19Explicitly add /GS to CFLAGS and /SafeSEH & /FIXED:no to LDFLAGS.Gerald Combs1-2/+9
svn path=/trunk/; revision=36722
2011-04-13Ok let's try GTK 2.22 on Win64 too - fix a typo.Anders Broman1-1/+1
svn path=/trunk/; revision=36623
2011-04-13Ok let's try GTK 2.22 on Win64 too.Anders Broman1-4/+4
svn path=/trunk/; revision=36620
2011-04-13Try out GTK 2.22Anders Broman1-4/+4
svn path=/trunk/; revision=36619
2011-04-13Restore defaultsAnders Broman1-1/+1
svn path=/trunk/; revision=36618
2011-04-13Build win64 with a modified zlib (google is your friend).Anders Broman1-3/+3
http://www.apachehaus.com/forum/index.php?action=printpage;topic=143.0 First problem: ZLIB build must be fixed for x64, otherwise there will be one unresolved external symbol later. Quick fix is to open build\win32\build_zlib.bat and insert this at line 51: set ASM_OPTS=AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" (info found in zlib\win32\Makefile.msc) and then open zlib\contrib\masmx64\inffas8664.c and prepend "../../" to four includes at the beginning. svn path=/trunk/; revision=36616
2011-04-12Fix nasm pathname: nasm-2.09-08\nasm.exe ==> nasm-2.09.08\nasm.exeBill Meier1-1/+1
svn path=/trunk/; revision=36596
2011-04-12Build with zlib-1.2.5 for win32Anders Broman1-4/+4
zlib for GTK hasd this comment: /* LFS conventions have no meaning on Windows. Looking for feature * macros like _LARGEFILE64_SOURCE or _FILE_OFFSET_BITS on Windows is * wrong. So make sure any such macros misguidedly defined by the * user have no effect. Windows has large file support, but the * official zlib DLL has not been built to provide the 64-bit offset * APIs, sigh. So we have just patched out the 64-bit offset API * from this header file. */ svn path=/trunk/; revision=36586
2011-04-101.5.1 → 1.5.2. Reenable Babel.Gerald Combs1-1/+1
svn path=/trunk/; revision=36540
2011-04-05Use the latest library tag, which updates GNUTLS. Add code to check forGerald Combs1-2/+2
libintl-8.dll and add the GNUTLS version if needed. svn path=/trunk/; revision=36483
2011-03-08Remove the 'NEW_PACKET_LIST' defines & etc (since the code no longer ↵Bill Meier1-6/+0
supports the old packet list) svn path=/trunk/; revision=36165
2011-03-01Update some of the "Details" properties in the installer. Remove theGerald Combs1-0/+1
32-bit BMPs from the installer icon; they don't appear to render properly. svn path=/trunk/; revision=36113
2011-02-21Fix a typo.Gerald Combs1-1/+1
svn path=/trunk/; revision=36021
2011-02-15Update a few comments about the use of LOCAL_CFLAGS, STANDARD_CFLAGS and ↵Bill Meier1-2/+4
WARNING_ARE_ERRORS svn path=/trunk/; revision=35952
2011-02-15Enable /analyze:WX- only if ENABLE_CODE_ANALYSIS is defined ...Bill Meier1-2/+2
svn path=/trunk/; revision=35951
2011-02-14Enable Enterprise Code Analysis via the ENABLE_CODE_ANALYSIS environmentGerald Combs1-2/+2
variable. svn path=/trunk/; revision=35946
2011-02-02A bit of Windows makefiles rework and cleanup:Bill Meier1-12/+48
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile; a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS; b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake) (This allows disabling "Warnings as Errors" by just changing config.nmake) c. CVARSDLL definitions (not usage) have been removed from the various makefiles. XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since: -DWIN32 and -DNULL=0 do not appear to be needed (any more); -D_MT and _D_DLL are not needed since /MP causes these definitions. d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled. E.G., 4295: array is too small to include a terminating null character - config.nmake: reformat some long lines for readability; - plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile); - dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ... svn path=/trunk/; revision=35747
2011-01-28Add an option to enable Code Analysis for C/C++ (MSVC's static analyzer).Gerald Combs1-0/+7
svn path=/trunk/; revision=35688
2011-01-28Use the correct processor architecture in our manifest. This lets usGerald Combs1-6/+14
create a usable wireshark.exe for x64 using Visual C++ 10. Change the name of VCREDIST_DLL to PROCESSOR_ARCHITECTURE to more accurately reflect what it's used for. Allow MSVC_VARIANT to be set from the system environment, mainly to keep me from accidentally clobbering it in the future. svn path=/trunk/; revision=35687
2011-01-241.5.0 → 1.5.1.Gerald Combs1-1/+1
svn path=/trunk/; revision=35639
2010-12-29Updates for Wireshark portable installer. Using nsis unicode now.Chris Maynard1-1/+11
svn path=/trunk/; revision=35300
2010-11-27Remove "not tested" note on MSVC 2010's vcredist instructionsStephen Fisher1-1/+0
svn path=/trunk/; revision=35040
2010-11-26Remove comment stating that Microsoft Visual Studio 2010 doesn't work since ↵Stephen Fisher1-2/+0
the express edition does (and presumably the full edition does also) svn path=/trunk/; revision=35031
2010-11-09From Michael Wells: Fix "missing path seperator in config.nmake"Bill Meier1-1/+1
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5378 svn path=/trunk/; revision=34829
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 10:12:14 +0000