diff options
-rw-r--r-- | intern/decimation/SConscript | 2 | ||||
-rw-r--r-- | intern/opennl/SConscript | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/bad_level_call_stubs/stubs.c | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript index cf199fb3bc5..0df93032394 100644 --- a/intern/decimation/SConscript +++ b/intern/decimation/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp') incs = '. ../moto/include ../container ../memutil' -env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core','common','player'], priority = [10, 20, 25] ) +env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core','common'], priority = [10, 20] ) diff --git a/intern/opennl/SConscript b/intern/opennl/SConscript index e46cefbff58..f68810d2f16 100644 --- a/intern/opennl/SConscript +++ b/intern/opennl/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c') incs = 'extern superlu' if (env['OURPLATFORM'] == 'win32-mingw'): - env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern','player'], priority=[1,80,22] ) + env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] ) else: - env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','player'], priority=[55,22] ) + env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core'], priority=[55] ) diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c index 91fb9031597..fecead66bda 100644 --- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c +++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c @@ -242,6 +242,12 @@ void bglEnd(void) {} /* booleanops.c */ struct DerivedMesh *NewBooleanDerivedMesh(struct Object *ob, struct Object *ob_select, int int_op_type) { return 0; } +/* LOD_decimation.cpp */ +int LOD_LoadMesh(struct LOD_Decimation_Info* info) { return 0;}; +int LOD_PreprocessMesh(struct LOD_Decimation_Info* info) {return 0;}; +int LOD_CollapseEdge(struct LOD_Decimation_Info* info) {return 0;}; +int LOD_FreeDecimationData(struct LOD_Decimation_Info* info) {return 0;}; + // bobj read/write debug messages void elbeemDebugOut(char *msg) {} void fluidsimSettingsFree(struct FluidsimSettings* sb) {} |