aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
AgeCommit message (Collapse)AuthorFilesLines
2011-04-29On Windows: don't (try but fail--the code did not work) to definemorriss1-1/+0
HAVE_GZLCEARERR. Define HAVE_INFLATEPRIME if we HAVE_LIBZ. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36954 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-20Only add /SafeSEH to LDFLAGS if WIRESHARK_TARGET_PLATFORM != win64. The cmaynard1-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' git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36730 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-19Explicitly add /GS to CFLAGS and /SafeSEH & /FIXED:no to LDFLAGS.gerald1-2/+9
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36722 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-13Ok let's try GTK 2.22 on Win64 too - fix a typo.etxrab1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36623 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-13Ok let's try GTK 2.22 on Win64 too.etxrab1-4/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36620 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-13Try out GTK 2.22etxrab1-4/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36619 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-13Restore defaultsetxrab1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36618 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-13Build win64 with a modified zlib (google is your friend).etxrab1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36616 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-12Fix nasm pathname: nasm-2.09-08\nasm.exe ==> nasm-2.09.08\nasm.exewmeier1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36596 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-12Build with zlib-1.2.5 for win32etxrab1-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. */ git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36586 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-101.5.1 → 1.5.2. Reenable Babel.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36540 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-05Use the latest library tag, which updates GNUTLS. Add code to check forgerald1-2/+2
libintl-8.dll and add the GNUTLS version if needed. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36483 f5534014-38df-0310-8fa8-9805f1628bb7
2011-03-08Remove the 'NEW_PACKET_LIST' defines & etc (since the code no longer ↵wmeier1-6/+0
supports the old packet list) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36165 f5534014-38df-0310-8fa8-9805f1628bb7
2011-03-01Update some of the "Details" properties in the installer. Remove thegerald1-0/+1
32-bit BMPs from the installer icon; they don't appear to render properly. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36113 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-21Fix a typo.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36021 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-15Update a few comments about the use of LOCAL_CFLAGS, STANDARD_CFLAGS and ↵wmeier1-2/+4
WARNING_ARE_ERRORS git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35952 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-15Enable /analyze:WX- only if ENABLE_CODE_ANALYSIS is defined ...wmeier1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35951 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-14Enable Enterprise Code Analysis via the ENABLE_CODE_ANALYSIS environmentgerald1-2/+2
variable. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35946 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-02A bit of Windows makefiles rework and cleanup:wmeier1-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 ... git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35747 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-28Add an option to enable Code Analysis for C/C++ (MSVC's static analyzer).gerald1-0/+7
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35688 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-28Use the correct processor architecture in our manifest. This lets usgerald1-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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35687 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-241.5.0 → 1.5.1.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35639 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-29Updates for Wireshark portable installer. Using nsis unicode now.cmaynard1-1/+11
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35300 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-27Remove "not tested" note on MSVC 2010's vcredist instructionssfisher1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35040 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-26Remove comment stating that Microsoft Visual Studio 2010 doesn't work since ↵sfisher1-2/+0
the express edition does (and presumably the full edition does also) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35031 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-09From Michael Wells: Fix "missing path seperator in config.nmake"wmeier1-1/+1
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5378 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34829 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-28From g.khueny via bug 5346:gerald1-6/+6
If PYTHON_DIR is specificed in config.nmake the variable will be overritten by PYTHON_DIR=C:\Python$(PYTHON_VER). It looks like the problem was created by revision 34246. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34673 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-20Target system changed by mistake.etxrab1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34594 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-20Prepartaions to use GTK 2.22etxrab1-3/+8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34593 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-05Use the new GTK bundles.etxrab1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34382 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-03Make "bpf_image" available on Windows. This enables the "Compile BPF" button ↵sake1-0/+2
and "dumpcap -d" on Windows. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34357 f5534014-38df-0310-8fa8-9805f1628bb7
2010-10-03Retry of SVN 34338, now tested on my WinXP dev VM:sake1-0/+2
Use pcap_open_dead instead of pcap_create for the compile BPF button. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34340 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-24Allow up to Python 2.7 now (was 2.6) and move Python build statements into ↵sfisher1-39/+33
same part of nmake file for ease of use. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34246 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23Assume we HAVE_GZCLEARERR on Windows and when using cmakemorriss1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34192 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-16Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().gerald1-0/+10
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34137 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-26I suspect the changes to config.nmake committed in SVN #33942 were not intended.wmeier1-2/+2
Revert the changes (for now ?) so the Buildbot will run again. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33945 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-26Doxygen fixes.etxrab1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33942 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-25Add ws_load_library and ws_module_open, which respectively callgerald1-0/+2
LoadLibrary and g_module_open only for the program directory and system directory on Windows. Use them to replace a bunch of LoadLibrary and g_module_open calls. Use the extension ".dll" for all the DLLs that we load. Add comments about DLL loading in Python. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33924 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-25Update the WinPcap developer's pack to 4.1.2. Update PCAP_VERSION to 4.1.2 ↵morriss1-1/+1
on Win64 too (for consistency more than anything I think). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33923 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-25Change PCAP_VERSION to 4.1.2. Hopefully this will cause the U3/PortableApps ↵morriss1-1/+1
builds to pick up WinPcap again. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33921 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-05Remove experimental marker from NEW_PACKET_LIST.jake1-4/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33719 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-071.3.6 -> 1.5.0gerald1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33138 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-01From Kovarththanan Rajaratnam via bug 3500:gerald1-22/+79
Sébastien's initial commit [1] didn't contain support for embedding Python on Windows. [1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529 From me: Comment out PYTHON_EMBED for now. Start a list of known Python+CRT versions. Add get_wspython_dir to libwireshark.def. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33036 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-06Our default target platform is still win32.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32698 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-06Checking in Stigs changes frometxrab1-1/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=475 BUT not activating the check for pcap_create() pcap_set_buffer_size() This should make it possible to build with support for setting the buffersize if not capturing 802.11 traffic. The code for handling the 'B' option should be OK in any case. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32688 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-051.3.5 -> 1.3.6.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32667 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-22Manifests are not needed when building with VC10.wmeier1-1/+7
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10. See: http://msdn.microsoft.com/en-us/library/dd293574.aspx git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32540 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-21Add settings for "Microsoft Visual Studio 2010" note thatetxrab1-2/+22
Wireshark does not build with Visual studio 10 yet. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32529 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-09Rename README.win32 to README.windows and add a 64-bit download link.gerald1-2/+6
Add tools/textify.sh, which makes a Notepad-clickable copy of a text file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt. Remove tools/unix2dos.pl and use Cygwin's u2d instead. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32440 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-05Add coment about why 'links' fails if it is used to generate release-notes.txt wmeier1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32387 f5534014-38df-0310-8fa8-9805f1628bb7
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 17:25:09 +0000