Stop defining HAVE_CONFIG_H on Windows builds too.
svn path=/trunk/; revision=45231
This commit is contained in:
parent
f89635883f
commit
2fbf659e28
|
@ -28,7 +28,7 @@
|
||||||
ReBuildCommandLine="nmake -f Makefile.nmake setup distclean all"
|
ReBuildCommandLine="nmake -f Makefile.nmake setup distclean all"
|
||||||
CleanCommandLine="nmake -f Makefile.nmake clean_setup distclean"
|
CleanCommandLine="nmake -f Makefile.nmake clean_setup distclean"
|
||||||
Output="wireshark-gtk2\wireshark.exe"
|
Output="wireshark-gtk2\wireshark.exe"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
|
PreprocessorDefinitions="WIN32;_DEBUG"
|
||||||
IncludeSearchPath=""
|
IncludeSearchPath=""
|
||||||
ForcedIncludes=""
|
ForcedIncludes=""
|
||||||
AssemblySearchPath=""
|
AssemblySearchPath=""
|
||||||
|
|
|
@ -840,7 +840,7 @@ LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX-
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
#STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc)
|
#STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc)
|
||||||
STANDARD_CFLAGS=-DHAVE_CONFIG_H /DPCAP_VERSION=$(PCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
|
STANDARD_CFLAGS=/DPCAP_VERSION=$(PCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS)
|
||||||
|
|
||||||
# Optional: Define WIRESHARK_GENERATE_BSC_FILE to generate .sbr files for input to bscmake
|
# Optional: Define WIRESHARK_GENERATE_BSC_FILE to generate .sbr files for input to bscmake
|
||||||
!IFDEF WIRESHARK_GENERATE_BSC_FILE
|
!IFDEF WIRESHARK_GENERATE_BSC_FILE
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
ReBuildCommandLine=""
|
ReBuildCommandLine=""
|
||||||
CleanCommandLine=""
|
CleanCommandLine=""
|
||||||
Output="wireshark-gtk2\dumpcap.exe"
|
Output="wireshark-gtk2\dumpcap.exe"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
|
PreprocessorDefinitions="WIN32;_DEBUG"
|
||||||
IncludeSearchPath=""
|
IncludeSearchPath=""
|
||||||
ForcedIncludes=""
|
ForcedIncludes=""
|
||||||
AssemblySearchPath=""
|
AssemblySearchPath=""
|
||||||
|
|
|
@ -14,7 +14,7 @@ COPY = copy
|
||||||
|
|
||||||
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 /ENTRY:mainCRTStartup $(LOCAL_LDFLAGS)
|
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 /ENTRY:mainCRTStartup $(LOCAL_LDFLAGS)
|
||||||
|
|
||||||
CFLAGS=$(WARNINGS_ARE_ERRORS) -DHAVE_CONFIG_H $(LOCAL_CFLAGS) -I$(TOPDIR) $(GLIB_CFLAGS) $(GNUTLS_CFLAGS)
|
CFLAGS=$(WARNINGS_ARE_ERRORS) $(LOCAL_CFLAGS) -I$(TOPDIR) $(GLIB_CFLAGS) $(GNUTLS_CFLAGS)
|
||||||
|
|
||||||
.c.obj::
|
.c.obj::
|
||||||
$(CC) $(CFLAGS) -Fd.\ -c $<
|
$(CC) $(CFLAGS) -Fd.\ -c $<
|
||||||
|
|
|
@ -41,9 +41,7 @@
|
||||||
** suitability of this software for any purpose.
|
** suitability of this software for any purpose.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
ReBuildCommandLine=""
|
ReBuildCommandLine=""
|
||||||
CleanCommandLine=""
|
CleanCommandLine=""
|
||||||
Output="wireshark-gtk2\tshark.exe"
|
Output="wireshark-gtk2\tshark.exe"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
|
PreprocessorDefinitions="WIN32;_DEBUG"
|
||||||
IncludeSearchPath=""
|
IncludeSearchPath=""
|
||||||
ForcedIncludes=""
|
ForcedIncludes=""
|
||||||
AssemblySearchPath=""
|
AssemblySearchPath=""
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
ReBuildCommandLine=""
|
ReBuildCommandLine=""
|
||||||
CleanCommandLine=""
|
CleanCommandLine=""
|
||||||
Output="libgtkui.exe"
|
Output="libgtkui.exe"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
|
PreprocessorDefinitions="WIN32;_DEBUG"
|
||||||
IncludeSearchPath=""
|
IncludeSearchPath=""
|
||||||
ForcedIncludes=""
|
ForcedIncludes=""
|
||||||
AssemblySearchPath=""
|
AssemblySearchPath=""
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
ReBuildCommandLine=""
|
ReBuildCommandLine=""
|
||||||
CleanCommandLine="nmake -f Makefile.nmake distclean"
|
CleanCommandLine="nmake -f Makefile.nmake distclean"
|
||||||
Output="wireshark-gtk2\wireshark.exe"
|
Output="wireshark-gtk2\wireshark.exe"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
|
PreprocessorDefinitions="WIN32;_DEBUG"
|
||||||
IncludeSearchPath=""
|
IncludeSearchPath=""
|
||||||
ForcedIncludes=""
|
ForcedIncludes=""
|
||||||
AssemblySearchPath=""
|
AssemblySearchPath=""
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
ReBuildCommandLine=""
|
ReBuildCommandLine=""
|
||||||
CleanCommandLine=""
|
CleanCommandLine=""
|
||||||
Output="libwiretap.exe"
|
Output="libwiretap.exe"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
|
PreprocessorDefinitions="WIN32;_DEBUG"
|
||||||
IncludeSearchPath=""
|
IncludeSearchPath=""
|
||||||
ForcedIncludes=""
|
ForcedIncludes=""
|
||||||
AssemblySearchPath=""
|
AssemblySearchPath=""
|
||||||
|
|
Loading…
Reference in New Issue