From dc84643fe6fc1204da785c9bb98dbda4681a9867 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Sat, 10 Apr 2021 14:30:22 +0200
Subject: [PATCH] :truck: Move dx.cpp and sound.cpp back in to Source now that
 the name space is clean

---
 CMakeLists.txt                | 4 ++--
 {SourceX => Source}/dx.cpp    | 0
 {SourceX => Source}/sound.cpp | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {SourceX => Source}/dx.cpp (100%)
 rename {SourceX => Source}/sound.cpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6708dfea..134491d1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,6 +229,7 @@ add_library(devilution STATIC
   Source/drlg_l2.cpp
   Source/drlg_l3.cpp
   Source/drlg_l4.cpp
+  Source/dx.cpp
   Source/dthread.cpp
   Source/effects.cpp
   Source/encrypt.cpp
@@ -271,6 +272,7 @@ add_library(devilution STATIC
   Source/scrollrt.cpp
   Source/setmaps.cpp
   Source/sha.cpp
+  Source/sound.cpp
   Source/spelldat.cpp
   Source/spells.cpp
   Source/stores.cpp
@@ -285,7 +287,6 @@ add_library(devilution STATIC
 
 set(devilutionx_SRCS
   SourceX/qol.cpp
-  SourceX/dx.cpp
   SourceX/controls/devices/game_controller.cpp
   SourceX/controls/devices/joystick.cpp
   SourceX/controls/devices/kbcontroller.cpp
@@ -300,7 +301,6 @@ set(devilutionx_SRCS
   SourceX/display.cpp
   SourceX/miniwin/misc_msg.cpp
   SourceX/thread.cpp
-  SourceX/sound.cpp
   SourceX/soundsample.cpp
   SourceX/storm_sdl_rw.cpp
   SourceX/storm/storm.cpp
diff --git a/SourceX/dx.cpp b/Source/dx.cpp
similarity index 100%
rename from SourceX/dx.cpp
rename to Source/dx.cpp
diff --git a/SourceX/sound.cpp b/Source/sound.cpp
similarity index 100%
rename from SourceX/sound.cpp
rename to Source/sound.cpp