* Patch by Karl-Michael Schindler (mantis 0026847): gba and nds targets are now buildable without external dependencies

git-svn-id: trunk@30083 -
This commit is contained in:
Legolas 2015-03-03 09:16:04 +00:00
parent 69cbcdaa34
commit 8dd9b46d60
7 changed files with 17 additions and 7 deletions

View File

@ -51,6 +51,10 @@ Interface
{$DEFINE NO_THREADING}
{$ENDIF GO32V2}
{$IFDEF NDS}
{$DEFINE NO_THREADING}
{$ENDIF NDS}
{$IFDEF NETBSD}
{ NetBSD pthreads are not yet working, try to use fpmake without threads }
{$DEFINE NO_THREADING}
@ -210,7 +214,7 @@ Const
{ embedded }( false, true, true, true, true, true, true, true, true, true , false, false, false, false, false),
{ symbian } ( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false),
{ haiku } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false),
{ iphonesim}( false, true, false, false, false, true, false, false, false, false, false, false, false, false, false),
{ iphonesim}( false, true, false, false, false, true, false, false, false, false, false, false, false, false, false),
{ aix } ( false, false, false, true, false, false, false, true, false, false, false, false, false, false, false),
{ java } ( false, false, false, false, false, false, false, false, false, false, false, false, true , false, false),
{ android } ( false, true, false, false, false, false, true, false, false, false, false, true, true , false, false),

View File

@ -28,6 +28,9 @@ unit gd;
{$IFDEF GBA}
{$UNDEF FPC_TARGET_SUPPORTS_DYNLIBS}
{$ENDIF GBA}
{$IFDEF NDS}
{$UNDEF FPC_TARGET_SUPPORTS_DYNLIBS}
{$ENDIF NDS}
interface
@ -100,7 +103,11 @@ uses
{$DEFINE gdlib := }
{$DEFINE clib := }
{$ENDIF GBA}
{$IFDEF NDS}
{$UNDEF LOAD_DYNAMICALLY}
{$DEFINE gdlib := }
{$DEFINE clib := }
{$ENDIF NDS}
{$IFNDEF LOAD_DYNAMICALLY}
{$IFDEF darwin}

View File

@ -24,7 +24,7 @@ Const
SerialOSes = [android,linux,netbsd,openbsd,win32,win64];
UComplexOSes = [amiga,aros,emx,gba,go32v2,morphos,msdos,nativent,nds,netware,netwlibc,os2,watcom,wii,wince,win32,win64]+UnixLikes;
MatrixOSes = [amiga,aros,emx,gba,go32v2,morphos,msdos,nativent,nds,netware,netwlibc,os2,wii,win32,win64,wince]+UnixLikes;
ObjectsOSes = [amiga,aros,emx,gba,go32v2,morphos,msdos,netware,netwlibc,os2,win32,win64,wince]+UnixLikes;
ObjectsOSes = [amiga,aros,emx,gba,go32v2,morphos,msdos,nds,netware,netwlibc,os2,win32,win64,wince]+UnixLikes;
WinsockOSes = [win32,win64,wince,os2,emx,netware,netwlibc];
WinSock2OSes = [win32,win64,wince];
// sockets of morphos is implemented, but not active

View File

@ -15,7 +15,7 @@ Const
// AllUnixOSes = [Linux,FreeBSD,NetBSD,OpenBSD,Darwin,QNX,BeOS,Solaris,Haiku,iphonesim,aix,Android];
// unixlikes-[beos];
//
StrUtilsOSes = [amiga,aros,emx,gba,go32v2,msdos,netware,wince,morphos,nativent,os2,netwlibc,win32,win64]+UnixLikes;
StrUtilsOSes = [amiga,aros,emx,gba,go32v2,msdos,nds,netware,wince,morphos,nativent,os2,netwlibc,win32,win64]+UnixLikes;
VarUtilsOSes = [amiga,aros,emx,gba,go32v2,msdos,nds,netware,wince,morphos,nativent,os2,netwlibc,watcom,wii,win32,win64]+UnixLikes;
ConvUtilsOSes = [nativent,netware,netwlibc,win32,win64,wince]+UnixLikes-[BeOS];
ConvUtilOSes = [Go32v2,msdos,os2,emx];

View File

@ -13,7 +13,7 @@ Const
UnixLikes = AllUnixOSes -[QNX];
CollationOSes = [aix,darwin,emx,freebsd,linux,netbsd,openbsd,os2,solaris,win32,win64,dragonfly];
CPUnits = [aix,amiga,aros,android,beos,darwin,iphonesim,emx,gba,freebsd,go32v2,haiku,linux,morphos,netbsd,netware,netwlibc,openbsd,os2,solaris,watcom,wii,win32,win64,wince,dragonfly];
CPUnits = [aix,amiga,aros,android,beos,darwin,iphonesim,emx,gba,nds,freebsd,go32v2,haiku,linux,morphos,netbsd,netware,netwlibc,openbsd,os2,solaris,watcom,wii,win32,win64,wince,dragonfly];
utf8bidiOSes = [netware,netwlibc];
freebidiOSes = [netware,netwlibc];

View File

@ -24,7 +24,7 @@ begin
P.Dependencies.Add('morphunits',[morphos]);
if Defaults.CPU=arm then
P.OSes := P.OSes - [darwin];
P.OSes := P.OSes - [iphonesim,os2,emx,go32v2,watcom,nativent,embedded,android,amiga,aros,msdos,gba];
P.OSes := P.OSes - [iphonesim,os2,emx,go32v2,watcom,nativent,embedded,android,amiga,aros,msdos,gba,nds];
T:=P.Targets.AddUnit('logger.pas');
with T.Dependencies do

View File

@ -1,4 +1,3 @@
-Sf-
-SfHEAP
-SfINITFINAL
-SfCLASSES