From f06b0261d81bba2eb3fb88ca31bd0e2323e464bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henri=20Hyyryl=C3=A4inen?= Date: Fri, 15 Mar 2019 12:54:25 +0200 Subject: [PATCH] Updated engine --- CMakeLists.txt | 16 ++++++++-------- SetupThrive.rb | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 63f096672fd..177f0fe5929 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,14 +55,14 @@ set(LEVIATHAN_SKIP_OPTIONAL_ASSETS ON) include(LeviathanCompileOptions) include(LeviathanSetRPath) -set(LEVIATHAN_FULL_BUILD ON) - -set(USE_ANGELSCRIPT ON) -set(USE_BOOST ON) -set(USE_OGRE ON) -set(USE_NEWTON ON) -set(USE_SFML ON) -set(USE_SDL2 ON) +set(LEVIATHAN_USING_ANGELSCRIPT ON) +set(LEVIATHAN_USING_OGRE ON) +set(LEVIATHAN_USING_BULLET ON) +set(LEVIATHAN_USING_CEF ON) +set(LEVIATHAN_USING_GUI ON) +set(LEVIATHAN_USING_SFML ON) +set(LEVIATHAN_USING_SDL2 ON) +set(LEVIATHAN_USING_LEAP ON) include(LeviathanFindLibraries) diff --git a/SetupThrive.rb b/SetupThrive.rb index b2500ebcb52..97fe50d08ed 100755 --- a/SetupThrive.rb +++ b/SetupThrive.rb @@ -78,7 +78,7 @@ def parseExtraArgs leviathan = Leviathan.new( # Use this if you always want the latest commit # version: "develop", - version: "0d08da11c7d15bb5710427634371b62eccf7867d", + version: "109ae9e19a05967c9160bf5dbaeb69c9373cf1b1", # Doesn't actually work, but leviathan doesn't install with sudo by # default, or install at all for that matter noInstallSudo: true