From f4a2188e4221fddd06f8762c41119c6837231eac Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 31 Aug 2015 11:25:44 -0400
Subject: [PATCH] Travis: Build DFHack

---
 .travis.yml                     | 9 +++++++++
 depends/protobuf/CMakeLists.txt | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4cc007bcc..73ce05869 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,24 @@ sudo: false
 addons:
   apt:
     packages:
+    - gcc-multilib
+    - g++-multilib
     - lua5.2
+    - libxml-libxml-perl
+    - libxml-libxslt-perl
+    - zlib1g-dev:i386
 language: cpp
 before_install:
   pip install --user sphinx
 script:
+- git tag tmp-travis-build
 - python travis/pr-check-base.py
 - python travis/lint.py
 - python travis/script-in-readme.py
 - python travis/script-syntax.py --ext=lua --cmd="luac5.2 -p"
 - python travis/script-syntax.py --ext=rb --cmd="ruby -c"
+- mkdir build-travis
+- cd build-travis
+- cmake .. && make -j2
 notifications:
   email: false
diff --git a/depends/protobuf/CMakeLists.txt b/depends/protobuf/CMakeLists.txt
index 15b940977..ffad350ed 100644
--- a/depends/protobuf/CMakeLists.txt
+++ b/depends/protobuf/CMakeLists.txt
@@ -12,7 +12,7 @@ IF(CMAKE_COMPILER_IS_GNUCC)
     #    SET(STL_HASH_OLD_GCC 1)
     #ENDIF()
 
-    SET(CMAKE_CXX_FLAGS "-std=c++0x")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
     SET(HAVE_HASH_MAP 0)
     SET(HASH_MAP_CLASS unordered_map)