diff options
author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-11-03 18:02:01 +0000 |
---|---|---|
committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-11-03 18:02:01 +0000 |
commit | 0b3a28e45c02c6e043e91551f5bac9909b042b7d (patch) | |
tree | 2ef663519666ef0edc35e76806b9c24444829302 | |
parent | f9e3e35a09a25695c10301f591481e669303208e (diff) | |
download | fpc-0b3a28e45c02c6e043e91551f5bac9909b042b7d.tar.gz |
--- Merging r25815 into '.':
U ide/fpswitch.pas
--- Merging r25394 into '.':
C rtl/go32v2/Makefile.fpc
C rtl/go32v2/Makefile
Summary of conflicts:
Text conflicts: 2
# revisions: 25815,25394
r25815 | marco | 2013-10-18 10:40:34 +0200 (Fri, 18 Oct 2013) | 2 lines
Changed paths:
M /trunk/ide/fpswitch.pas
* fix for mantis #25202 macpascal->macpas, patch by Thaddy.
r25394 | florian | 2013-09-01 22:29:02 +0200 (Sun, 01 Sep 2013) | 1 line
Changed paths:
M /trunk/rtl/go32v2/Makefile
M /trunk/rtl/go32v2/Makefile.fpc
* fix building of go32v2 rtl with make 3.82
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_6@25930 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | ide/fpswitch.pas | 2 | ||||
-rw-r--r-- | rtl/go32v2/Makefile | 29 | ||||
-rw-r--r-- | rtl/go32v2/Makefile.fpc | 64 |
3 files changed, 93 insertions, 2 deletions
diff --git a/ide/fpswitch.pas b/ide/fpswitch.pas index 85bb27cee3..e46266f06f 100644 --- a/ide/fpswitch.pas +++ b/ide/fpswitch.pas @@ -1182,7 +1182,7 @@ begin AddSelectItem(opt_mode_objectpascal,'objfpc',idNone); AddSelectItem(opt_mode_turbopascal,'tp',idNone); AddSelectItem(opt_mode_delphi,'delphi',idNone); - AddSelectItem(opt_mode_macpascal,'macpascal',idNone); + AddSelectItem(opt_mode_macpascal,'macpas',idNone); { GNU Pascal mode doesn't do much, better disable it AddSelectItem(opt_mode_gnupascal,'gpc',idNone);} end; diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index f1f4e7fc4b..cb730c11f3 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/27] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/10/30] # 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 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 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 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 mipsel-linux @@ -2632,21 +2632,35 @@ objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc system$(PPUEXT) strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \ $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \ system$(PPUEXT) + $(COMPILER) $(INC)/strings.pp +iso7185$(PPUEXT) : $(INC)/iso7185.pp system$(PPUEXT) + $(COMPILER) $(INC)/iso7185.pp go32$(PPUEXT) : go32.pp system$(PPUEXT) + $(COMPILER) go32.pp dpmiexcp$(PPUEXT) : dpmiexcp.pp exceptn$(OEXT) system$(PPUEXT) $(COMPILER) -Sg dpmiexcp.pp initc$(PPUEXT) : initc.pp system$(PPUEXT) + $(COMPILER) initc.pp profile$(PPUEXT) : profile.pp dpmiexcp$(PPUEXT) go32$(PPUEXT) + $(COMPILER) profile.pp dxetype$(PPUEXT) : dxetype.pp system$(PPUEXT) + $(COMPILER) dxetype.pp dxeload$(PPUEXT) : dxeload.pp dxetype$(PPUEXT) system$(PPUEXT) + $(COMPILER) dxeload.pp emu387$(PPUEXT) : emu387.pp fpu$(OEXT) strings$(PPUEXT) dxeload$(PPUEXT) \ dpmiexcp$(PPUEXT) + $(COMPILER) emu387.pp ports$(PPUEXT) : ports.pp objpas$(PPUEXT) system$(PPUEXT) + $(COMPILER) ports.pp dos$(PPUEXT) : dos.pp $(INC)/filerec.inc $(INC)/textrec.inc \ go32$(PPUEXT) strings$(PPUEXT) system$(PPUEXT) + $(COMPILER) dos.pp crt$(PPUEXT) : crt.pp $(INC)/textrec.inc go32$(PPUEXT) system$(PPUEXT) + $(COMPILER) crt.pp objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT) + $(COMPILER) $(INC)/objects.pp printer$(PPUEXT) : printer.pp system$(PPUEXT) + $(COMPILER) printer.pp sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ objpas$(PPUEXT) dos$(PPUEXT) go32$(PPUEXT) sysconst$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp @@ -2684,14 +2698,27 @@ stdconvs$(PPUEXT) : $(OBJPASDIR)/stdconvs.pp objpas$(PPUEXT) system$(PPUEXT) \ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT) $(COMPILER) $(INC)/macpas.pp $(REDIR) cpu$(PPUEXT) : $(PROCINC)/cpu.pp system$(PPUEXT) + $(COMPILER) $(PROCINC)/cpu.pp mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) system$(PPUEXT) + $(COMPILER) $(PROCINC)/mmx.pp getopts$(PPUEXT) : $(INC)/getopts.pp system$(PPUEXT) + $(COMPILER) $(INC)/getopts.pp heaptrc$(PPUEXT) : $(INC)/heaptrc.pp system$(PPUEXT) $(COMPILER) -Sg $(INC)/heaptrc.pp lineinfo$(PPUEXT) : $(INC)/lineinfo.pp system$(PPUEXT) + $(COMPILER) $(INC)/lineinfo.pp lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp system$(PPUEXT) + $(COMPILER) $(INC)/lnfodwrf.pp charset$(PPUEXT) : $(INC)/charset.pp system$(PPUEXT) +matrix$(PPUEXT) : $(INC)/matrix.pp system$(PPUEXT) + $(COMPILER) $(INC)/matrix.pp ucomplex$(PPUEXT) : $(INC)/ucomplex.pp math$(PPUEXT) system$(PPUEXT) + $(COMPILER) $(INC)/ucomplex.pp msmouse$(PPUEXT) : msmouse.pp system$(PPUEXT) + $(COMPILER) msmouse.pp callspec$(PPUEXT) : $(INC)/callspec.pp system$(PPUEXT) + $(COMPILER) $(INC)/callspec.pp +cmem$(PPUEXT) : $(INC)/cmem.pp system$(PPUEXT) + $(COMPILER) $(INC)/cmem.pp ctypes$(PPUEXT) : $(INC)/ctypes.pp system$(PPUEXT) + $(COMPILER) $(INC)/ctypes.pp diff --git a/rtl/go32v2/Makefile.fpc b/rtl/go32v2/Makefile.fpc index 963a96d63c..12d4c2f221 100644 --- a/rtl/go32v2/Makefile.fpc +++ b/rtl/go32v2/Makefile.fpc @@ -72,50 +72,84 @@ prt0$(OEXT) : v2prt0.as # system$(PPUEXT) : system.pp $(SYSDEPS) $(COMPILER) -Us -Sg system.pp + objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc system$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/objpas.pp + strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \ $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \ system$(PPUEXT) + $(COMPILER) $(INC)/strings.pp + +iso7185$(PPUEXT) : $(INC)/iso7185.pp system$(PPUEXT) + $(COMPILER) $(INC)/iso7185.pp # # System Dependent Units # go32$(PPUEXT) : go32.pp system$(PPUEXT) + $(COMPILER) go32.pp + dpmiexcp$(PPUEXT) : dpmiexcp.pp exceptn$(OEXT) system$(PPUEXT) $(COMPILER) -Sg dpmiexcp.pp + initc$(PPUEXT) : initc.pp system$(PPUEXT) + $(COMPILER) initc.pp + profile$(PPUEXT) : profile.pp dpmiexcp$(PPUEXT) go32$(PPUEXT) + $(COMPILER) profile.pp + dxetype$(PPUEXT) : dxetype.pp system$(PPUEXT) + $(COMPILER) dxetype.pp + dxeload$(PPUEXT) : dxeload.pp dxetype$(PPUEXT) system$(PPUEXT) + $(COMPILER) dxeload.pp + emu387$(PPUEXT) : emu387.pp fpu$(OEXT) strings$(PPUEXT) dxeload$(PPUEXT) \ dpmiexcp$(PPUEXT) + $(COMPILER) emu387.pp + ports$(PPUEXT) : ports.pp objpas$(PPUEXT) system$(PPUEXT) + $(COMPILER) ports.pp + # # TP7 Compatible RTL Units # dos$(PPUEXT) : dos.pp $(INC)/filerec.inc $(INC)/textrec.inc \ go32$(PPUEXT) strings$(PPUEXT) system$(PPUEXT) + $(COMPILER) dos.pp + crt$(PPUEXT) : crt.pp $(INC)/textrec.inc go32$(PPUEXT) system$(PPUEXT) + $(COMPILER) crt.pp + objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT) + $(COMPILER) $(INC)/objects.pp + printer$(PPUEXT) : printer.pp system$(PPUEXT) + $(COMPILER) printer.pp # # Delphi Compatible Units # sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ objpas$(PPUEXT) dos$(PPUEXT) go32$(PPUEXT) sysconst$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp + classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) fgl$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp + fgl$(PPUEXT) : $(OBJPASDIR)/fgl.pp objpas$(PPUEXT) types$(PPUEXT) system$(PPUEXT) sysutils$(PPUEXT) $(COMPILER) $(OBJPASDIR)/fgl.pp + math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) $(COMPILER) $(OBJPASDIR)/math.pp + typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) rtlconst$(PPUEXT) $(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp + varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \ $(OBJPASDIR)/varutilh.inc varutils.pp sysutils$(PPUEXT) $(COMPILER) -I$(OBJPASDIR) varutils.pp + variants$(PPUEXT) : $(INC)/variants.pp varutils$(PPUEXT) sysutils$(PPUEXT) sysconst$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) $(COMPILER) -Fi$(INC) $(INC)/variants.pp @@ -124,16 +158,22 @@ fmtbcd$(PPUEXT) : $(OBJPASDIR)/fmtbcd.pp objpas$(PPUEXT) sysutils$(PPUEXT) varia types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp + rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp $(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/rtlconst.pp + sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(COMPILER) $(OBJPASDIR)/sysconst.pp + dateutil$(PPUEXT) : $(OBJPASDIR)/dateutil.pp $(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/dateutil.pp + convutil$(PPUEXT) : $(OBJPASDIR)/convutil.pp $(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/convutil.pp + strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp $(COMPILER) $(OBJPASDIR)/strutils.pp + stdconvs$(PPUEXT) : $(OBJPASDIR)/stdconvs.pp objpas$(PPUEXT) system$(PPUEXT) \ sysutils$(PPUEXT) $(COMPILER) $(OBJPASDIR)/stdconvs.pp @@ -146,18 +186,42 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT) # Other system-independent RTL Units # cpu$(PPUEXT) : $(PROCINC)/cpu.pp system$(PPUEXT) + $(COMPILER) $(PROCINC)/cpu.pp + mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) system$(PPUEXT) + $(COMPILER) $(PROCINC)/mmx.pp + getopts$(PPUEXT) : $(INC)/getopts.pp system$(PPUEXT) + $(COMPILER) $(INC)/getopts.pp + heaptrc$(PPUEXT) : $(INC)/heaptrc.pp system$(PPUEXT) $(COMPILER) -Sg $(INC)/heaptrc.pp + lineinfo$(PPUEXT) : $(INC)/lineinfo.pp system$(PPUEXT) + $(COMPILER) $(INC)/lineinfo.pp + lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp system$(PPUEXT) + $(COMPILER) $(INC)/lnfodwrf.pp + charset$(PPUEXT) : $(INC)/charset.pp system$(PPUEXT) + +matrix$(PPUEXT) : $(INC)/matrix.pp system$(PPUEXT) + $(COMPILER) $(INC)/matrix.pp + ucomplex$(PPUEXT) : $(INC)/ucomplex.pp math$(PPUEXT) system$(PPUEXT) + $(COMPILER) $(INC)/ucomplex.pp # # Other system-dependent RTL Units # msmouse$(PPUEXT) : msmouse.pp system$(PPUEXT) + $(COMPILER) msmouse.pp + callspec$(PPUEXT) : $(INC)/callspec.pp system$(PPUEXT) + $(COMPILER) $(INC)/callspec.pp + +cmem$(PPUEXT) : $(INC)/cmem.pp system$(PPUEXT) + $(COMPILER) $(INC)/cmem.pp + ctypes$(PPUEXT) : $(INC)/ctypes.pp system$(PPUEXT) + $(COMPILER) $(INC)/ctypes.pp |