define own embedded target and cleanup previous commit.

This commit is contained in:
Alan Hourihane
2010-01-28 17:26:05 +00:00
parent 75cd6f3ece
commit 32e6043150

View File

@@ -115,9 +115,8 @@ env.Append(CPPPATH = [
if env['msvc']: if env['msvc']:
env.Append(CPPPATH = ['#include/c99']) env.Append(CPPPATH = ['#include/c99'])
# Embedded
# Posix if platform == 'embedded':
if platform in ('posix', 'linux', 'freebsd', 'darwin', 'embedded'):
env.Append(CPPDEFINES = [ env.Append(CPPDEFINES = [
'_POSIX_SOURCE', '_POSIX_SOURCE',
('_POSIX_C_SOURCE', '199309L'), ('_POSIX_C_SOURCE', '199309L'),
@@ -127,8 +126,24 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin', 'embedded'):
'PTHREADS', 'PTHREADS',
]) ])
if platform != 'embedded': env.Append(LIBS = [
env.Append(CPPDEFINES = ['HAVE_POSIX_MEMALIGN']) 'm',
'pthread',
'dl',
])
# Posix
if platform in ('posix', 'linux', 'freebsd', 'darwin'):
env.Append(CPPDEFINES = [
'_POSIX_SOURCE',
('_POSIX_C_SOURCE', '199309L'),
'_SVID_SOURCE',
'_BSD_SOURCE',
'_GNU_SOURCE',
'PTHREADS',
'HAVE_POSIX_MEMALIGN',
])
if platform == 'darwin': if platform == 'darwin':
env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE']) env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE'])
env.Append(CPPPATH = ['/usr/X11R6/include']) env.Append(CPPPATH = ['/usr/X11R6/include'])
@@ -136,14 +151,9 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin', 'embedded'):
env.Append(LIBS = [ env.Append(LIBS = [
'm', 'm',
'pthread', 'pthread',
'expat',
'dl', 'dl',
]) ])
if platform != 'embedded':
env.Append(LIBS = [
'expat',
])
# DRI # DRI
if dri: if dri: