diff options
| author | weety <[email protected]> | 2016-05-31 20:23:32 +0800 |
|---|---|---|
| committer | weety <[email protected]> | 2016-05-31 20:23:32 +0800 |
| commit | 94e1935f1f2149f4e98098fbd171c3e96acb0e14 (patch) | |
| tree | c775db6b6c5fdc5c6ae811b44a5791af40784e2a /components/external/cairo/SConscript | |
| parent | 714f00679eed2c8d1e758c768cf7af57944a5f08 (diff) | |
| parent | c8cfc14b82c633c7153113ac1f753695254d4bd6 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into fixed
Diffstat (limited to 'components/external/cairo/SConscript')
| -rw-r--r-- | components/external/cairo/SConscript | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/components/external/cairo/SConscript b/components/external/cairo/SConscript index f7e0490b58..2e3b5b78cd 100644 --- a/components/external/cairo/SConscript +++ b/components/external/cairo/SConscript @@ -1,11 +1,9 @@ -Import('RTT_ROOT') -Import('rtconfig') - from building import * import os CAIRO_VERSION = '1.10.2' CAIRO_PATH = 'cairo-' + CAIRO_VERSION +cwd = GetCurrentDir() if GetDepend('RT_USING_CAIRO') and not os.path.exists(CAIRO_PATH): print '================ERROR============================' @@ -99,7 +97,7 @@ cairo.c for item in range(len(src)): src[item] = CAIRO_PATH + '/src/' + src[item] -CPPPATH = [RTT_ROOT + '/components/external/cairo/' + CAIRO_PATH + '/src', RTT_ROOT + '/components/external/cairo/'] +CPPPATH = [cwd + '/' + CAIRO_PATH + '/src', cwd] group = DefineGroup('cairo', src, depend = ['RT_USING_CAIRO', 'RT_USING_NEWLIB', 'RTGUI_IMAGE_PNG', 'RT_USING_PTHREADS'], CPPPATH = CPPPATH) Return('group') |