Added missing sculpt header

[blender.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c1b863178f444556c166295418d1729b7f610ce..a593f7623876c22df4fdc974e52b3a57e5c861d9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,14 +57,15 @@ OPTION(WITH_PLAYER          "Build Player"                                          OFF)
 OPTION(WITH_GAMEENGINE         "Enable Game Engine"                                    ON)
 OPTION(WITH_BULLET             "Enable Bullet (Physics Engine)"                        ON)
 OPTION(WITH_INTERNATIONAL      "Enable I18N   (International fonts and text)"          ON)
 OPTION(WITH_GAMEENGINE         "Enable Game Engine"                                    ON)
 OPTION(WITH_BULLET             "Enable Bullet (Physics Engine)"                        ON)
 OPTION(WITH_INTERNATIONAL      "Enable I18N   (International fonts and text)"          ON)

-OPTION(WITH_VERSE              "Enable Verse  (http://verse.blender.org)"              OFF)

 OPTION(WITH_ELBEEM             "Enable Elbeem (Fluid Simulation)"                      ON)
 OPTION(WITH_QUICKTIME          "Enable Quicktime Support"                              OFF)
 OPTION(WITH_OPENEXR            "Enable OpenEXR Support (http://www.openexr.com)"       ON)
 OPTION(WITH_ELBEEM             "Enable Elbeem (Fluid Simulation)"                      ON)
 OPTION(WITH_QUICKTIME          "Enable Quicktime Support"                              OFF)
 OPTION(WITH_OPENEXR            "Enable OpenEXR Support (http://www.openexr.com)"       ON)

+OPTION(WITH_DDS                        "Enable DDS Support"                                    ON)

 OPTION(WITH_FFMPEG             "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"   OFF)
 OPTION(WITH_FFMPEG             "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"   OFF)

+OPTION(WITH_PYTHON             "Enable Embedded Python API"                            ON)

 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_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")
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")


@@ -86,14 +87,16 @@ INCLUDE(CMake/macros.cmake)
 #Platform specifics
 
 IF(UNIX)
 #Platform specifics
 
 IF(UNIX)

-  INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake)
-  IF(OPENAL_FOUND)
-    SET(WITH_OPENAL ON)
-    SET(OPENAL_LIB ${OPENAL_LIBRARY})
-    SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
-  ELSE(OPENAL_FOUND)
-    SET(WITH_OPENAL OFF)
-  ENDIF(OPENAL_FOUND)
+  IF(WITH_OPENAL)
+    INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake)
+    IF(OPENAL_FOUND)
+      SET(WITH_OPENAL ON)
+      SET(OPENAL_LIB ${OPENAL_LIBRARY})
+      SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
+    ELSE(OPENAL_FOUND)
+      SET(WITH_OPENAL OFF)
+    ENDIF(OPENAL_FOUND)
+  ENDIF(WITH_OPENAL)

 
   FIND_LIBRARY(ALUT_LIBRARY
     NAMES alut
 
   FIND_LIBRARY(ALUT_LIBRARY
     NAMES alut


@@ -180,7 +183,7 @@ IF(UNIX)
 
   SET(ZLIB_LIB z)
 
 
   SET(ZLIB_LIB z)
 

-  SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++")
+  SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11 -ldl")

 
   IF(WITH_OPENMP)
     SET(LLIBS "${LLIBS} -lgomp")
 
   IF(WITH_OPENMP)
     SET(LLIBS "${LLIBS} -lgomp")


@@ -327,7 +330,7 @@ IF(WIN32)
   SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
   IF(CMAKE_CL_64)
   SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
   IF(CMAKE_CL_64)

-  SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+  SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")

   ELSE(CMAKE_CL_64)
   SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
   ENDIF(CMAKE_CL_64)
   ELSE(CMAKE_CL_64)
   SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
   ENDIF(CMAKE_CL_64)


@@ -421,13 +424,23 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 #-----------------------------------------------------------------------------
 # Common.
 
 #-----------------------------------------------------------------------------
 # Common.

-SET(VERSE_INC ${CMAKE_SOURCE_DIR}/extern/verse/dist)

 
 SET(FTGL ${CMAKE_SOURCE_DIR}/extern/bFTGL)
 SET(FTGL_INC ${FTGL}/include)
 SET(FTGL_LIB extern_ftgl)
 
 
 
 SET(FTGL ${CMAKE_SOURCE_DIR}/extern/bFTGL)
 SET(FTGL_INC ${FTGL}/include)
 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)
 #-----------------------------------------------------------------------------
 # Configure OpenGL.
 INCLUDE(${CMAKE_ROOT}/Modules/FindOpenGL.cmake)


@@ -457,12 +470,6 @@ SUBDIRS(
 # Blender Application
 SUBDIRS(source/creator)
 
 # 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
 
 #-----------------------------------------------------------------------------
 # Blender Player