diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-02-03 20:57:24 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-02-03 20:57:24 +0000 |
| commit | 77dd618f967e6f8951b6bad5dab97293765aff1f (patch) | |
| tree | e7acc7ff79b078e71017988d10cd6c3e5f032942 /config.nmake | |
| parent | 591611ff4e7326a0534eba2098d6529cc825e53f (diff) | |
some minor cleanup
svn path=/trunk/; revision=20702
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/config.nmake b/config.nmake index 57513ce713..4cfd5c9a39 100644 --- a/config.nmake +++ b/config.nmake @@ -351,11 +351,11 @@ YACC=bison MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe" # -# Optional: To build the developers documentation with doxygen and dot. -# Currently experimental only. +# Optional: To build the developers API documentation with doxygen and dot. +# Currently experimental, outdated and incomplete. # # You will have to download and install: -# Doxygen from: www.doxygen.org +# Doxygen from: http://www.doxygen.org # Graphviz from: http://www.research.att.com/sw/tools/graphviz/ # # If you have doxygen, set this to the doxygen executable. @@ -536,11 +536,6 @@ XMLLINT="xmllint" # ############################################################################## -!IFDEF ENABLE_LIBWIRESHARK -# Uncomment next line to link plugins with the import library of libwireshark.dll -LINK_PLUGINS_WITH_LIBWIRESHARK=USE -!ENDIF - # # The RC_VERSION should be comma-separated, not dot-separated, # as per Graham Bloice's message in @@ -766,8 +761,7 @@ PORTAUDIO_API_CONFIG=^#define PORTAUDIO_API_1 1 !ELSE PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\include /I$(PORTAUDIO_DIR)\src\common !ENDIF - -!else +!ELSE PORTAUDIO_CFLAGS= PORTAUDIO_CONFIG= !ENDIF @@ -787,6 +781,8 @@ HHC_LIBS= !IFDEF ENABLE_LIBWIRESHARK LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1 +# Link plugins with the import library of libwireshark.dll +LINK_PLUGINS_WITH_LIBWIRESHARK=USE !ELSE LIBWIRESHARK_CONFIG= !ENDIF |