Module: Mesa
Branch: master
Commit: 32e6043150077662323c66ff05334c8d8952fc04
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=32e6043150077662323c66ff05334c8d8952fc04
Author: Alan Hourihane <al...@vmware.com>
Date: Thu Jan 28 17:26:05 2010 +0000
define own embedded target and cleanup previous commit.
---
SConstruct | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/SConstruct b/SConstruct
index 9f1e8a7..1c7550d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -115,9 +115,25 @@ env.Append(CPPPATH = [
if env['msvc']:
env.Append(CPPPATH = ['#include/c99'])
+# Embedded
+if platform == 'embedded':
+ env.Append(CPPDEFINES = [
+ '_POSIX_SOURCE',
+ ('_POSIX_C_SOURCE', '199309L'),
+ '_SVID_SOURCE',
+ '_BSD_SOURCE',
+ '_GNU_SOURCE',
+
+ 'PTHREADS',
+ ])
+ env.Append(LIBS = [
+ 'm',
+ 'pthread',
+ 'dl',
+ ])
# Posix
-if platform in ('posix', 'linux', 'freebsd', 'darwin', 'embedded'):
+if platform in ('posix', 'linux', 'freebsd', 'darwin'):
env.Append(CPPDEFINES = [
'_POSIX_SOURCE',
('_POSIX_C_SOURCE', '199309L'),
@@ -126,9 +142,8 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin',
'embedded'):
'_GNU_SOURCE',
'PTHREADS',
+ 'HAVE_POSIX_MEMALIGN',
])
- if platform != 'embedded':
- env.Append(CPPDEFINES = ['HAVE_POSIX_MEMALIGN'])
if platform == 'darwin':
env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE'])
env.Append(CPPPATH = ['/usr/X11R6/include'])
@@ -136,14 +151,9 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin',
'embedded'):
env.Append(LIBS = [
'm',
'pthread',
+ 'expat',
'dl',
])
- if platform != 'embedded':
- env.Append(LIBS = [
- 'expat',
- ])
-
-
# DRI
if dri:
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
