ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

package: enable GlfwApplication in development and Jenkins CI packages.

pull/142/merge
Vladimír Vondruš 10 years ago
parent
5061d29926
commit
5f15ea74e9
11 changed files with 19 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      doc/building.dox
  2. 3
      package/archlinux/PKGBUILD
  3. 3
      package/archlinux/PKGBUILD-clang
  4. 3
      package/archlinux/PKGBUILD-clang-libc++
  5. 3
      package/archlinux/PKGBUILD-es2desktop
  6. 3
      package/archlinux/PKGBUILD-es3desktop
  7. 3
      package/archlinux/PKGBUILD-gcc47
  8. 3
      package/archlinux/PKGBUILD-release
  9. 1
      package/ci/jenkins-clang-analyzer.xml
  10. 1
      package/ci/jenkins-clang-sanitizer.xml
  11. 1
      package/ci/jenkins.xml

4
doc/building.dox
Unescape View File

@ -645,8 +645,8 @@ replace `localhost:8080` with your server name, replace `update-job` with
java -jar ~/jenkins-cli.jar -s http://localhost:8080 update-job Magnum-GLTests < package/ci/jenkins-gltests.xml java -jar ~/jenkins-cli.jar -s http://localhost:8080 update-job Magnum-GLTests < package/ci/jenkins-gltests.xml
Build is done using **Ninja** build system and everything possible is enabled, Build is done using **Ninja** build system and everything possible is enabled,
thus you need also **SDL2**, **GLUT** and **OpenAL** libraries. It expects thus you need also **SDL2**, **GLFW**, **GLUT** and **OpenAL** libraries. It
that **GCC** >= 4.9, 4.8, 4.7 and **Clang** are installed and there expects that **GCC** >= 4.9, 4.8, 4.7 and **Clang** are installed and there
are **OpenGL**, **OpenGL ES 2.0** and **OpenGL ES 3.0** librares as it tries to are **OpenGL**, **OpenGL ES 2.0** and **OpenGL ES 3.0** librares as it tries to
compile the library with every combination of them. You can add/remove the axes compile the library with every combination of them. You can add/remove the axes
in `axes/hudson.matrix.TextAxis` or via the web interface later. in `axes/hudson.matrix.TextAxis` or via the web interface later.

3
package/archlinux/PKGBUILD
Unescape View File

