diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
| commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
| tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /extern/carve/bundle.sh | |
| parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
| parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) | |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'extern/carve/bundle.sh')
| -rwxr-xr-x | extern/carve/bundle.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extern/carve/bundle.sh b/extern/carve/bundle.sh index 2a3e621fab0..236720f740d 100755 --- a/extern/carve/bundle.sh +++ b/extern/carve/bundle.sh @@ -31,6 +31,8 @@ headers=`find ./lib -type f -iname '*.h' -or -iname '*.hpp' | sed -r 's/^\.\//\t includes=`find ./include -type f -iname '*.h' -or -iname '*.hpp' | sed -r 's/^\.\//\t/' | sort -d` cp patches/files/config.h include/carve/config.h +mkdir -p include/carve/random +cp patches/files/random.h include/carve/random/random.h cat > CMakeLists.txt << EOF # ***** BEGIN GPL LICENSE BLOCK ***** @@ -91,6 +93,7 @@ if(WITH_BOOST) add_definitions( -DCARVE_SYSTEM_BOOST + -DHAVE_BOOST_LIBRARY ) list(APPEND INC_SYS @@ -123,6 +126,7 @@ if env['WITH_BF_BOOST']: defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS') defs.append('CARVE_SYSTEM_BOOST') + defs.append('HAVE_BOOST_LIBRARY') incs.append(env['BF_BOOST_INC']) env.BlenderLib ('extern_carve', Split(sources), incs, defs, libtype=['extern'], priority=[40] ) |