Partial fix after some files being moved between directories.
There is still a problem with MSVC builds as 3 objects get built twice (once at the top level, and once in epan: xmlstub.obj, print.obj and ps.obj). This fix allows to compile again with MSVC if debug symbols are NOT enabled while building Ethereal. Do this by editing config.nmake and replacing "LOCAL_LDFLAGS=/DEBUG" with "LOCAL_LDFLAGS=". In other words: Ethereal CANNOT be built right now with debug symbols in the object code, for MSVC builds. svn path=/trunk/; revision=11557
This commit is contained in:
parent
028fd26a0e
commit
21cb72b093
|
@ -89,7 +89,7 @@ libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter dissector
|
|||
/DEF:libethereal.def /OUT:libethereal.dll \
|
||||
/IMPLIB:libethereal.lib $(OBJECTS) $(libethereal_LIBS) \
|
||||
..\image\libethereal.res dissectors\register.obj \
|
||||
$(DISSECTOR_SUPPORT_OBJECTS:../=) $(EXTRA_OBJECTS)
|
||||
$(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
|
||||
|
||||
ethereal.lib : ..\config.h $(OBJECTS)
|
||||
link /lib /out:ethereal.lib $(OBJECTS) $(EXTRA_OBJECTS)
|
||||
|
|
|
@ -86,7 +86,6 @@ decode_enumerated_bitfield
|
|||
decode_enumerated_bitfield_shifted
|
||||
decode_numeric_bitfield
|
||||
deletefile
|
||||
destroy_print_stream
|
||||
dfilter_apply_edt
|
||||
dfilter_compile
|
||||
dfilter_dump
|
||||
|
@ -298,7 +297,6 @@ match_strval
|
|||
mtp3_addr_to_str_buf
|
||||
mtp3_service_indicator_code_short_vals DATA
|
||||
new_create_dissector_handle
|
||||
new_page
|
||||
new_register_dissector
|
||||
nt_cmd_vals DATA
|
||||
num_tap_filters DATA
|
||||
|
@ -320,15 +318,10 @@ prefs_register_protocol
|
|||
prefs_register_string_preference
|
||||
prefs_register_uint_preference
|
||||
prefs_set_pref
|
||||
print_bookmark
|
||||
print_finale
|
||||
print_hex_data
|
||||
print_line
|
||||
print_preamble
|
||||
print_stream_ps_new
|
||||
print_stream_ps_stdio_new
|
||||
print_stream_text_new
|
||||
print_stream_text_stdio_new
|
||||
protocols_module DATA
|
||||
proto_can_match_selected
|
||||
proto_can_toggle_protocol
|
||||
|
|
Loading…
Reference in New Issue