diff --git a/.travis.yml b/.travis.yml
index 1a502416..56ba5537 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,10 @@
 os:
   - linux
+  - osx
+
+matrix:
+  allow_failures:
+    - os: osx
 
 language: cpp
 
@@ -10,14 +15,15 @@ compiler:
 before_script:
   - date -u
   - uname -a
-  - lsb_release -a
-  - ln -s tools/scons.travis.cfg scons.cfg
-  - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse"
-  - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse"
-  - sudo apt-add-repository "deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse"
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq gcc g++ scons swig swig2.0
-  - sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev doxygen
+  - env | sort
+  
+  - chmod +x tools/CI/travis.linux.install.deps.sh
+  - chmod +x tools/CI/travis.osx.install.deps.sh
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/CI/travis.linux.install.deps.sh; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then tools/CI/travis.osx.install.deps.sh; fi
+  
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ln -s tools/scons.travis.linux.cfg scons.cfg; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ln -s tools/scons.travis.osx.cfg scons.cfg; fi
 
 script:
   - scons
diff --git a/SConstruct b/SConstruct
index f3ffbb90..09f0f08a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -65,7 +65,7 @@ env.Append(
     LIBPATH = [
         libavLibDir,
         "#src",
-        "#build/src"
+        "#build/"+mymode+"/src"
     ],
 )
 
diff --git a/tools/CI/travis.linux.install.deps.sh b/tools/CI/travis.linux.install.deps.sh
new file mode 100644
index 00000000..53747698
--- /dev/null
+++ b/tools/CI/travis.linux.install.deps.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+lsb_release -a
+
+sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse"
+sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse"
+sudo apt-add-repository "deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse"
+sudo apt-get update -qq
+sudo apt-get install -qq gcc g++ scons swig swig2.0
+sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev doxygen
diff --git a/tools/CI/travis.osx.install.deps.sh b/tools/CI/travis.osx.install.deps.sh
new file mode 100644
index 00000000..8c317c3f
--- /dev/null
+++ b/tools/CI/travis.osx.install.deps.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+brew update
+
+brew install gcc scons swig
+brew install ffmpeg freeglut doxygen
diff --git a/tools/scons.travis.cfg b/tools/scons.travis.linux.cfg
similarity index 100%
rename from tools/scons.travis.cfg
rename to tools/scons.travis.linux.cfg
diff --git a/tools/scons.travis.osx.cfg b/tools/scons.travis.osx.cfg
new file mode 100644
index 00000000..5b126f7f
--- /dev/null
+++ b/tools/scons.travis.osx.cfg
@@ -0,0 +1,11 @@
+[COMMON]
+
+[PYTHON]
+inc=/usr/include/python2.7/
+
+[JAVA]
+inc=/usr/lib/jvm/java-7-openjdk-amd64/include;/usr/lib/jvm/java-7-openjdk-amd64/include/linux/
+
+[LIBAV]
+inc=/usr/local/Cellar/ffmpeg/2.3.2/include/
+libdir=/usr/local/Cellar/ffmpeg/2.3.2/lib/