[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22965] branches/blender2.5/blender: changes needed for building the blenderplayer with cmake on linux.
Campbell Barton
ideasman42 at gmail.com
Thu Sep 3 08:34:04 CEST 2009
Revision: 22965
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22965
Author: campbellbarton
Date: 2009-09-03 08:34:03 +0200 (Thu, 03 Sep 2009)
Log Message:
-----------
changes needed for building the blenderplayer with cmake on linux.
Modified Paths:
--------------
branches/blender2.5/blender/SConstruct
branches/blender2.5/blender/blenderplayer/CMakeLists.txt
branches/blender2.5/blender/blenderplayer/bad_level_call_stubs/stubs.c
Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct 2009-09-03 05:52:05 UTC (rev 22964)
+++ branches/blender2.5/blender/SConstruct 2009-09-03 06:34:03 UTC (rev 22965)
@@ -402,9 +402,6 @@
thestatlibs, thelibincs = B.setup_staticlibs(env)
thesyslibs = B.setup_syslibs(env)
-if env['WITH_BF_PLAYER']:
- print("Warning: Game player may not build on 2.5")
-
if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
#env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist + thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
Modified: branches/blender2.5/blender/blenderplayer/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/blenderplayer/CMakeLists.txt 2009-09-03 05:52:05 UTC (rev 22964)
+++ branches/blender2.5/blender/blenderplayer/CMakeLists.txt 2009-09-03 06:34:03 UTC (rev 22965)
@@ -80,11 +80,11 @@
bf_oglrasterizer
bf_expressions
bf_scenegraph
- bf_IK
+ bf_IK
bf_moto
bf_kernel
bf_nodes
- bf_gpu
+ bf_gpu
bf_imbuf
bf_avi
kx_network
@@ -93,15 +93,21 @@
extern_bullet
bf_guardedalloc
bf_memutil
+ bf_python
+ bf_gen_python
bf_blenlib
bf_cineon
bf_openexr
extern_libopenjpeg
bf_dds
bf_readblenfile
+ bf_dna
+ bf_rna
+ bf_blenfont
+ bf_audaspace
blenkernel_blc
extern_binreloc
- extern_glew
+ extern_glew
)
IF(WITH_QUICKTIME)
Modified: branches/blender2.5/blender/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- branches/blender2.5/blender/blenderplayer/bad_level_call_stubs/stubs.c 2009-09-03 05:52:05 UTC (rev 22964)
+++ branches/blender2.5/blender/blenderplayer/bad_level_call_stubs/stubs.c 2009-09-03 06:34:03 UTC (rev 22965)
@@ -29,7 +29,7 @@
*/
#include <stdlib.h>
-#include "dna_listbase.h"
+#include "DNA_listBase.h"
#include "RNA_types.h"
/*new render funcs */
@@ -70,7 +70,6 @@
void texture_rgb_blend(float *in, float *tex, float *out, float fact, float facg, int blendtype){}
char stipple_quarttone[1]; //GLubyte stipple_quarttone[128]
double elbeemEstimateMemreq(int res, float sx, float sy, float sz, int refine, char *retstr) {return 0.0f;}
-char bprogname[]="";
/* rna */
void WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference){}
@@ -177,3 +176,25 @@
void WM_operator_bl_idname(char *to, const char *from){}
short insert_keyframe (struct ID *id, struct bAction *act, const char group[], const char rna_path[], int array_index, float cfra, short flag){return 0;}
+/* smoke */
+void lzo1x_1_compress(void) {return;};
+void LzmaCompress(void) {return;};
+void smoke_export(void) {return;};
+void lzo1x_decompress(void) {return;};
+void LzmaUncompress(void) {return;};
+void smoke_init(void) {return;};
+void smoke_turbulence_init(void) {return;};
+void smoke_turbulence_initBlenderRNA(void) {return;};
+void smoke_initBlenderRNA(void) {return;};
+void smoke_free(void) {return;};
+void smoke_turbulence_free(void) {return;};
+void smoke_turbulence_step(void) {return;};
+void smoke_dissolve(void) {return;};
+void smoke_get_density(void) {return;};
+void smoke_get_heat(void) {return;};
+void smoke_get_velocity_x(void) {return;};
+void smoke_get_velocity_y(void) {return;};
+void smoke_get_velocity_z(void) {return;};
+void smoke_get_obstacle(void) {return;};
+void smoke_get_index(void) {return;};
+void smoke_step(void) {return;};
More information about the Bf-blender-cvs
mailing list