why the "#if 1" ?? Iirc those are the entries that have to be commented out to compile with msvc+cmake. I'm not sure there is a #if NOT WINCMAKE .... or similar. Though I don't think this would be the correct solution (as in why cmake+msvc fails but not scons+msvc or cmake+gcc)
-- Dalai 2011/1/9 Mitchell Stokes <[email protected]> > Revision: 34184 > > http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34184 > Author: moguri > Date: 2011-01-09 02:43:26 +0000 (Sun, 09 Jan 2011) > Log Message: > ----------- > stubs.c updates provided by Kupoman. > > Modified Paths: > -------------- > trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c > > Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c > =================================================================== > --- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c > 2011-01-09 01:17:56 UTC (rev 34183) > +++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c > 2011-01-09 02:43:26 UTC (rev 34184) > @@ -263,6 +263,11 @@ > void ED_object_constraint_update(struct Object *ob){} > struct bDeformGroup *ED_vgroup_add_name(struct Object *ob, char > *name){return (struct bDeformGroup *) NULL;} > void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int > vertnum, float weight, int assignmode){} > +void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int > vertnum){} > +void ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int > vertnum){} > +void ED_vgroup_delete(struct Object *ob, struct bDeformGroup *defgroup){} > +void ED_vgroup_object_is_edit_mode(struct Object *ob){} > + > void ED_sequencer_update_view(struct bContext *C, int view){} > float ED_rollBoneToVector(struct EditBone *bone, float > new_up_axis[3]){return 0.0f;} > void ED_space_image_size(struct SpaceImage *sima, int *width, int > *height){} > @@ -379,10 +384,12 @@ > struct wmKeyMap *WM_modalkeymap_add(struct wmKeyConfig *keyconf, char > *idname, EnumPropertyItem *items){return (struct wmKeyMap *) NULL;} > > /* intern/decimation */ > +#if 1 > int LOD_FreeDecimationData(struct LOD_Decimation_Info *info){return 0;} > int LOD_CollapseEdge(struct LOD_Decimation_Info *info){return 0;} > int LOD_PreprocessMesh(struct LOD_Decimation_Info *info){return 0;} > int LOD_LoadMesh(struct LOD_Decimation_Info *info){return 0;} > +#endif > > /* smoke */ > void LzmaCompress(void) { return; } > @@ -428,6 +435,7 @@ > char blender_path[] = ""; > > /* CSG */ > +#if 1 > struct CSG_BooleanOperation * CSG_NewBooleanFunction( void ){return > (struct CSG_BooleanOperation *) NULL;} > void CSG_FreeBooleanOperation(struct CSG_BooleanOperation > *operation){return;} > void CSG_FreeFaceDescriptor(struct CSG_FaceIteratorDescriptor * > f_descriptor){return;} > @@ -448,4 +456,5 @@ > CSG_VertexIteratorDescriptor obBVertices) > { return 0;} > > +#endif > #endif // WITH_GAMEENGINE > > _______________________________________________ > Bf-blender-cvs mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-blender-cvs > _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
