paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 23:21:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Add support for gdblib.inc in libgdb directory

Browse Source 
git-svn-id: trunk@14061 -
This commit is contained in:
pierre 2009-11-04 23:30:49 +00:00
parent 10e78efaac
commit eb188be8cb
3 changed files with 25 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
ide/Makefile
View File

@ -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/11/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
@ -286,7 +286,7 @@ ifeq ($(LIBGDBFILE),)
SYSLIBDIR=/lib /usr/lib /usr/local/lib
override LIBGDBFILE=$(firstword $(wildcard $(addsuffix /libgdb.a,$(SYSLIBDIR))))
ifneq (${LIBGDBFILE},)
$(warning Using system sefault libgdb file located in ${LIBGDBFILE})
$(warning Using system default libgdb file located in ${LIBGDBFILE})
GDBLIBDIR=$(dir ${LIBGDBFILE})
endif
endif
@ -294,6 +294,14 @@ ifeq ($(LIBGDBFILE),)
GDB=
else
GDB=1
override LIBGDBINC:=$(firstword $(wildcard $(addsuffix /gdblib.inc,$(GDBLIBDIR))))
ifeq ($(LIBGDBINC),)
GDBLIBINCFOUND=0
GDBLIBINCCOND=
else
GDBLIBINCFOUND=1
GDBLIBINCCOND=-dUSE_GDBLIBINC -I$(GDBLIBDIR)
endif
endif
ifdef GDB
override LIBDIR+=$(GDBLIBDIR)
@ -1648,8 +1656,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FV=1
REQUIRE_PACKAGES_GDBINT=1
REQUIRE_PACKAGES_REGEXPR=1
REQUIRE_PACKAGES_WINUNITS-BASE=1
REQUIRE_PACKAGES_WINUNITS-JEDI=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_FCL-XML=1
REQUIRE_PACKAGES_CHM=1
@ -2025,8 +2031,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FV=1
REQUIRE_PACKAGES_GDBINT=1
REQUIRE_PACKAGES_REGEXPR=1
REQUIRE_PACKAGES_WINUNITS-BASE=1
REQUIRE_PACKAGES_WINUNITS-JEDI=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_FCL-XML=1
REQUIRE_PACKAGES_CHM=1
@ -2407,58 +2411,6 @@ ifdef UNITDIR_GRAPH
override COMPILER_UNITDIR+=$(UNITDIR_GRAPH)
endif
endif
ifdef REQUIRE_PACKAGES_WINUNITS-BASE
PACKAGEDIR_WINUNITS-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits-base/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_WINUNITS-BASE),)
ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-BASE)/units/$(TARGETSUFFIX)),)
UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units/$(TARGETSUFFIX)
else
UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_WINUNITS-BASE) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE)
endif
else
PACKAGEDIR_WINUNITS-BASE=
UNITDIR_WINUNITS-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits-base/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_WINUNITS-BASE),)
UNITDIR_WINUNITS-BASE:=$(firstword $(UNITDIR_WINUNITS-BASE))
else
UNITDIR_WINUNITS-BASE=
endif
endif
ifdef UNITDIR_WINUNITS-BASE
override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-BASE)
endif
endif
ifdef REQUIRE_PACKAGES_WINUNITS-JEDI
PACKAGEDIR_WINUNITS-JEDI:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits-jedi/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_WINUNITS-JEDI),)
ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-JEDI)/units/$(TARGETSUFFIX)),)
UNITDIR_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI)/units/$(TARGETSUFFIX)
else
UNITDIR_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_WINUNITS-JEDI)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_WINUNITS-JEDI) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS-JEDI)/$(FPCMADE)
endif
else
PACKAGEDIR_WINUNITS-JEDI=
UNITDIR_WINUNITS-JEDI:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits-jedi/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_WINUNITS-JEDI),)
UNITDIR_WINUNITS-JEDI:=$(firstword $(UNITDIR_WINUNITS-JEDI))
else
UNITDIR_WINUNITS-JEDI=
endif
endif
ifdef UNITDIR_WINUNITS-JEDI
override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-JEDI)
endif
endif
ifdef REQUIRE_PACKAGES_UNIVINT
PACKAGEDIR_UNIVINT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /univint/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_UNIVINT),)
@ -3342,6 +3294,7 @@ compiler/$(FPCMADE):
compilerclean :
$(MAKE) -C compiler clean
fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc)
$(COMPILER) $(GDBLIBINCCOND) fp.pas
buildfp:
$(MAKE) compilerunits
$(MAKE) testgdb

10
ide/Makefile.fpc
View File

@ -78,6 +78,15 @@ ifeq ($(LIBGDBFILE),)
GDB=
else
GDB=1
# Detect if gdblib.inc is available
override LIBGDBINC:=$(firstword $(wildcard $(addsuffix /gdblib.inc,$(GDBLIBDIR))))
ifeq ($(LIBGDBINC),)
GDBLIBINCFOUND=0
GDBLIBINCCOND=
else
GDBLIBINCFOUND=1
GDBLIBINCCOND=-dUSE_GDBLIBINC -I$(GDBLIBDIR)
endif
endif
ifdef GDB
@ -157,6 +166,7 @@ compilerclean :
# to use.
#
fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc)
$(COMPILER) $(GDBLIBINCCOND) fp.pas
buildfp:
$(MAKE) compilerunits

4
ide/globdir.inc
View File

@ -10,6 +10,10 @@
**********************************************************************}
{$ifdef USE_GDBLIBINC}
{$include gdblib.inc}
{$endif USE_GDBLIBINC}
{ --- Special OS settings --- }
{$ifdef Go32V2}
{$define SUPPORTVESA}