83845c0048
vcredist_*.exe is, AFAICT, still optional yet config.nmake always defines the
...
variable for it. Since it's always defined but it's optional, don't check
for its existence.
svn path=/trunk/; revision=46022
2012-11-13 15:01:49 +00:00
b924cfed2b
The U3 and PortableApps packaging processes depend on simple
...
defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.
svn path=/trunk/; revision=45659
2012-10-19 17:47:34 +00:00
df44255d07
- Use PROGRAM_NAME in the unistaller too.
...
- Make it possible to set PROGRAM_NAME in environment.
- Update the comment about setting program name it *should* work now.
svn path=/trunk/; revision=45582
2012-10-16 14:03:42 +00:00
46484ff0f7
Start making the program name "wireshark" configurable.
...
svn path=/trunk/; revision=45558
2012-10-15 15:31:20 +00:00
0a1bbd5526
Typos.
...
svn path=/trunk/; revision=45557
2012-10-15 12:50:20 +00:00
e0c023859e
Building with GTK3 works.
...
svn path=/trunk/; revision=45555
2012-10-15 08:32:38 +00:00
a85e8b73a8
Build GTK2 versions again.
...
svn path=/trunk/; revision=45554
2012-10-15 08:30:32 +00:00
a3f65d3680
Try a experimental gtk3 build
...
svn path=/trunk/; revision=45551
2012-10-15 06:12:51 +00:00
f8d36704a8
Revert back to GTK2
...
svn path=/trunk/; revision=45541
2012-10-14 19:16:34 +00:00
091559e2ab
Try a experimental gtk3 build
...
svn path=/trunk/; revision=45540
2012-10-14 18:42:02 +00:00
97ec1b176d
Expand comments about the "making the C runtime available to Wireshark"
...
stuff.
svn path=/trunk/; revision=45305
2012-10-04 04:54:58 +00:00
2fbf659e28
Stop defining HAVE_CONFIG_H on Windows builds too.
...
svn path=/trunk/; revision=45231
2012-10-01 11:47:36 +00:00
005175c9c4
Revert 45116. Developer's probably don't want the user-guide.chm that they get from the setup step as it's not going to be up-to-date.
...
svn path=/trunk/; revision=45121
2012-09-25 03:23:23 +00:00
410fdcd065
We're downloading the user-guide as part of the setup, so we might as well copy it to the install directory. If someone has built a more up-to-date version of the user-guide in the docbook directory, then it will just overwrite this one, but for most developers, I don't think they're building their own, so at least this way they'll still have a local copy of the user-guide. If optional is the preferred default, then we can change config.nmake and just comment out UG_DIR and mark as "optional" instead of "recommended".
...
svn path=/trunk/; revision=45116
2012-09-25 01:03:21 +00:00
878f93804f
Look in $(WIRESHARK_LIB_DIR)\vcredist_$(MSVC_VARIANT) for
...
the MSVC redistributable package, then look in the top-level
$(WIRESHARK_LIB_DIR). This lets us more easily use multiple compilers
with the same library directory.
svn path=/trunk/; revision=45113
2012-09-24 22:57:54 +00:00
8594038ccd
Add MCVC2012 Professional
...
svn path=/trunk/; revision=45036
2012-09-21 06:16:19 +00:00
abc482e578
Revert r45018 and r45019: put config.h back in lemon.c and take _U_ back off
...
the compile line when building with cmake.
Put _U_'s definition in config.h when building with autofoo and on Windows.
svn path=/trunk/; revision=45034
2012-09-21 01:42:03 +00:00
383467b2b3
Add some info about building with Visual Studio 2012 (VC11):
...
Summary: It seems to work; win32.mak file must be obtained
from <somewhere>; (See comment in file for details)
svn path=/trunk/; revision=45033
2012-09-20 21:24:33 +00:00
d67f3341e5
Add stuff to config to build with VS2012. However: build currently fails.
...
svn path=/trunk/; revision=44982
2012-09-18 19:42:04 +00:00
055736b655
Compile and install schemas if GTK3 is used, nsis needs update too
...
svn path=/trunk/; revision=44923
2012-09-16 09:55:44 +00:00
b3193ec862
Use the latet GTK3+ bundles when building with GTK3
...
svn path=/trunk/; revision=44890
2012-09-14 06:21:55 +00:00
47cee41290
Revert part of r43579, MSVC_VARIANT should be not defined.
...
svn path=/trunk/; revision=43585
2012-07-06 07:49:36 +00:00
c19583b72c
From Michael Mann:
...
Generic preferences implementation - Printing and Name Resolution.
svn path=/trunk/; revision=43579
2012-07-06 04:48:36 +00:00
e6e6d6217b
From Tony Trinh:
...
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-25 20:42:07 +00:00
41232f172e
Remove HAVE_WIRELESS_TOOLBAR from the other build systems.
...
svn path=/trunk/; revision=43419
2012-06-20 19:11:55 +00:00
227eb36c83
Start to have an generic wireless toolbar. Sligtly modified patch from
...
Pontus Fuchs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973
svn path=/trunk/; revision=43354
2012-06-19 12:42:06 +00:00
0ec00075ef
Add a comment as to .bsc files seemingly not usable with VS2010.
...
svn path=/trunk/; revision=43234
2012-06-13 16:44:06 +00:00
c592ceded1
Update the Lua configuration on Win64 to reflect the recent change to
...
Visual Studio 2010.
svn path=/trunk/; revision=43142
2012-06-06 20:42:47 +00:00
f1cf70fc10
1.7.2 → 1.9.0.
...
svn path=/trunk/; revision=43120
2012-06-05 16:21:47 +00:00
7b43b3de0f
Make it possible to build with GTK3 on Windows
...
svn path=/trunk/; revision=43083
2012-06-04 20:42:09 +00:00
94627901a9
Update GTK 3.0 package Id
...
svn path=/trunk/; revision=43071
2012-06-04 16:56:08 +00:00
1dd90d3560
Default to the version recommended in the Developer's Guide, namely
...
MSVC++ 2010 Express Edition.
svn path=/trunk/; revision=43016
2012-06-03 07:07:35 +00:00
5adc7cd8ef
Use GeoIP package 1.4.8-2 for win64 also (I guess that's what was intended in r42933)
...
svn path=/trunk/; revision=42946
2012-05-31 18:56:02 +00:00
ddcd6c5ce7
Use the updated GeoIP package (1.4.8-2).
...
svn path=/trunk/; revision=42933
2012-05-30 22:55:02 +00:00
77b9085de9
Revert GEOIP_CFLAGS back to r42905. It looks like the builders picked up
...
the wrong archive yesterday before I had a chance to upload the right one.
svn path=/trunk/; revision=42919
2012-05-30 15:36:48 +00:00
b9e43af6e9
Ugh. Fix GEOIP_CFLAGS again. 3rd time's the charm?
...
svn path=/trunk/; revision=42918
2012-05-30 15:30:07 +00:00
b15dc3a9af
Try it with Windows style path separator instead.
...
svn path=/trunk/; revision=42917
2012-05-30 15:05:21 +00:00
a489998855
Fix GEOIP_CFLAGS so GeoIP.h can be found.
...
svn path=/trunk/; revision=42916
2012-05-30 14:33:00 +00:00
43670460ff
Use GeoIP 1.4.8 which includes a DLL instead of a static library.
...
svn path=/trunk/; revision=42905
2012-05-29 23:31:00 +00:00
992587c3bf
Try using an OBS-derived Gtk2 bundle, second try.
...
svn path=/trunk/; revision=42623
2012-05-14 17:54:47 +00:00
361454b6b8
Add PKG_SUFIX
...
svn path=/trunk/; revision=42202
2012-04-23 07:19:22 +00:00
2c996e9c18
Make it possible to download the GTK3 package
...
svn path=/trunk/; revision=42174
2012-04-21 08:45:52 +00:00
733834afdb
Switch back to the gtk.org version of the GTK+ bundle since its Cairo
...
doesn't crash.
svn path=/trunk/; revision=42171
2012-04-20 23:41:36 +00:00
d8389b5429
Switch to our custom GTK+ bundles derived from openSUSE Build Service
...
packages. Sort and normalize our DLL lists. Add several new required DLLs.
svn path=/trunk/; revision=42143
2012-04-19 18:31:11 +00:00
e5cd6c087e
1.7.1 → 1.7.2.
...
svn path=/trunk/; revision=41971
2012-04-06 17:27:20 +00:00
6c902761a8
Revert
...
svn path=/trunk/; revision=41928
2012-04-04 15:42:46 +00:00
82913779e4
Update to a version which have getopt_long().
...
svn path=/trunk/; revision=41926
2012-04-04 15:23:47 +00:00
3ae3fcee5c
Use the GnuTLS 2.12.18-1.2-1 bundle.
...
svn path=/trunk/; revision=41829
2012-03-29 20:18:10 +00:00
2a1e0baeac
Use GnuTLS 2.12.18.
...
svn path=/trunk/; revision=41809
2012-03-27 22:57:42 +00:00
665aae16f6
Revert the change of MSVC_VARIANT made by misstake.
...
svn path=/trunk/; revision=41238
2012-02-29 14:50:02 +00:00
Jeff Morriss