Build the debugger as a .so.

This commit is contained in:
Alexandre Julliard 2000-12-06 03:20:47 +00:00
parent 5be8e7d8e0
commit 633293f093
6 changed files with 10 additions and 28 deletions

View file

@ -116,7 +116,7 @@ server tools: unicode/libwine_unicode.$(LIBEXT)
dlls: tools $(LIBRARIES) dlls: tools $(LIBRARIES)
checklink:: checklink::
$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c $(LIBWINE) $(LIBUNICODE) $(LIBS) && $(RM) checklink $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c $(LIBWINE) $(LIBS) && $(RM) checklink
install_programs: dummy install_programs: dummy
@cd programs && $(MAKE) install @cd programs && $(MAKE) install
@ -126,6 +126,7 @@ uninstall_programs: dummy
checklink:: checklink::
@cd dlls && $(MAKE) checklink @cd dlls && $(MAKE) checklink
@cd debugger && $(MAKE) checklink
TAGS etags: TAGS etags:
etags `find $(TOPSRCDIR) -name '*.[chS]' -print | grep -v dbgmain` etags `find $(TOPSRCDIR) -name '*.[chS]' -print | grep -v dbgmain`

View file

@ -1,11 +1,8 @@
DEFS = -DWINELIB
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = .. TOPOBJDIR = ..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = none MODULE = winedbg
PROGRAMS = winedbg
IMPORTS = user32 gdi32 kernel32 ntdll
C_SRCS = \ C_SRCS = \
break.c \ break.c \
@ -13,6 +10,7 @@ C_SRCS = \
display.c \ display.c \
editline.c \ editline.c \
expr.c \ expr.c \
ext_debugger.c \
hash.c \ hash.c \
info.c \ info.c \
memory.c \ memory.c \
@ -25,14 +23,10 @@ C_SRCS = \
types.c \ types.c \
winedbg.c winedbg.c
SPEC_SRCS = winedbg.spec
EXTRA_SRCS = dbg.y debug.l EXTRA_SRCS = dbg.y debug.l
EXTRA_OBJS = y.tab.o lex.yy.o EXTRA_OBJS = y.tab.o lex.yy.o
all: $(PROGRAMS) @MAKE_PROG_RULES@
@MAKE_RULES@
y.tab.c y.tab.h: dbg.y y.tab.c y.tab.h: dbg.y
$(YACC) -d -t $(SRCDIR)/dbg.y $(YACC) -d -t $(SRCDIR)/dbg.y
@ -40,14 +34,4 @@ y.tab.c y.tab.h: dbg.y
lex.yy.c: debug.l lex.yy.c: debug.l
$(LEX) -8 -I $(SRCDIR)/debug.l $(LEX) -8 -I $(SRCDIR)/debug.l
winedbg: $(OBJS)
$(CC) -o $@ $(OBJS) $(DLL_LINK) $(LIBS) $(LDFLAGS)
install:: $(PROGRAMS)
[ -d $(bindir) ] || $(MKDIR) $(bindir)
$(INSTALL_PROGRAM) winedbg $(bindir)/winedbg
uninstall::
$(RM) $(bindir)/winedbg
### Dependencies: ### Dependencies:

View file

@ -14,8 +14,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "options.h"
#define DBG_BUFF_SIZE 12 #define DBG_BUFF_SIZE 12
#define DBG_EXTERNAL_DEFAULT "gdb" #define DBG_EXTERNAL_DEFAULT "gdb"
@ -107,7 +105,7 @@ void DEBUG_ExternalDebugger(void)
/* if not set in environment, use default */ /* if not set in environment, use default */
if (!dbg_wine_location) if (!dbg_wine_location)
dbg_wine_location = argv0; dbg_wine_location = "wine";
/* check for empty string in WINE_DBG_NO_XTERM */ /* check for empty string in WINE_DBG_NO_XTERM */
if (dbg_no_xterm && (strlen(dbg_no_xterm) < 1)) if (dbg_no_xterm && (strlen(dbg_no_xterm) < 1))

View file

@ -649,11 +649,11 @@ static BOOL DEBUG_HandleDebugEvent(DEBUG_EVENT* de, LPDWORD cont)
if (!GetBinaryTypeA( buffer, &type )) if (!GetBinaryTypeA( buffer, &type ))
{ {
/* not a Windows binary, assume it's a Unix executable then */ /* not a Windows binary, assume it's a Unix executable then */
DOS_FULL_NAME fullname; char unixname[MAX_PATH];
/* HACK!! should fix DEBUG_ReadExecutableDbgInfo to accept DOS filenames */ /* HACK!! should fix DEBUG_ReadExecutableDbgInfo to accept DOS filenames */
if (DOSFS_GetFullName( buffer, TRUE, &fullname )) if (wine_get_unix_file_name( buffer, unixname, sizeof(unixname) ))
{ {
DEBUG_ReadExecutableDbgInfo( fullname.long_name ); DEBUG_ReadExecutableDbgInfo( unixname );
break; break;
} }
} }

View file

@ -926,7 +926,7 @@ debug_channels (aspi atom cdrom console ddraw debug delayhlp dll dosfs dosmem
@ cdecl -noimport memmove(ptr ptr long) memmove @ cdecl -noimport memmove(ptr ptr long) memmove
@ cdecl -noimport memset(ptr long long) memset @ cdecl -noimport memset(ptr long long) memset
@ cdecl pow(double double) pow @ cdecl pow(double double) pow
@ stub qsort @ cdecl -noimport qsort(ptr long long ptr) qsort
@ stub sin @ stub sin
@ varargs sprintf(str str) sprintf @ varargs sprintf(str str) sprintf
@ stub sqrt @ stub sqrt

View file

@ -10,7 +10,6 @@ C_SRCS = \
cdrom.c \ cdrom.c \
cpu.c \ cpu.c \
error.c \ error.c \
ext_debugger.c \
lstr.c \ lstr.c \
main.c \ main.c \
options.c \ options.c \