[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35923] trunk/blender/source: remove bpy python api from blenderplayer, it was being linked but not initialized/available.

[Campbell Barton]

Enabled library sorting for the blenderplayer fixes this & I hope
similar problems we keep running into with windows/unix not linking
the player the same way.
committed r36105.

On Mon, Apr 11, 2011 at 9:47 PM, Dalai Felinto <dfelinto at gmail.com> wrote:
> this commit breaks blenderplayer linking for CMake+MSVC -
> http://www.pasteall.org/20745
> Commenting out the /* bpy/python internal api */ part of stubs.c "fix"
> things, but this part is needed for scons (and cmake in linux I
> guess).
>
> It seems that cmake is still linking differently from linux and windows.
> Does anyone have a clue on how to fix this?
>
> Thanks,
> Dalai
>
> 2011/3/31 Campbell Barton <ideasman42 at gmail.com>:
>> Revision: 35923
>>          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35923
>> Author:   campbellbarton
>> Date:     2011-03-31 15:28:53 +0000 (Thu, 31 Mar 2011)
>> Log Message:
>> -----------
>> remove bpy python api from blenderplayer, it was being linked but not initialized/available.
>>
>> Modified Paths:
>> --------------
>>    trunk/blender/source/blender/python/SConscript
>>    trunk/blender/source/blenderplayer/CMakeLists.txt
>>    trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
>>
>> Modified: trunk/blender/source/blender/python/SConscript
>> ===================================================================
>> --- trunk/blender/source/blender/python/SConscript      2011-03-31 15:26:51 UTC (rev 35922)
>> +++ trunk/blender/source/blender/python/SConscript      2011-03-31 15:28:53 UTC (rev 35923)
>> @@ -34,4 +34,4 @@
>>     defs.append('BUILD_DATE')
>>
>>  sources = env.Glob('intern/*.c')
>> -env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [361,160])
>> +env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361])
>>
>> Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
>> ===================================================================
>> --- trunk/blender/source/blenderplayer/CMakeLists.txt   2011-03-31 15:26:51 UTC (rev 35922)
>> +++ trunk/blender/source/blenderplayer/CMakeLists.txt   2011-03-31 15:28:53 UTC (rev 35923)
>> @@ -99,7 +99,6 @@
>>                extern_bullet
>>                bf_intern_guardedalloc
>>                bf_intern_memutil
>> -               bf_python
>>                bf_python_ext
>>                bf_blenlib
>>                bf_imbuf_cineon
>>
>> Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
>> ===================================================================
>> --- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c     2011-03-31 15:26:51 UTC (rev 35922)
>> +++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c     2011-03-31 15:28:53 UTC (rev 35923)
>> @@ -92,9 +92,16 @@
>>  struct wmKeyConfig;
>>  struct wmKeyMap;
>>  struct wmOperator;
>> +struct wmWindow;
>>  struct wmWindowManager;
>>  struct View3D;
>>  struct ToolSettings;
>> +struct bContextDataResult;
>> +struct bConstraintTarget;
>> +struct bPythonConstraint;
>> +struct bConstraintOb;
>> +struct Context;
>> +struct ChannelDriver;
>>
>>
>>  /*new render funcs */
>> @@ -402,6 +409,19 @@
>>  void sculpt_set_brush_alpha(struct Brush *brush, float alpha){}
>>  void ED_sculpt_modifiers_changed(struct Object *ob){};
>>
>> +
>> +/* bpy/python internal api */
>> +void operator_wrapper(struct wmOperatorType *ot, void *userdata) {}
>> +void BPY_text_free_code(struct Text *text) {}
>> +void BPY_id_release(struct Text *text) {}
>> +int BPY_context_member_get(struct Context *C, const char *member, struct bContextDataResult *result) { return 0; }
>> +void BPY_pyconstraint_target(struct bPythonConstraint *con, struct bConstraintTarget *ct) {}
>> +float BPY_driver_exec(struct ChannelDriver *driver) {return 0.0f;} /* might need this one! */
>> +void   BPY_DECREF(void *pyob_ptr) {}
>> +void BPY_pyconstraint_exec(struct bPythonConstraint *con, struct bConstraintOb *cob, struct ListBase *targets) {}
>> +void macro_wrapper(struct wmOperatorType *ot, void *userdata) {} ;
>> +
>> +
>>  char blender_path[] = "";
>>
>>  #endif // WITH_GAMEENGINE
>>
>> _______________________________________________
>> Bf-blender-cvs mailing list
>> Bf-blender-cvs at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>>
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>



-- 
- Campbell