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/creator/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/creator/CMakeLists.txt')
-rw-r--r-- | source/creator/CMakeLists.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 35cbff33342..73400da4845 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -27,6 +27,7 @@ setup_libdirs() blender_include_dirs( ../../intern/guardedalloc + ../../intern/glew-mx ../blender/blenlib ../blender/blenkernel ../blender/blenloader @@ -39,6 +40,9 @@ blender_include_dirs( ../blender/windowmanager ) +add_definitions(${GL_DEFINITIONS}) +blender_include_dirs("${GLEW_INCLUDE_PATH}") + if(WIN32) blender_include_dirs(../../intern/utfconv) endif() @@ -676,6 +680,18 @@ elseif(WIN32) unset(_PYTHON_VERSION_NO_DOTS) endif() + # EGL Runtime Components + if(WITH_GL_EGL) + if(WIN32) + install(FILES "${OPENGLES_DLL}" DESTINATION ${TARGETDIR}) + install(FILES "${OPENGLES_EGL_DLL}" DESTINATION ${TARGETDIR}) + + if(WITH_GL_ANGLE) + install(FILES "${D3DCOMPILER_DLL}" DESTINATION ${TARGETDIR}) + endif() + endif() + endif() + if(MSVC) install( FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll |