Browse Source

Adapt to "recent" (sic) Platform changes, update docs.

pull/7/head
Vladimír Vondruš 14 years ago
parent
commit
e0728baf03
  1. 2
      CMakeLists.txt
  2. 18
      doc/building.dox
  3. 2
      modules/FindMagnum.cmake

2
CMakeLists.txt

@ -8,7 +8,7 @@ option(TARGET_GLES "Build for OpenGL ES instead of desktop OpenGL" OFF)
cmake_dependent_option(TARGET_GLES2 "Build for OpenGL ES 2" ON "TARGET_GLES" OFF) cmake_dependent_option(TARGET_GLES2 "Build for OpenGL ES 2" ON "TARGET_GLES" OFF)
# Parts of the library # Parts of the library
option(WITH_EVERYTHING "Build everything (doesn't include contexts)" ON) option(WITH_EVERYTHING "Build everything (doesn't include *Application libraries)" ON)
cmake_dependent_option(WITH_MESHTOOLS "Build MeshTools library" OFF "NOT WITH_EVERYTHING;NOT WITH_PHYSICS" ON) cmake_dependent_option(WITH_MESHTOOLS "Build MeshTools library" OFF "NOT WITH_EVERYTHING;NOT WITH_PHYSICS" ON)
cmake_dependent_option(WITH_PHYSICS "Build Physics library" OFF "NOT WITH_EVERYTHING" ON) cmake_dependent_option(WITH_PHYSICS "Build Physics library" OFF "NOT WITH_EVERYTHING" ON)
cmake_dependent_option(WITH_PRIMITIVES "Builf Primitives library" OFF "NOT WITH_EVERYTHING;NOT WITH_PHYSICS" ON) cmake_dependent_option(WITH_PRIMITIVES "Builf Primitives library" OFF "NOT WITH_EVERYTHING;NOT WITH_PHYSICS" ON)

18
doc/building.dox

@ -63,25 +63,29 @@ By default the engine is built with everything except
@ref Platform "application libraries". Using `WITH_*` CMake parameters you can @ref Platform "application libraries". Using `WITH_*` CMake parameters you can
specify which parts will be built and which not: specify which parts will be built and which not:
- `WITH_EVERYTHING` - Defaults to `ON`, builds everything except window - `WITH_EVERYTHING` - Defaults to `ON`, builds everything except application
contexts. If set to `OFF`, only the main library is built and you can libraries. If set to `OFF`, only the main library is built and you can
select additional libraries with the following: select additional components with the following:
- `WITH_MESHTOOLS` - MeshTools library. - `WITH_MESHTOOLS` - MeshTools library.
- `WITH_PHYSICS` - Physics library. - `WITH_PHYSICS` - Physics library.
- `WITH_PRIMITIVES` - Primitives library. - `WITH_PRIMITIVES` - Primitives library.
- `WITH_SCENEGRAPH` - SceneGraph library. - `WITH_SCENEGRAPH` - SceneGraph library.
- `WITH_SHADERS` - Shaders library. - `WITH_SHADERS` - Shaders library.
- `WITH_MAGNUMINFO` - `magnum-info` executable, provides information about
Magnum engine and OpenGL capabilities.
None of the application libraries is built by default, regardless to None of the application libraries is built by default, regardless to
`WITH_EVERYTHING` is enabled or not: `WITH_EVERYTHING` is enabled or not:
- `WITH_XEGLAPPLICATION` - X/EGL application, available only if targeting - `WITH_XEGLAPPLICATION` - XEglApplication, available only if targeting
OpenGL ES (see above). Requires **X11** and **EGL** libraries. OpenGL ES (see above). Requires **X11** and **EGL** libraries.
- `WITH_GLXAPPLICATION` - GLX application. Requires **X11** and **GLX** - `WITH_GLXAPPLICATION` - GlxApplication. Requires **X11** and **GLX**
libraries. libraries.
- `WITH_GLUTAPPLICATION` - GLUT application, available only if targeting - `WITH_WINDOWLESSGLXAPPLICATION` - Windowless GLX application. Requires
**X11** and **GLX** libraries.
- `WITH_GLUTAPPLICATION` - GlutApplication, available only if targeting
desktop OpenGL. Requires **GLUT** library. desktop OpenGL. Requires **GLUT** library.
- `WITH_SDL2APPLICATION` - SDL2 application. Requires **SDL2** library. - `WITH_SDL2APPLICATION` - Sdl2Application. Requires **SDL2** library.
@subsection building-tests Building and running unit tests @subsection building-tests Building and running unit tests

2
modules/FindMagnum.cmake

@ -155,7 +155,7 @@ foreach(component ${Magnum_FIND_COMPONENTS})
endif() endif()
endif() endif()
# GLX application dependencies # Windowless GLX application dependencies
if(${component} STREQUAL WindowlessGlxApplication) if(${component} STREQUAL WindowlessGlxApplication)
find_package(X11) find_package(X11)
if(X11_FOUND) if(X11_FOUND)

Loading…
Cancel
Save