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/editors/sculpt_paint/SConscript | |
| parent | dcaeda5c4e3a0687251b8511de4f2e8b85ef75c0 (diff) | |
| parent | 2198cfdb2deec8b2e85e242c74a032f43d0b26ca (diff) | |
merge with/from trunk at r35190
Diffstat (limited to 'source/blender/editors/sculpt_paint/SConscript')
| -rw-r--r-- | source/blender/editors/sculpt_paint/SConscript | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript index b9cc294d44d..6c1fe79d8bc 100644 --- a/source/blender/editors/sculpt_paint/SConscript +++ b/source/blender/editors/sculpt_paint/SConscript @@ -8,11 +8,15 @@ defs = [] incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../render/extern/include' +<<<<<<< .working incs += ' ../../gpu ../../makesrna ../../bmesh' +======= +incs += ' ../../gpu ../../makesrna ../../blenloader' +>>>>>>> .merge-right.r35190 if env['OURPLATFORM'] == 'linux2': - cflags='-pthread' - incs += ' ../../../extern/binreloc/include' + cflags='-pthread' + incs += ' ../../../extern/binreloc/include' if env['OURPLATFORM'] == 'linuxcross': if env['WITH_BF_OPENMP']: |