From dc955079ab4317a26afe164ed45240e6b9498410 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 17 Aug 2021 13:04:48 +0100
Subject: [PATCH] Fix RELEASE define on linux

* This fixes some debug text appearing in the resource inspector, and lets linux
  users submit manual bug reports from release builds.
---
 CMakeLists.txt                        | 2 +-
 qrenderdoc/CMakeLists.txt             | 9 +++++----
 renderdoc/os/win32/win32_libentry.cpp | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e4d8cb4c..8f2b4e496 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -323,7 +323,7 @@ set(RELEASE_MODE 0)
 if(cmake_build_type_lower STREQUAL "release" OR
    cmake_build_type_lower STREQUAL "relwithdebinfo" OR
    cmake_build_type_lower STREQUAL "minsizerel")
-    add_definitions(-D_RELEASE)
+    add_definitions(-DRELEASE)
     message(STATUS "Building RenderDoc in Release mode: ${CMAKE_BUILD_TYPE}")
     set(RELEASE_MODE 1)
 endif()
diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
index aa3cb833e..5f79d4c4d 100644
--- a/qrenderdoc/CMakeLists.txt
+++ b/qrenderdoc/CMakeLists.txt
@@ -39,10 +39,6 @@ set(QMAKE_CXXFLAGS "")
 set(QMAKE_RPATHDIR "")
 set(SWIG_FLAGS "")
 
-if(RELEASE_MODE)
-    set(QMAKE_CONFIG "release")
-endif()
-
 if(ENABLE_ASAN)
     set (QMAKE_CXXFLAGS "-fsanitize=address -fno-omit-frame-pointer")
     set (QMAKE_LDFLAGS "-fsanitize=address")
@@ -67,6 +63,11 @@ if(NOT APPLE)
     endif()
 endif()
 
+if(RELEASE_MODE)
+    set(QMAKE_CONFIG "release")
+    set(QMAKE_CXXFLAGS "-DRELEASE=1 ${QMAKE_CXXFLAGS}")
+endif()
+
 if(QRENDERDOC_NO_CXX11_REGEX)
     set(QMAKE_CXXFLAGS "-DNO_CXX11_REGEX=1 ${QMAKE_CXXFLAGS}")
 endif()
diff --git a/renderdoc/os/win32/win32_libentry.cpp b/renderdoc/os/win32/win32_libentry.cpp
index b8790db13..2d2919d3d 100644
--- a/renderdoc/os/win32/win32_libentry.cpp
+++ b/renderdoc/os/win32/win32_libentry.cpp
@@ -42,7 +42,7 @@ static BOOL add_hooks()
   // this instance is being used for a shell extension.
   if(f == "dllhost.exe" || f == "explorer.exe")
   {
-#ifndef _RELEASE
+#if ENABLED(RDOC_RELEASE)
     OutputDebugStringA(
         "Detecting shell process! Disabling hooking in dllhost.exe or explorer.exe\n");
 #endif