mirror of
https://github.com/RPCS3/rpcs3.git
synced 2024-12-28 00:18:23 +00:00
Travis: remove LLVM for now
This commit is contained in:
parent
4c7afb6952
commit
7cb4672344
@ -47,7 +47,7 @@ install:
|
||||
fi;
|
||||
|
||||
before_script:
|
||||
- git submodule update --init llvm asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi 3rdparty/Optional Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
|
||||
- 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
|
||||
- if [ "$TRAVIS_PULL_REQUEST" = false ]; then
|
||||
@ -55,10 +55,10 @@ before_script:
|
||||
else
|
||||
export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/#$TRAVIS_PULL_REQUEST";
|
||||
fi;
|
||||
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja;
|
||||
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DUSE_NATIVE_INSTRUCTIONS=OFF -DWITHOUT_LLVM=ON -G Ninja;
|
||||
|
||||
script:
|
||||
- ninja
|
||||
- ninja -j 2
|
||||
|
||||
after_script:
|
||||
- cd build
|
||||
|
@ -820,6 +820,8 @@ std::vector<u32> spu_recompiler_base::block(const be_t<u32>* ls, u32 lsa)
|
||||
return result;
|
||||
}
|
||||
|
||||
#ifdef LLVM_AVAILABLE
|
||||
|
||||
#include "Emu/CPU/CPUTranslator.h"
|
||||
#include "llvm/ADT/Triple.h"
|
||||
#include "llvm/IR/LegacyPassManager.h"
|
||||
@ -3118,3 +3120,12 @@ std::unique_ptr<spu_recompiler_base> spu_recompiler_base::make_llvm_recompiler()
|
||||
}
|
||||
|
||||
DECLARE(spu_llvm_recompiler::g_decoder);
|
||||
|
||||
#else
|
||||
|
||||
std::unique_ptr<spu_recompiler_base> spu_recompiler_base::make_llvm_recompiler()
|
||||
{
|
||||
fmt::throw_exception("LLVM is not available in this build.");
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user