Travis: Re-enable linux builds

2015-01-16 00:04:09 +01:00
parent 85d7843c98
commit b5019e53d1
1 changed files with 5 additions and 6 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,10 @@
 language: cpp
 compiler: gcc
-os: osx
-#matrix:
-#    include:
-#        - env: TARGET_OS=win32
-#        - env: TARGET_OS=win64
-#        - os: osx
+matrix:
+    include:
+        - env: TARGET_OS=win32
+        - env: TARGET_OS=win64
+        - os: osx
 before_install:
    - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh
 install: