diff options
author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-16 04:08:35 +0000 |
---|---|---|
committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-16 04:08:35 +0000 |
commit | 2d760bf075e54cf148d0bc145d20ac994c887791 (patch) | |
tree | f42fbb0a9ac778b3d12ff4d8de4c43d3250fdd69 /config.nmake | |
parent | c923fc15770c878c83ea743a7277eff6e44d2fe3 (diff) |
in effect use the User's Guide as the online help system now (for GTK > V1)!
remove ENABLE_WSUG setting from config.nmake and replace it with GLIB_MAJOR_VERSION >= 2 (as Glib 1.x cannot open a browser to show a HTML file - it's just currently? not implemented)
svn path=/trunk/; revision=20446
Diffstat (limited to 'config.nmake')
-rw-r--r-- | config.nmake | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/config.nmake b/config.nmake index 5dbfd5f874..16f96ce1fe 100644 --- a/config.nmake +++ b/config.nmake @@ -417,15 +417,6 @@ LOCAL_LDFLAGS=/DEBUG PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) -# -# Optional: Use the User's Guide as the online help system -# (currently experimental). -# -# If you don't have the User's Guide, comment this line out, so that -# ENABLE_WSUG isn't defined. -# -#ENABLE_WSUG=USE - # # According to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=403 # XCOPY under Windows NT doesn't support the "/Y" flag. This works @@ -775,11 +766,5 @@ LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1 LIBWIRESHARK_CONFIG= !ENDIF -!IFDEF ENABLE_WSUG -WSUG_CFLAGS=-DENABLE_WSUG -!ELSE -WSUG_CFLAGS= -!ENDIF - # Construct the path PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH) |