Browse Source

Merge branch 'master' into compatibility

Vladimír Vondruš 12 years ago
parent
commit
2256796137
  1. 10
      doc/building.dox
  2. 2
      src/Magnum/Implementation/TextureState.cpp

10
doc/building.dox

@ -89,9 +89,9 @@ subdir (e.g. `C:/Sys/bin`) to PATH so all the DLLs are found when running the
executables. If you are using MinGW, the `C:/MinGW` directory is in most cases
already prepared for exactly this.
When running CMake, set `CMAKE_FIND_ROOT_PATH` and `CMAKE_INSTALL_PREFIX`
parameters to that directory so CMake knows where to look for installed
libraries and where to install new ones.
When running CMake, set `CMAKE_INSTALL_PREFIX` parameter to that directory so
CMake knows where to look for installed libraries and where to install new
ones.
@subsubsection building-windows-msvc Using Visual Studio
@ -104,9 +104,9 @@ Studio to load:
mkdir build
cd build
cmake -DCMAKE_FIND_ROOT_PATH="C:/Sys" -DCMAKE_INSTALL_PREFIX="C:/Sys" ..
cmake -DCMAKE_INSTALL_PREFIX="C:/Sys" ..
cmake --build .
cmake --build --target install .
cmake --build . --target install
If you want to build and install from Visual Studio, just open the `Magnum.sln`
project file generated by CMake in the build directory.

2
src/Magnum/Implementation/TextureState.cpp

@ -25,6 +25,8 @@
#include "TextureState.h"
#include <Corrade/Utility/Assert.h>
#include "Magnum/AbstractTexture.h"
#ifndef MAGNUM_TARGET_GLES
#include "Magnum/BufferTexture.h"

Loading…
Cancel
Save