diff options
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']: |