diff options
author | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
commit | f01261d040be27337db9f9996d648a279c89b7c4 (patch) | |
tree | c448230939b3c90d53ce8852dd00925d6052e3a4 /source/blender/blenpluginapi/SConscript | |
parent | dcaeda5c4e3a0687251b8511de4f2e8b85ef75c0 (diff) | |
parent | 2198cfdb2deec8b2e85e242c74a032f43d0b26ca (diff) |
merge with/from trunk at r35190
Diffstat (limited to 'source/blender/blenpluginapi/SConscript')
-rw-r--r-- | source/blender/blenpluginapi/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript index 77faaa7b7f4..178f470e080 100644 --- a/source/blender/blenpluginapi/SConscript +++ b/source/blender/blenpluginapi/SConscript @@ -3,15 +3,15 @@ Import ('env') sources = env.Glob('intern/*.c') -incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna' +incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna ../blenloader' defs = [] incs += ' ' + env["BF_PTHREADS_INC"] if env['WITH_BF_QUICKTIME']: - defs.append('WITH_QUICKTIME') - incs += ' ' + env['BF_QUICKTIME_INC'] + defs.append('WITH_QUICKTIME') + incs += ' ' + env['BF_QUICKTIME_INC'] if env['OURPLATFORM'] == 'linux2': cflags='-pthread' |