Browse Source

+ added CAN_RUN_GDBVER, to allow to cross-compile
the IDE from win32 to go32v2.

git-svn-id: trunk@5780 -

pierre 18 years ago
parent
commit
179f6cc93f
2 changed files with 52 additions and 18 deletions
  1. 27 4
      packages/base/gdbint/Makefile
  2. 25 14
      packages/base/gdbint/Makefile.fpc

+ 27 - 4
packages/base/gdbint/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/06/20]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/21]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -330,6 +330,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 override TARGET_UNITS+=gdbint gdbcon
 endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override TARGET_UNITS+=gdbint gdbcon
+endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 override TARGET_UNITS+=gdbint gdbcon
 endif
@@ -450,6 +453,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 override TARGET_EXAMPLES+=testgdb symify
 endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override TARGET_EXAMPLES+=testgdb symify
+endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 override TARGET_EXAMPLES+=testgdb symify
 endif
@@ -571,6 +577,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
+endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
@@ -691,6 +700,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
+endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
@@ -1158,7 +1170,7 @@ endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 PPUEXT=.ppu
-ASMEXT=.asm
+ASMEXT=.s
 OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -1586,6 +1598,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1705,7 +1720,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 endif
 else
-FPCCPUOPT:=-O2
+FPCCPUOPT:=-O1r
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
@@ -2255,6 +2270,14 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 ifeq ($(FULL_SOURCE),$(FULL_TARGET))
+CAN_RUN_GDBVER=1
+endif
+ifeq ($(FULL_SOURCE),i386-win32)
+ifeq ($(FULL_TARGET),i386-go32v2)
+CAN_RUN_GDBVER=1
+endif
+endif
+ifdef CAN_RUN_GDBVER
 ifeq ($(GDBFOUND),1)
 $(CURRDIR)getver$(EXEEXT) : gdbver.pp
 	$(COMPILER) -o$(CURRDIR)getver$(EXEEXT) gdbver.pp

+ 25 - 14
packages/base/gdbint/Makefile.fpc

@@ -2,6 +2,7 @@
 #   Makefile.fpc for Free Pascal GDB Interface
 #
 
+
 [package]
 name=gdbint
 version=2.0.0
@@ -58,40 +59,50 @@ endif
 
 [rules]
 ifeq ($(FULL_SOURCE),$(FULL_TARGET))
+CAN_RUN_GDBVER=1
+endif
+
+ifeq ($(FULL_SOURCE),i386-win32)
+ifeq ($(FULL_TARGET),i386-go32v2)
+CAN_RUN_GDBVER=1
+endif
+endif
+
 
+ifdef CAN_RUN_GDBVER
 ifeq ($(GDBFOUND),1)
 # libgdb.a found
 
 $(CURRDIR)getver$(EXEEXT) : gdbver.pp
-        $(COMPILER) -o$(CURRDIR)getver$(EXEEXT) gdbver.pp
+	$(COMPILER) -o$(CURRDIR)getver$(EXEEXT) gdbver.pp
 
 ifndef GOTGDBVER
 # gdbver doesn't exists, build it first
 gdbint$(PPUEXT): $(CURRDIR)gdbver$(EXEEXT) gdbint.pp
-        $(MAKE) gdbint$(PPUEXT) GOTGDBVER=1
+	$(MAKE) gdbint$(PPUEXT) GOTGDBVER=1
 else
 # gdbver exists
 GDBVER:=GDB_V$(strip $(shell $(CURRDIR)gdbver$(EXEEXT) -n))
 gdbint$(PPUEXT): gdbint.pp
-        @$(ECHO) Using GDB $(GDBVER)
-        $(COMPILER) -d$(GDBVER) gdbint.pp
-        $(DEL) gdbver$(EXEEXT) gdbver$(OEXT)
+	@$(ECHO) Using GDB $(GDBVER)
+	$(COMPILER) -d$(GDBVER) gdbint.pp
+	$(DEL) gdbver$(EXEEXT) gdbver$(OEXT)
 endif
 
 else
 # libgdb.a not found, default to libgdb v5
 GDBVER=GDB_V6
 gdbint$(PPUEXT): gdbint.pp
-        @$(ECHO) libgdb.a not found, using default GDB $(GDBVER)
-        $(COMPILER) -d$(GDBVER) gdbint.pp
+	@$(ECHO) libgdb.a not found, using default GDB $(GDBVER)
+	$(COMPILER) -d$(GDBVER) gdbint.pp
 endif
 
 else
 # Different OS_TARGET, default to libgdb v5
 GDBVER=GDB_V5
 gdbint$(PPUEXT): gdbint.pp
-        @$(ECHO) Different target os or cpu, using default GDB $(GDBVER)
-        $(COMPILER) -d$(GDBVER) gdbint.pp
+	@$(ECHO) Different target os or cpu, using default GDB $(GDBVER)
+	$(COMPILER) -d$(GDBVER) gdbint.pp
 endif
 
 gdbcon$(PPUEXT): gdbcon.pp gdbint$(PPUEXT)
@@ -108,15 +119,15 @@ ifdef $(COMPILEDBGCOM)
 # on the fact that all files are opened via C lib calls
 # which is wrong for FPC !!
 $(DBGCOM): ../v4.16/dbgcom.c
-        gcc -c -DFPC -Dother_sel -gstabs -o dbgcom.o -I../v4.16 ../v4.16/dbgcom.c
+	gcc -c -DFPC -Dother_sel -gstabs -o dbgcom.o -I../v4.16 ../v4.16/dbgcom.c
 else
 $(DBGCOM):
 endif
 
 simple: $(DBGCOM)
-        -rm gdbint.ppu
-        ppc386 -dUSE_LIBGDB gdbint
-        ppc386 testgdb
+	-rm gdbint.ppu
+	ppc386 -dUSE_LIBGDB gdbint
+	ppc386 testgdb
 
 testgdb$(EXEEXT): testgdb.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM)
 
@@ -126,5 +137,5 @@ testgdb$(EXEEXT): testgdb.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM)
 test: examples
 
 clean: fpc_clean
-        $(DEL) gdbver$(EXEEXT) gdbver$(OEXT)
+	$(DEL) gdbver$(EXEEXT) gdbver$(OEXT)