aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsigman <sigman@ioupg.com>2017-06-09 15:09:05 +0300
committersigman <sigman@ioupg.com>2017-06-09 15:09:05 +0300
commit741caef3fb352f6fbd5d4d59592f0c2629892064 (patch)
tree6b61f2ef7241a00381fdc27694d0cb0d788b9c4a
parentf0605ca60a560ab1358177beec58a53068128753 (diff)
downloadvcpkg-741caef3fb352f6fbd5d4d59592f0c2629892064.tar.gz
vcpkg-741caef3fb352f6fbd5d4d59592f0c2629892064.zip
[Magnum][Corrade] Cleanup and Audio support
Enabled audio support in magnum by default via openal-soft dependency.
-rw-r--r--ports/corrade/portfile.cmake3
-rw-r--r--ports/magnum/CONTROL2
-rw-r--r--ports/magnum/portfile.cmake5
3 files changed, 3 insertions, 7 deletions
diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake
index 2f5578b43..76979496b 100644
--- a/ports/corrade/portfile.cmake
+++ b/ports/corrade/portfile.cmake
@@ -23,9 +23,6 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS -DBUILD_STATIC=${BUILD_STATIC}
- # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
- # OPTIONS_RELEASE -DOPTIMIZE=1
- # OPTIONS_DEBUG -DDEBUGGABLE=1
)
vcpkg_install_cmake()
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index d07dd3160..f934ba0a6 100644
--- a/ports/magnum/CONTROL
+++ b/ports/magnum/CONTROL
@@ -1,4 +1,4 @@
Source: magnum
Version: jun2017
-Build-Depends: corrade, sdl2
+Build-Depends: corrade, sdl2, openal-soft
Description: C++11/C++14 and OpenGL graphics engine http://mosra.cz/blog/magnum.php
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
index 71517c15c..dd934b31d 100644
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@@ -21,10 +21,9 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS -DWITH_SDL2APPLICATION=ON
+ OPTIONS -DWITH_AUDIO=ON
+ OPTIONS -DWITH_WAVAUDIOIMPORTER=ON
OPTIONS -DBUILD_STATIC=${BUILD_STATIC}
- # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
- # OPTIONS_RELEASE -DOPTIMIZE=1
- # OPTIONS_DEBUG -DDEBUGGABLE=1
)
vcpkg_install_cmake()