Skip to content

Commit dbc6535

Browse files
committed
Merge branch 'master' of github.com:cginternals/glbinding
2 parents f4971aa + 0d1b739 commit dbc6535

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ Building *glbinding* from source has several mandatory and optional dependencies
129129
* [CMake](https://cmake.org/) 3.0 or higher for building *glbinding* from source (mandatory for any build from source)
130130
* [git](https://git-scm.com/) for version control and script supporting tasks
131131
* [GLFW](http://www.glfw.org/) 3.2 or higher for examples and tools
132-
* [GLEW](http://glew.sourceforge.net/) 1.6 or higher for the comparison example
133-
* [cpplocate](https://github.com/cginternals/cpplocate) for the examples
134-
* [Qt5](http://www.qt.io/developers/) 5.0 or higher for the qt-based example
132+
* [GLEW](http://glew.sourceforge.net/) 1.6 or higher for the comparison example (optional)
133+
* [cpplocate](https://github.com/cginternals/cpplocate) for the examples (optional)
134+
* [Qt5](http://www.qt.io/developers/) 5.0 or higher for the qt-based example (optional)
135135
* [Doxygen](http://www.stack.nl/~dimitri/doxygen/) 1.8 or higher for generating the documentation on your system
136136
* [graphviz](http://www.graphviz.org/) for generating diagrams (optional)
137137

deploy/ubuntu-ppa/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: libglbinding
22
Section: misc
33
Priority: optional
44
Maintainer: Willy Scheibel <willy.scheibel@cginternals.com>
5-
Build-Depends: build-essential, cmake, libgl1-mesa-dev, libglfw3-dev, libcpplocate-dev, libcpplocate-dbg, qtbase5-dev, doxygen, graphviz
5+
Build-Depends: build-essential, cmake, libgl1-mesa-dev, libglfw3-dev, libcpplocate-dev, libcpplocate-dbg, qtbase5-dev, doxygen, graphviz, libx11-dev, libxrandr-dev, libxinerama-dev, libxcursor-dev
66
Standards-Version: 3.8.0
77

88
Package: libglbinding

source/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ endif()
4444
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_NAME} DESTINATION include COMPONENT dev)
4545

4646

47-
include("${CMAKE_SOURCE_DIR}/cmake/WinInstallHacks.cmake")
47+
include(${PROJECT_SOURCE_DIR}/cmake/WinInstallHacks.cmake)

source/glbinding/include/glbinding/glbinding.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44

55
#include <set>
6+
#include <string>
67
#include <vector>
78
#include <functional>
89

0 commit comments

Comments
 (0)