From 9b4b1361215c8f41bfa843dc4dfda0ec0404bcff Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 15 Jun 2021 19:06:49 -0700
Subject: [PATCH] Move Config.h to ConfigDefines.h

We already have a Config.h which conflicts with this file.
In issue cropped up if you need to include Config.h (the generated one)
from inside Common/ then it would only pull the Common/Config.h file.

Just change the name to not be confusing
---
 CMakeLists.txt           | 2 +-
 Source/Tests/FEXBash.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fefbc5f8..3ccd9fee0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,7 +252,7 @@ add_compile_options(-Wall)
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/include/Config.h.in
-  ${CMAKE_BINARY_DIR}/generated/Config.h)
+  ${CMAKE_BINARY_DIR}/generated/ConfigDefines.h)
 
 if (BUILD_TESTS)
   include(CTest)
diff --git a/Source/Tests/FEXBash.cpp b/Source/Tests/FEXBash.cpp
index 39a8f531c..1189794ae 100644
--- a/Source/Tests/FEXBash.cpp
+++ b/Source/Tests/FEXBash.cpp
@@ -5,7 +5,7 @@ desc: Launches bash under FEX and passes arguments via -c to it
 $end_info$
 */
 
-#include "Config.h"
+#include "ConfigDefines.h"
 #include "Common/ArgumentLoader.h"
 #include "Common/EnvironmentLoader.h"
 #include "Common/Config.h"