@ -6,7 +6,7 @@ pkgdesc="C++11/C++14 and OpenGL 2D/3D graphics engine"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://mosra.cz/blog/magnum.php" url="http://mosra.cz/blog/magnum.php"
license=('MIT') license=('MIT')
depends=('corrade' 'openal' 'freeglut' 'sdl2') depends=('corrade' 'openal' 'freeglut' 'sdl2' 'glfw')
makedepends=('cmake' 'ninja') makedepends=('cmake' 'ninja')
options=('!strip') options=('!strip')
provides=('magnum-git') provides=('magnum-git')
@ -25,6 +25,7 @@ build() {
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_AUDIO=ON \ -DWITH_AUDIO=ON \
-DWITH_GLFWAPPLICATION=ON \
-DWITH_GLUTAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \
-DWITH_GLXAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \

3
package/archlinux/PKGBUILD-clang
Unescape View File

@ -6,7 +6,7 @@ pkgdesc="C++11/C++14 and OpenGL 2D/3D graphics engine (built with clang)"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://mosra.cz/blog/magnum.php" url="http://mosra.cz/blog/magnum.php"
license=('MIT') license=('MIT')
depends=('corrade' 'openal' 'freeglut' 'sdl2') depends=('corrade' 'openal' 'freeglut' 'sdl2' 'glfw')
makedepends=('cmake' 'clang' 'ninja') makedepends=('cmake' 'clang' 'ninja')
options=('!strip') options=('!strip')
provides=('magnum-git') provides=('magnum-git')
@ -30,6 +30,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_AUDIO=ON \ -DWITH_AUDIO=ON \
-DWITH_GLUTAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \
-DWITH_GLFWAPPLICATION=ON \
-DWITH_GLXAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \
-DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_WINDOWLESSGLXAPPLICATION=ON \

3
package/archlinux/PKGBUILD-clang-libc++
Unescape View File

@ -6,7 +6,7 @@ pkgdesc="C++11/C++14 and OpenGL 2D/3D graphics engine (built with clang and libc
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://mosra.cz/blog/magnum.php" url="http://mosra.cz/blog/magnum.php"
license=('MIT') license=('MIT')
depends=('corrade' 'openal' 'freeglut' 'sdl2' 'libc++') depends=('corrade' 'openal' 'freeglut' 'sdl2' 'glfw' 'libc++')
makedepends=('cmake' 'clang' 'ninja') makedepends=('cmake' 'clang' 'ninja')
options=('!strip') options=('!strip')
provides=('magnum-git') provides=('magnum-git')
@ -31,6 +31,7 @@ build() {
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_AUDIO=ON \ -DWITH_AUDIO=ON \
-DWITH_GLFWAPPLICATION=ON \
-DWITH_GLUTAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \
-DWITH_GLXAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \

3
package/archlinux/PKGBUILD-es2desktop
Unescape View File

@ -6,7 +6,7 @@ pkgdesc="C++11/C++14 and OpenGL 2D/3D graphics engine (desktop OpenGL ES 2.0 ver
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://mosra.cz/blog/magnum.php" url="http://mosra.cz/blog/magnum.php"
license=('MIT') license=('MIT')
depends=('corrade' 'openal') depends=('corrade' 'openal' 'sdl2' 'glfw')
makedepends=('cmake' 'ninja') makedepends=('cmake' 'ninja')
options=('!strip') options=('!strip')
provides=('magnum-git') provides=('magnum-git')
@ -24,6 +24,7 @@ build() {
-DTARGET_GLES2=ON \ -DTARGET_GLES2=ON \
-DTARGET_DESKTOP_GLES=ON \ -DTARGET_DESKTOP_GLES=ON \
-DWITH_AUDIO=ON \ -DWITH_AUDIO=ON \
-DWITH_GLFWAPPLICATION=ON \
-DWITH_GLXAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \
-DWITH_XEGLAPPLICATION=ON \ -DWITH_XEGLAPPLICATION=ON \

3
package/archlinux/PKGBUILD-es3desktop
Unescape View File

@ -6,7 +6,7 @@ pkgdesc="C++11/C++14 and OpenGL 2D/3D graphics engine (desktop OpenGL ES 3.0 ver
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://mosra.cz/blog/magnum.php" url="http://mosra.cz/blog/magnum.php"
license=('MIT') license=('MIT')
depends=('corrade' 'openal') depends=('corrade' 'openal' 'sdl2' 'glfw')
makedepends=('cmake' 'ninja') makedepends=('cmake' 'ninja')
options=('!strip') options=('!strip')
provides=('magnum-git') provides=('magnum-git')
@ -24,6 +24,7 @@ build() {
-DTARGET_GLES2=OFF \ -DTARGET_GLES2=OFF \
-DTARGET_DESKTOP_GLES=ON \ -DTARGET_DESKTOP_GLES=ON \
-DWITH_AUDIO=ON \ -DWITH_AUDIO=ON \
-DWITH_GLFWAPPLICATION=ON \
-DWITH_GLXAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \
-DWITH_XEGLAPPLICATION=ON \ -DWITH_XEGLAPPLICATION=ON \

3
package/archlinux/PKGBUILD-gcc47
Unescape View File

@ -6,7 +6,7 @@ pkgdesc="C++11/C++14 and OpenGL 2D/3D graphics engine (built with GCC 4.7)"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://mosra.cz/blog/magnum.php" url="http://mosra.cz/blog/magnum.php"
license=('MIT') license=('MIT')
depends=('corrade' 'openal' 'freeglut' 'sdl2') depends=('corrade' 'openal' 'freeglut' 'sdl2' 'glfw')
makedepends=('cmake' 'ninja' 'gcc47') makedepends=('cmake' 'ninja' 'gcc47')
options=('!strip') options=('!strip')
provides=('magnum-git') provides=('magnum-git')
@ -33,6 +33,7 @@ build() {
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_AUDIO=ON \ -DWITH_AUDIO=ON \
-DWITH_GLFWAPPLICATION=ON \
-DWITH_GLUTAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \
-DWITH_GLXAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \

3
package/archlinux/PKGBUILD-release
Unescape View File

@ -6,7 +6,7 @@ pkgdesc="C++11/C++14 and OpenGL 2D/3D graphics engine (debug+release libs)"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://mosra.cz/blog/magnum.php" url="http://mosra.cz/blog/magnum.php"
license=('MIT') license=('MIT')
depends=('corrade' 'openal' 'sdl2' 'freeglut') depends=('corrade' 'openal' 'freeglut' 'sdl2' 'glfw')
makedepends=('cmake' 'ninja') makedepends=('cmake' 'ninja')
options=('!strip') options=('!strip')
provides=('magnum-git') provides=('magnum-git')
@ -21,6 +21,7 @@ build() {
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_AUDIO=ON \ -DWITH_AUDIO=ON \
-DWITH_GLFWAPPLICATION=ON \
-DWITH_GLUTAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \
-DWITH_GLXAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \

1
package/ci/jenkins-clang-analyzer.xml
Unescape View File

@ -108,6 +108,7 @@ scan-build --use-c++=$(which clang++) cmake .. \
-DBUILD_DEPRECATED=${deprecated_build_flag} \ -DBUILD_DEPRECATED=${deprecated_build_flag} \
${gl_flags} \ ${gl_flags} \
-DWITH_AUDIO=ON \ -DWITH_AUDIO=ON \
-DWITH_GLFWAPPLICATION=ON \
-DWITH_GLUTAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \
-DWITH_GLXAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \

1
package/ci/jenkins-clang-sanitizer.xml
Unescape View File

@ -116,6 +116,7 @@ cmake .. \
-DBUILD_DEPRECATED=${deprecated_build_flag} \ -DBUILD_DEPRECATED=${deprecated_build_flag} \
${gl_flags} \ ${gl_flags} \
-DWITH_AUDIO=ON \ -DWITH_AUDIO=ON \
-DWITH_GLFWAPPLICATION=ON \
-DWITH_GLUTAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \
-DWITH_GLXAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \

1
package/ci/jenkins.xml
Unescape View File

@ -141,6 +141,7 @@ cmake .. \
${static_build_flag} \ ${static_build_flag} \
${gl_flags} \ ${gl_flags} \
-DWITH_AUDIO=ON \ -DWITH_AUDIO=ON \
-DWITH_GLFWAPPLICATION=ON \
-DWITH_GLUTAPPLICATION=ON \ -DWITH_GLUTAPPLICATION=ON \
-DWITH_GLXAPPLICATION=ON \ -DWITH_GLXAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \

Write Preview
Loading…
Cancel
Save