diff options
Diffstat (limited to 'intern/decimation/SConscript')
| -rw-r--r-- | intern/decimation/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript index 2fc7781bd59..3d0cb0b2db7 100644 --- a/intern/decimation/SConscript +++ b/intern/decimation/SConscript @@ -5,4 +5,8 @@ sources = env.Glob('intern/*.cpp') incs = '. ../moto/include ../container ../memutil' +<<<<<<< .working env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], libtype=['core'], priority = [200] ) +======= +env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], libtype=['core', 'player'], priority = [200, 100] ) +>>>>>>> .merge-right.r35190 |