diff options
| author | Enrico Fracasso <enrico.fracasso@email.it> | 2008-10-07 21:13:35 +0400 |
|---|---|---|
| committer | Enrico Fracasso <enrico.fracasso@email.it> | 2008-10-07 21:13:35 +0400 |
| commit | d8758e32a06f76798285c300d2eb37595e1ba646 (patch) | |
| tree | 08524444af354cab2ed1ac2f34c6670ef1f3dc70 /CMakeLists.txt | |
| parent | 94a9fa4711be6411002bdd32ffbb01c7402f4920 (diff) | |
WebPlugin
fix:
* web plugin works on opera too
sandboxing:
* added AppArmor configuration
* enabled privilege separation for the web plugin: the blender player can run as a lower privileged user, xauth token is generated on the fly .
testing:
* web plugin tested on ubuntu 32/64bit, fedora and FreeBSD
Changed only cmake build script: AppArmor is enabled by default, if you want to enable privilege separation instead, you have to change the cmake variable WEBPLUGIN_SANDBOX_MODE to privsep (or none to
disable it).
Warning: source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c must be setuid root in order to change user successfully
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 506353628a4..9e615ecdfa5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF) OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON) OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF) -OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Mozilla-Unix only)" OFF) +OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF) IF(NOT WITH_GAMEENGINE AND WITH_PLAYER) MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE") @@ -429,6 +429,17 @@ SET(FTGL_LIB extern_ftgl) #----------------------------------------------------------------------------- +# Blender WebPlugin + +IF(WITH_WEBPLUGIN) + SET(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path") + SET(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none") + + SET(WITH_PLAYER ON) +ENDIF(WITH_WEBPLUGIN) + + +#----------------------------------------------------------------------------- # Configure OpenGL. INCLUDE(${CMAKE_ROOT}/Modules/FindOpenGL.cmake) INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) @@ -457,12 +468,6 @@ SUBDIRS( # Blender Application SUBDIRS(source/creator) -#----------------------------------------------------------------------------- -# Blender WebPlugin -IF(WITH_WEBPLUGIN) - SET(MOZILLA_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path") - SET(WITH_PLAYER ON) -ENDIF(WITH_WEBPLUGIN) #----------------------------------------------------------------------------- # Blender Player |