From 1b04684d78d791cf0c6208efeba427dc9b04bcc6 Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 5 Sep 2009 17:05:26 +0000 Subject: [PATCH] o more MingW support, see also discussion of #7412: + automatic detection of MingW libgdb + additional libraries git-svn-id: trunk@13652 - --- packages/gdbint/Makefile | 7 ++++++- packages/gdbint/Makefile.fpc | 8 +++++++- packages/gdbint/src/gdbint.pp | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile index 736e11c237..e4adef157b 100644 --- a/packages/gdbint/Makefile +++ b/packages/gdbint/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/08/02] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/09/05] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded @@ -2964,8 +2964,13 @@ GDBVER:=GDB_V$(strip $(shell $(CURRDIR)gdbver$(EXEEXT) -n)) gdbver.inc: gdbver$(EXEEXT) ./gdbver$(EXEEXT) -o gdbver.inc gdbint$(PPUEXT): gdbint.pp gdbver.inc +ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),) @$(ECHO) Using GDB $(GDBVER) $(COMPILER) -d$(GDBVER) -Fisrc -Fusrc src/gdbint.pp +else + @$(ECHO) Using GDB $(GDBVER) (MingW) + $(COMPILER) -d$(GDBVER) -dUSE_MINGW_GDB -Fisrc -Fusrc src/gdbint.pp +endif $(DEL) gdbver$(EXEEXT) gdbver$(OEXT) endif else diff --git a/packages/gdbint/Makefile.fpc b/packages/gdbint/Makefile.fpc index 45386cb95c..4ca2f07dff 100644 --- a/packages/gdbint/Makefile.fpc +++ b/packages/gdbint/Makefile.fpc @@ -88,8 +88,14 @@ GDBVER:=GDB_V$(strip $(shell $(CURRDIR)gdbver$(EXEEXT) -n)) gdbver.inc: gdbver$(EXEEXT) ./gdbver$(EXEEXT) -o gdbver.inc gdbint$(PPUEXT): gdbint.pp gdbver.inc +# MingW? +ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),) @$(ECHO) Using GDB $(GDBVER) - $(COMPILER) -d$(GDBVER) -Fisrc -Fusrc src/gdbint.pp + $(COMPILER) -d$(GDBVER) -Fisrc -Fusrc src/gdbint.pp +else + @$(ECHO) Using GDB $(GDBVER) (MingW) + $(COMPILER) -d$(GDBVER) -dUSE_MINGW_GDB -Fisrc -Fusrc src/gdbint.pp +endif $(DEL) gdbver$(EXEEXT) gdbver$(OEXT) endif diff --git a/packages/gdbint/src/gdbint.pp b/packages/gdbint/src/gdbint.pp index 41de08d521..c6a6cd339e 100644 --- a/packages/gdbint/src/gdbint.pp +++ b/packages/gdbint/src/gdbint.pp @@ -226,6 +226,7 @@ interface {$LINKLIB libmingwex.a} {$LINKLIB libmingw32.a} {$LINKLIB libmsvcrt.a} + {$LINKLIB libdecnumber.a} {$undef GDB_HAS_DEBUG_FILE_DIRECTORY} {$else not USE_MINGW_GDB} {$LINKLIB libiconv.a}