build blenderplayer without opennl and decimation

diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript
index cf199fb3bc528c1b9442b3d0f7e3f145bb9f55bf..0df9303239443a9d806472b8be67472cecd2063e 100644 (file)
--- a/intern/decimation/SConscript
+++ b/intern/decimation/SConscript
@@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp')
 
 incs = '. ../moto/include ../container ../memutil'
 
 
 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 e46cefbff58b3215a5f4ceb12de847d711c8e9d0..f68810d2f1665f78b5d391516e07b267c13eba3b 100644 (file)
--- 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'):
 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:
 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 91fb90315975474fef0e4dc5389e3b02c77058b8..fecead66bda2858f2f6014bc7a3b4b9a5046a33c 100644 (file)
--- 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; }
 
 /* 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) {}
 // bobj read/write debug messages
 void elbeemDebugOut(char *msg) {}
 void fluidsimSettingsFree(struct FluidsimSettings* sb) {}