Merge branch 'nabijaczleweli-travis-ci-support' into develop

.travis.yml

@@ -0,0 +1,51 @@
+sudo: false
+language: generic
+
+cache:
+  apt: true
+  directories:
+    - /tmp/tools
+
+matrix:
+  include:
+    - env: CXX=g++-5 CC=gcc-5
+      addons:
+        apt:
+          packages:
+            - g++-5
+            - libjpeg8-dev
+            - libasound2-dev
+            - alsa-utils
+            - alsa-oss
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise
+            - llvm-toolchain-precise-3.7
+            - llvm-toolchain-precise-3.6
+    - env: CXX=g++-4.9 CC=gcc-4.9
+      addons:
+        apt:
+          packages:
+            - g++-4.9
+            - libjpeg8-dev
+            - libasound2-dev
+            - alsa-utils
+            - alsa-oss
+          sources: *sources
+
+before_install:
+  - export PATH="$HOME/bin:$PATH"
+  - mkdir ~/bin
+  - wget --no-check-certificate --no-clobber -O /tmp/tools/cmake https://cmake.org/files/v3.4/cmake-3.4.0-rc3-Linux-x86_64.sh || true
+  - chmod -R +x /tmp/tools
+
+install:
+  - /tmp/tools/cmake --prefix="$HOME" --exclude-subdir
+
+before_script :
+  - mkdir bld
+  - cd bld
+
+script:
+  - cmake -G"Unix Makefiles" .. -DENABLE_JPEG=ON
+  - make

README.md

@@ -1,13 +1,11 @@
-# Nana C++ Library
+# Nana C++ Library [![BiiCode build status](https://webapi.biicode.com/v1/badges/qiangwu/qiangwu/nana/master)](https://www.biicode.com/qiangwu/nana) [![TravisCI build status](https://travis-ci.org/cnjinhao/nana.svg)](https://travis-ci.org/cnjinhao/nana) [![Licence](https://img.shields.io/badge/license-BSL-blue.svg?style=flat)](LICENSE_1_0.txt)
-[![Build Status](https://webapi.biicode.com/v1/badges/qiangwu/qiangwu/nana/master)](https://www.biicode.com/qiangwu/nana) 
+
 
 Nana is a C++ library designed to allow developers to easily create cross-platform GUI applications with modern C++11 style, currently it can work on Linux(X11) and Windows. The nana repository contains the entire source of library, you can browse the source code and submit your pull request for contributing.
 
 ## License
 
-Nana is licensed under the [Boost Software License].
+Nana is licensed under the [Boost Software License](http://www.boost.org/LICENSE_1_0.txt)
-
-[Boost Software License]: http://www.boost.org/LICENSE_1_0.txt
 
 ## Biicode
 Nana is available in biicode, download biicode and try the nana example: