Commit 633293f0 authored by Alexandre Julliard's avatar Alexandre Julliard

Build the debugger as a .so.

parent 5be8e7d8
......@@ -116,7 +116,7 @@ server tools: unicode/libwine_unicode.$(LIBEXT)
dlls: tools $(LIBRARIES)
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
@cd programs && $(MAKE) install
......@@ -126,6 +126,7 @@ uninstall_programs: dummy
checklink::
@cd dlls && $(MAKE) checklink
@cd debugger && $(MAKE) checklink
TAGS etags:
etags `find $(TOPSRCDIR) -name '*.[chS]' -print | grep -v dbgmain`
......
DEFS = -DWINELIB
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = none
PROGRAMS = winedbg
IMPORTS = user32 gdi32 kernel32 ntdll
MODULE = winedbg
C_SRCS = \
break.c \
......@@ -13,6 +10,7 @@ C_SRCS = \
display.c \
editline.c \
expr.c \
ext_debugger.c \
hash.c \
info.c \
memory.c \
......@@ -25,14 +23,10 @@ C_SRCS = \
types.c \
winedbg.c
SPEC_SRCS = winedbg.spec
EXTRA_SRCS = dbg.y debug.l
EXTRA_OBJS = y.tab.o lex.yy.o
all: $(PROGRAMS)
@MAKE_RULES@
@MAKE_PROG_RULES@
y.tab.c y.tab.h: 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) -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:
......@@ -14,8 +14,6 @@
#include <stdio.h>
#include <string.h>
#include "options.h"
#define DBG_BUFF_SIZE 12
#define DBG_EXTERNAL_DEFAULT "gdb"
......@@ -107,7 +105,7 @@ void DEBUG_ExternalDebugger(void)
/* if not set in environment, use default */
if (!dbg_wine_location)
dbg_wine_location = argv0;
dbg_wine_location = "wine";
/* check for empty string in WINE_DBG_NO_XTERM */
if (dbg_no_xterm && (strlen(dbg_no_xterm) < 1))
......
......@@ -649,11 +649,11 @@ static BOOL DEBUG_HandleDebugEvent(DEBUG_EVENT* de, LPDWORD cont)
if (!GetBinaryTypeA( buffer, &type ))
{
/* 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 */
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;
}
}
......
......@@ -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 memset(ptr long long) memset
@ cdecl pow(double double) pow
@ stub qsort
@ cdecl -noimport qsort(ptr long long ptr) qsort
@ stub sin
@ varargs sprintf(str str) sprintf
@ stub sqrt
......
......@@ -10,7 +10,6 @@ C_SRCS = \
cdrom.c \
cpu.c \
error.c \
ext_debugger.c \
lstr.c \
main.c \
options.c \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment