[Bf-blender-cvs] [f8bde3c] gooseberry: Fix for bf_pointcache lib missing in the blenderplayer and fix for link order.
Lukas Tönne
noreply at git.blender.org
Mon Mar 23 16:02:57 CET 2015
Commit: f8bde3c0a317f1737ef690b0d9a4e9f6ec550618
Author: Lukas Tönne
Date: Mon Mar 23 16:00:57 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBf8bde3c0a317f1737ef690b0d9a4e9f6ec550618
Fix for bf_pointcache lib missing in the blenderplayer and fix for link
order.
===================================================================
M source/blender/pointcache/SConscript
M source/blender/pointcache/alembic/SConscript
===================================================================
diff --git a/source/blender/pointcache/SConscript b/source/blender/pointcache/SConscript
index c6c5d65..a250c25 100644
--- a/source/blender/pointcache/SConscript
+++ b/source/blender/pointcache/SConscript
@@ -48,9 +48,9 @@ if env['WITH_BF_INTERNATIONAL']:
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs.append(env['BF_PTHREADS_INC'])
+env.BlenderLib('bf_pointcache', sources, incs, defines=defs, libtype=['core','player'], priority=[900,900])
+
if env['WITH_BF_ALEMBIC']:
defs.append('WITH_PTC_ALEMBIC')
SConscript(['alembic/SConscript'])
-
-env.BlenderLib('bf_pointcache', sources, incs, defines=defs, libtype=['core'], priority=[900])
diff --git a/source/blender/pointcache/alembic/SConscript b/source/blender/pointcache/alembic/SConscript
index 3f2b182..c5ed795 100644
--- a/source/blender/pointcache/alembic/SConscript
+++ b/source/blender/pointcache/alembic/SConscript
@@ -57,4 +57,4 @@ if env['WITH_BF_ALEMBIC']:
defs.append('WITH_ALEMBIC')
-env.BlenderLib('bf_pointcache_alembic', sources, incs, defines=defs, libtype=['core'], priority=[901])
+env.BlenderLib('bf_pointcache_alembic', sources, incs, defines=defs, libtype=['core','player'], priority=[901, 901])
More information about the Bf-blender-cvs
mailing list