Browse Source

Fix travis

Panagiotis Christopoulos Charitos 6 years ago
parent
commit
702cfde28a
2 changed files with 13 additions and 12 deletions
  1. 12 12
      .travis.yml
  2. 1 0
      src/anki/Config.h.cmake

+ 12 - 12
.travis.yml

@@ -20,18 +20,6 @@ addons:
 
 matrix:
   include:
-    - os: linux
-      dist: xenial
-      compiler: gcc
-      env:
-        - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
-        - GENERATOR="Unix Makefiles" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF
-    - os: linux
-      dist: xenial
-      compiler: clang
-      env:
-        - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
-        - GENERATOR="Unix Makefiles" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF
     - os: windows
       before_install:
         - choco install python3
@@ -42,6 +30,18 @@ matrix:
       env:
         - GENERATOR="Visual Studio 15 2017 Win64" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
         - GENERATOR="Visual Studio 15 2017 Win64" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF
+#    - os: linux
+#      dist: xenial
+#      compiler: gcc
+#      env:
+#        - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
+#        - GENERATOR="Unix Makefiles" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF
+#    - os: linux
+#      dist: xenial
+#      compiler: clang
+#      env:
+#        - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
+#        - GENERATOR="Unix Makefiles" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF
 
 script:
   - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then PYTHON3=$(which python); fi

+ 1 - 0
src/anki/Config.h.cmake

@@ -181,6 +181,7 @@
 #ifdef _MSC_VER
 #	include <intrin.h>
 #	define __builtin_popcount __popcnt
+#	define __builtin_clzll(x) ((int)__lzcnt64(x))
 #endif
 
 #ifdef ANKI_BUILD