diff --git a/.travis/build-mac.bash b/.travis/build-mac.bash
index ced36667d0..62fd3800e3 100644
--- a/.travis/build-mac.bash
+++ b/.travis/build-mac.bash
@@ -23,5 +23,5 @@ export VULKAN_SDK=${PWD}/vulkan-sdk
 git submodule update --quiet --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng 3rdparty/cereal 3rdparty/hidapi 3rdparty/xxHash 3rdparty/yaml-cpp Vulkan/glslang
 
 mkdir build; cd build
-cmake .. -DWITHOUT_LLVM=On -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja
+cmake .. -DWITH_LLVM=OFF -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja
 ninja
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index f7d08c07a5..c91c18f7bb 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -152,7 +152,7 @@ target_include_directories(3rdparty_stblib INTERFACE stblib)
 add_library(3rdparty_discord-rpc INTERFACE)
 
 # We don't want Discord Rich Presence on the BSDs and other OSes
-if (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE)
+if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE))
 	if (WIN32 AND NOT MSVC)
 		ExternalProject_Add(discord-rpc
 				GIT_REPOSITORY https://github.com/discordapp/discord-rpc
diff --git a/3rdparty/llvm.cmake b/3rdparty/llvm.cmake
index 11eb2d2c79..320b07f27c 100644
--- a/3rdparty/llvm.cmake
+++ b/3rdparty/llvm.cmake
@@ -1,4 +1,4 @@
-if(NOT WITHOUT_LLVM)
+if(WITH_LLVM)
 	if(BUILD_LLVM_SUBMODULE)
 		message(STATUS "LLVM will be built from the submodule.")
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 603cb63602..37ba0da32d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,8 @@ option(USE_ALSA "ALSA audio backend" ON)
 option(USE_PULSE "PulseAudio audio backend" ON)
 option(USE_LIBEVDEV "libevdev-based joystick support" ON)
 
+option(USE_DISCORD_RPC "Discord rich presence integration" ON)
+
 option(USE_SYSTEM_ZLIB "Prefer system ZLIB instead of the builtin one" ON)
 
 option(USE_VULKAN "Vulkan render backend" ON)