diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4904f816c..ebb737df3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,9 +120,18 @@ endif()
 
 add_subdirectory(3rdparty EXCLUDE_FROM_ALL)
 add_subdirectory(rx EXCLUDE_FROM_ALL)
+
+if (NOT RX_TAG)
+    set(RX_TAG 0)
+endif()
+
+if (NOT RX_TAG_VERSION)
+    set(RX_TAG_VERSION 0)
+endif()
+
 target_compile_definitions(rx PRIVATE
-    RX_TAG=0
-    RX_TAG_VERSION=0
+    RX_TAG=${RX_TAG}
+    RX_TAG_VERSION=${RX_TAG_VERSION}
 )
 
 if (WITH_RPCSX)
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
index be581d110..608322990 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
@@ -100,7 +100,7 @@ namespace rsx
 			add_element(text_stack);
 		}
 
-		void save_dialog::save_dialog_entry::set_selected(bool selected)
+		void save_dialog::save_dialog_entry::set_selected([[maybe_unused]] bool selected)
 		{
 #ifndef ANDROID
 			if (m_image)