diff --git a/.travis.yml b/.travis.yml index fb32fe89f5..9e335576a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,13 +50,12 @@ before_script: - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi 3rdparty/Optional Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers - mkdir build ; cd build - export CMAKE_PREFIX_PATH=~/Qt/${QTVER}/gcc_64/lib/cmake - - export CXXFLAGS="$CXXFLAGS -DTRAVIS=true"; - if [ "$TRAVIS_PULL_REQUEST" = false ]; then export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH"; else export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/#$TRAVIS_PULL_REQUEST"; fi; - - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -G Ninja; + - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja; script: - ninja diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index e1e8957b38..65699a58cc 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -108,7 +108,7 @@ if(NOT MSVC) add_compile_options(-msse -msse2 -mcx16 -mrtm) - if(NOT DEFINED ENV{TRAVIS} AND USE_NATIVE_INSTRUCTIONS) + if(USE_NATIVE_INSTRUCTIONS) add_compile_options(-march=native) endif()