Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2015-03-23 18:00:57 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-03-26 16:13:42 +0300
commitf354fa56b5ba8c2c489c09c961492e33406a8731 (patch)
tree654bba63de9b4a5468a13986bf569343e8735e58 /source
parent1e9318935132b5d23b1e7ec18b20481070837f89 (diff)
Fix for bf_pointcache lib missing in the blenderplayer and fix for link
order.
Diffstat (limited to 'source')
-rw-r--r--source/blender/pointcache/SConscript4
-rw-r--r--source/blender/pointcache/alembic/SConscript2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/pointcache/SConscript b/source/blender/pointcache/SConscript
index c6c5d659ac2..a250c256652 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 3f2b18259ad..c5ed79506b4 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])