define own embedded target and cleanup previous commit.

diff --git a/SConstruct b/SConstruct
index 9f1e8a72ae3465d7e882b803092535c35733dcdd..1c7550d783640bdc70e2caba38e0b218088dda53 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -115,9 +115,25 @@ env.Append(CPPPATH = [
 if env['msvc']:
     env.Append(CPPPATH = ['#include/c99'])
 
 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
 
 # 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'), 
        env.Append(CPPDEFINES = [
                '_POSIX_SOURCE',
                ('_POSIX_C_SOURCE', '199309L'), 


@@ -126,9 +142,8 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin', 'embedded'):
                '_GNU_SOURCE',
                
                'PTHREADS',
                '_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'])
        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',
        env.Append(LIBS = [
                'm',
                'pthread',

+               'expat',

                'dl',
        ])
                'dl',
        ])

-       if platform != 'embedded':
-               env.Append(LIBS = [
-                       'expat',
-               ])
-               
-

 
 # DRI
 if dri:
 
 # DRI
 if dri: