From 3665a82418b5e807b94d3ebc0494345dd33ded64 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sat, 31 Oct 2020 17:06:25 +0100
Subject: Merge pull request #792 from withmorten/master

fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...
# Conflicts:
#	src/core/Frontend.cpp
---
 src/rw/RwHelper.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/rw/RwHelper.cpp')

diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index 503027af..4c4fc434 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -6,8 +6,10 @@
 #include "Timecycle.h"
 #include "skeleton.h"
 #include "Debug.h"
-#ifndef FINAL
+#if !defined(FINAL) || defined(DEBUGMENU)
 #include "rtcharse.h"
+#endif
+#ifndef FINAL
 RtCharset *debugCharset;
 #endif
 
@@ -18,7 +20,7 @@ bool gPS2alphaTest = false;
 #endif
 bool gBackfaceCulling;
 
-#ifndef FINAL
+#if !defined(FINAL) || defined(DEBUGMENU)
 static bool charsetOpen;
 void OpenCharsetSafe()
 {
-- 
cgit v1.2.3