shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #136 from ethanhugg/travis.32bit

Travis.32bit

--- a/.travis.yml

+++ b/.travis.yml

@@ -1,14 +1,15 @@

 language: cpp

 compiler:

+  - g++

   - clang

 branches:

   except:

     - gh-pages

 before_install:

- - sudo apt-get update -qq

- - sudo apt-get install -qq nasm g++-4.6-multilib gcc-multilib libc6-dev-i386 lib32z1-dev

+  - sudo apt-get update -qq

+  - sudo apt-get install -qq nasm g++-4.6-multilib gcc-multilib libc6-dev-i386 lib32z1-dev libssl1.0.0:i386

+#link libcrypto for 32bit

+  - sudo ln -s /lib/i386-linux-gnu/libcrypto.so.1.0.0 /lib/i386-linux-gnu/libcrypto.so

 install: make gtest-bootstrap

-# libssl is not multiarch so we are building 64bit

-# and then installing the 32bit version

-script: make -B ENABLE64BIT=Yes && make test && make -B ENABLE64BIT=Yes BUILDTYPE=Release && make test && sudo apt-get install -qq libssl-dev:i386 && make -B && make test && make -B BUILDTYPE=Release && make test

+script: make -B ENABLE64BIT=Yes && make test && make -B ENABLE64BIT=Yes BUILDTYPE=Release && make test && make -B && make test && make -B BUILDTYPE=Release && make test