Merge branch 'master' into compatibility

13 years ago · 35f01224a9
2 changed files with 0 additions and 8 deletions
--- a/4
+++ b/4
@ -20,8 +20,6 @@ build() {
        -DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/NaCl-glibc-x86-32.cmake" \
        -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_INSTALL_PREFIX=/usr/nacl \
-        -DWITH_TEXT=OFF \
-        -DWITH_TEXTURETOOLS=OFF \
        -DWITH_MAGNUMINFO=OFF \
        -DWITH_NACLAPPLICATION=ON \
        -DLIB_SUFFIX=/32
@ -36,8 +34,6 @@ build() {
        -DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/NaCl-glibc-x86-64.cmake" \
        -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_INSTALL_PREFIX=/usr/nacl \
-        -DWITH_TEXT=OFF \
-        -DWITH_TEXTURETOOLS=OFF \
        -DWITH_MAGNUMINFO=OFF \
        -DWITH_NACLAPPLICATION=ON
    make
--- a/4
+++ b/4
@ -20,8 +20,6 @@ build() {
        -DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/NaCl-newlib-x86-32.cmake" \
        -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_INSTALL_PREFIX=/usr/nacl \
-        -DWITH_TEXT=OFF \
-        -DWITH_TEXTURETOOLS=OFF \
        -DWITH_MAGNUMINFO=OFF \
        -DWITH_NACLAPPLICATION=ON \
        -DBUILD_STATIC=ON \
@ -37,8 +35,6 @@ build() {
        -DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/NaCl-newlib-x86-64.cmake" \
        -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_INSTALL_PREFIX=/usr/nacl \
-        -DWITH_TEXT=OFF \
-        -DWITH_TEXTURETOOLS=OFF \
        -DWITH_MAGNUMINFO=OFF \
        -DWITH_NACLAPPLICATION=ON \
        -DBUILD_STATIC=ON