diff options
| author | Gerald Combs <gerald@wireshark.org> | 2004-07-19 21:18:40 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2004-07-19 21:18:40 +0000 |
| commit | e20430f8767e37c23f6a817853fe882ff6969652 (patch) | |
| tree | 3e845ac938e0baa07ebaf97b8edcd2c4b012df58 /Makefile.nmake | |
| parent | 7b3b0c62938984409c1824bec8f18b9326aaefba (diff) | |
| download | wireshark-e20430f8767e37c23f6a817853fe882ff6969652.tar.gz wireshark-e20430f8767e37c23f6a817853fe882ff6969652.tar.bz2 wireshark-e20430f8767e37c23f6a817853fe882ff6969652.zip | |
Fixes (and ugly hacks) for Windows compilation.
svn path=/trunk/; revision=11435
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 62969d764b..530aa65137 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -27,14 +27,14 @@ PLATFORM_SRC = capture-wpcap.c include Makefile.common -include epan\Makefile.common +#include epan\Makefile.common BUILT_SOURCES = $(BUILT_SOURCES) \ svnversion.h -DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=) -DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) -DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:../=) +#DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=) +#DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) +#DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:../=) ethereal_OBJECTS = $(ethereal_SOURCES:.c=.obj) tethereal_OBJECTS = $(tethereal_SOURCES:.c=.obj) @@ -326,7 +326,7 @@ gtk2:: help config.h svnversion.h AUTHORS-SHORT $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK2_CFLAGS)" GTK_LIBS="$(GTK2_LIBS)" libui.lib cd .. -epan:: $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS) $(RESOURCES) doxygen +epan:: $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS) $(RESOURCES) $(BUILT_SOURCES) doxygen cd epan $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. |