diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-17 22:54:16 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-17 22:54:16 +0400 |
commit | 70821c6b24f19acd7263fadf161b94611b53273f (patch) | |
tree | a662f3a9b1dc2db824699888acb7cedf6749eb89 /source/blender/blenkernel/SConscript | |
parent | f24255b5a03f68a2ef4e09eb55d93dc21a1f44c0 (diff) | |
parent | e53c4dae546f9550d6a4e79ae87c3dee9ac7b650 (diff) |
Merged changes in the trunk up to revision 40299.
Diffstat (limited to 'source/blender/blenkernel/SConscript')
-rw-r--r-- | source/blender/blenkernel/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index cc40ee9b799..4f19b353351 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -4,7 +4,7 @@ import os sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') -incs = '. #/intern/guardedalloc #/intern/memutil ../editors/include' +incs = '. #/intern/guardedalloc #/intern/memutil' incs += ' ../blenlib ../blenfont ../makesdna ../windowmanager' incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna' incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers' |