From 7746826b7fe99d43aa644639a9a8b5f86b626678 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 1 Feb 2015 21:08:54 +0000 Subject: [PATCH] * fixes for make 3.82 git-svn-id: trunk@29600 - --- rtl/gba/Makefile | 32 ++++++++++++++++++++++++++++++-- rtl/gba/Makefile.fpc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile index 8f79b5f88a..ada50e9861 100644 --- a/rtl/gba/Makefile +++ b/rtl/gba/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-12-07 rev 29213] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-01-04 rev 29399] # 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 i386-nativent i386-iphonesim i386-android i386-aros 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 powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos @@ -2259,7 +2259,7 @@ ifdef CREATESHARED override FPCOPT+=-Cg endif ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) -ifeq ($(CPU_TARGET),x86_64) +ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),) override FPCOPT+=-Cg endif endif @@ -2707,13 +2707,18 @@ cprt0$(OEXT) : cprt0.as $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp $(COMPILER) -Us -Sg $(SYSTEMUNIT).pp $(REDIR) uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp + $(COMPILER) $(INC)/uuchar.pp objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp $(REDIR) strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \ $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \ $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/strings.pp +iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/iso7185.pp dos$(PPUEXT) : dos.pp $(INC)/filerec.inc $(INC)/textrec.inc strings$(PPUEXT) \ $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) dos.pp sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ objpas$(PPUEXT) dos$(PPUEXT) sysconst$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp @@ -2736,31 +2741,54 @@ fgl$(PPUEXT): $(OBJPASDIR)/fgl.pp objpas$(PPUEXT) types$(PPUEXT) system$(PPUEXT) macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT) $(COMPILER) $(INC)/macpas.pp $(REDIR) ucomplex$(PPUEXT): $(INC)/ucomplex.pp math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/ucomplex.pp getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/getopts.pp heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -Sg $(INC)/heaptrc.pp $(REDIR) lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/lineinfo.pp charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/charset.pp cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas exec$(PPUEXT) : exec.pp execf.inc execd.inc + $(COMPILER) exec.pp timer$(PPUEXT) : timer.pp timerd.inc timerf.inc + $(COMPILER) timer.pp utility$(PPUEXT) : utility.pp exec$(PPUEXT) utilf.inc utild1.inc utild2.inc + $(COMPILER) utility.pp doslib$(PPUEXT) : doslib.pp exec$(PPUEXT) timer$(PPUEXT) doslibd.inc doslibf.inc + $(COMPILER) doslib.pp hardware$(PPUEXT): hardware.pas exec$(PPUEXT) + $(COMPILER) hardware.pas inputevent$(PPUEXT): inputevent.pas exec$(PPUEXT) timer$(PPUEXT) utility$(PPUEXT) + $(COMPILER) inputevent.pas graphics$(PPUEXT): graphics.pas exec$(PPUEXT) utility$(PPUEXT) hardware$(PPUEXT) + $(COMPILER) graphics.pas layers$(PPUEXT) : layers.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) + $(COMPILER) layers.pas intuition$(PPUEXT): intuition.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) \ inputevent$(PPUEXT) timer$(PPUEXT) layers$(PPUEXT) + $(COMPILER) intuition.pas aboxlib$(PPUEXT): aboxlib.pas + $(COMPILER) aboxlib.pas clipboard$(PPUEXT): clipboard.pas exec$(PPUEXT) + $(COMPILER) clipboard.pas datatype$(PPUEXT): datatypes.pas exec$(PPUEXT) doslib$(PPUEXT) intuition$(PPUEXT) \ utility$(PPUEXT) graphics$(PPUEXT) + $(COMPILER) datatypes.pas asl$(PPUEXT): asl.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) + $(COMPILER) asl.pas ahi$(PPUEXT): ahi.pas exec$(PPUEXT) utility$(PPUEXT) + $(COMPILER) ahi.pas mui$(PPUEXT): mui.pas exec$(PPUEXT) utility$(PPUEXT) intuition$(PPUEXT) graphics$(PPUEXT) + $(COMPILER) mui.pas tinygl$(PPUEXT): tinygl.pp exec$(PPUEXT) + $(COMPILER) tinygl.pp get9$(PPUEXT): get9.pas exec$(PPUEXT) + $(COMPILER) get9.pas muihelper$(PPUEXT): muihelper.pas intuition$(PPUEXT) mui$(PPUEXT) doslib$(PPUEXT) utility$(PPUEXT) + $(COMPILER) muihelper.pas ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/ctypes.pp diff --git a/rtl/gba/Makefile.fpc b/rtl/gba/Makefile.fpc index 8ec8edccea..fc7478a60b 100644 --- a/rtl/gba/Makefile.fpc +++ b/rtl/gba/Makefile.fpc @@ -91,6 +91,7 @@ $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp $(COMPILER) -Us -Sg $(SYSTEMUNIT).pp $(REDIR) uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp + $(COMPILER) $(INC)/uuchar.pp objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp $(REDIR) @@ -98,6 +99,10 @@ objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \ $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \ $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/strings.pp + +iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/iso7185.pp # # System Dependent Units @@ -113,6 +118,7 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \ dos$(PPUEXT) : dos.pp $(INC)/filerec.inc $(INC)/textrec.inc strings$(PPUEXT) \ $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) dos.pp #crt$(PPUEXT) : crt.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT) @@ -163,16 +169,21 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT) # ucomplex$(PPUEXT): $(INC)/ucomplex.pp math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/ucomplex.pp getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/getopts.pp heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -Sg $(INC)/heaptrc.pp $(REDIR) lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/lineinfo.pp + #lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT) charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/charset.pp cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas @@ -182,41 +193,60 @@ cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) # exec$(PPUEXT) : exec.pp execf.inc execd.inc + $(COMPILER) exec.pp timer$(PPUEXT) : timer.pp timerd.inc timerf.inc + $(COMPILER) timer.pp utility$(PPUEXT) : utility.pp exec$(PPUEXT) utilf.inc utild1.inc utild2.inc + $(COMPILER) utility.pp doslib$(PPUEXT) : doslib.pp exec$(PPUEXT) timer$(PPUEXT) doslibd.inc doslibf.inc + $(COMPILER) doslib.pp hardware$(PPUEXT): hardware.pas exec$(PPUEXT) + $(COMPILER) hardware.pas inputevent$(PPUEXT): inputevent.pas exec$(PPUEXT) timer$(PPUEXT) utility$(PPUEXT) + $(COMPILER) inputevent.pas graphics$(PPUEXT): graphics.pas exec$(PPUEXT) utility$(PPUEXT) hardware$(PPUEXT) + $(COMPILER) graphics.pas layers$(PPUEXT) : layers.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) + $(COMPILER) layers.pas intuition$(PPUEXT): intuition.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) \ inputevent$(PPUEXT) timer$(PPUEXT) layers$(PPUEXT) + $(COMPILER) intuition.pas aboxlib$(PPUEXT): aboxlib.pas + $(COMPILER) aboxlib.pas clipboard$(PPUEXT): clipboard.pas exec$(PPUEXT) + $(COMPILER) clipboard.pas datatype$(PPUEXT): datatypes.pas exec$(PPUEXT) doslib$(PPUEXT) intuition$(PPUEXT) \ utility$(PPUEXT) graphics$(PPUEXT) + $(COMPILER) datatypes.pas asl$(PPUEXT): asl.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) + $(COMPILER) asl.pas ahi$(PPUEXT): ahi.pas exec$(PPUEXT) utility$(PPUEXT) + $(COMPILER) ahi.pas mui$(PPUEXT): mui.pas exec$(PPUEXT) utility$(PPUEXT) intuition$(PPUEXT) graphics$(PPUEXT) + $(COMPILER) mui.pas tinygl$(PPUEXT): tinygl.pp exec$(PPUEXT) + $(COMPILER) tinygl.pp get9$(PPUEXT): get9.pas exec$(PPUEXT) + $(COMPILER) get9.pas muihelper$(PPUEXT): muihelper.pas intuition$(PPUEXT) mui$(PPUEXT) doslib$(PPUEXT) utility$(PPUEXT) + $(COMPILER) muihelper.pas ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(INC)/ctypes.pp