diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:17:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:22:54 +0400 |
commit | 54ee22130ca0ce59500c6eddb562b78eb4526bcd (patch) | |
tree | ba21cdaa35656c590059c864e028e24b6e234082 /source/blenderplayer/CMakeLists.txt | |
parent | b09f7dcaa7b487ada53c8dbaa811deaa1201d163 (diff) | |
parent | 04814476c08e9350c424619cd99ccb1149d65365 (diff) |
Merge branch 'master' into dyntopo_holesdyntopo_holes
Conflicts:
source/blender/blenkernel/intern/pbvh_bmesh.c
Diffstat (limited to 'source/blenderplayer/CMakeLists.txt')
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 188fb01d23d..c48578c791b 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -151,6 +151,7 @@ endif() bf_intern_raskter bf_intern_opencolorio bf_intern_opennl + bf_intern_glew_mx extern_rangetree extern_wcwidth extern_libmv @@ -162,7 +163,7 @@ endif() endif() if(NOT WITH_SYSTEM_GLEW) - list(APPEND BLENDER_SORTED_LIBS extern_glew) + list(APPEND BLENDER_SORTED_LIBS ${BLENDER_GLEW_LIBRARIES}) endif() if(WITH_LZMA) |