From e5d090174b353231c461524bb61effb2b74e7276 Mon Sep 17 00:00:00 2001
From: Random06457 <28494085+Random06457@users.noreply.github.com>
Date: Mon, 2 May 2022 19:25:15 +0900
Subject: [PATCH] Makefile: clean OTRExporter/libultraship/ZAPDTR with
 distclean and fix CXX_FILES

---
 soh/.gitignore                              |  7 ++++---
 soh/Makefile                                | 17 +++++++++++------
 soh/soh/Enhancements/debugger/colViewer.cpp |  1 +
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/soh/.gitignore b/soh/.gitignore
index bd813de61..5920cfba7 100644
--- a/soh/.gitignore
+++ b/soh/.gitignore
@@ -283,7 +283,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -379,7 +379,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -388,7 +388,7 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder 
+# MFractors (Xamarin productivity tool) working folder
 .mfractor/
 
 *.out
@@ -401,6 +401,7 @@ ZAPDUtils/ZAPDUtils.a
 build/
 ZAPDUtils/build/
 ZAPD/BuildInfo.h
+cvars.cfg
 
 DebugObj/*
 ReleaseObj/*
\ No newline at end of file
diff --git a/soh/Makefile b/soh/Makefile
index ee553c879..e606cacd7 100644
--- a/soh/Makefile
+++ b/soh/Makefile
@@ -94,14 +94,16 @@ TEXTURE_FILES_OUT := $(foreach f,$(TEXTURE_FILES_PNG:.png=.inc.c),build/$f) \
 
 CXX_FILES := \
 	soh/Enhancements/debugconsole.cpp \
-	soh/GbiWrap.cpp \
-	soh/OTRGlobals.cpp \
-	soh/z_message_OTR.cpp \
-	soh/z_play_otr.cpp \
-	soh/z_scene_otr.cpp \
+	soh/Enhancements/debugger/colViewer.cpp \
 	soh/Enhancements/debugger/debugger.cpp \
 	soh/Enhancements/debugger/debugSaveEditor.cpp \
-	soh/util.cpp
+	soh/Enhancements/debugger/ImGuiHelpers.cpp \
+	soh/GbiWrap.cpp \
+	soh/OTRGlobals.cpp \
+	soh/util.cpp \
+	soh/z_message_OTR.cpp \
+	soh/z_play_otr.cpp \
+	soh/z_scene_otr.cpp
 
 C_FILES := \
 	soh/Enhancements/bootcommands.c \
@@ -823,6 +825,9 @@ mpq:
 
 distclean: clean
 	$(RM) -r baserom/
+	$(MAKE) clean -C ../libultraship
+	$(MAKE) clean -C ../OTRExporter/OTRExporter
+	$(MAKE) clean -C ../ZAPDTR
 
 clean:
 	rm -rf build $(TARGET)
diff --git a/soh/soh/Enhancements/debugger/colViewer.cpp b/soh/soh/Enhancements/debugger/colViewer.cpp
index ad9d341d4..0e7634a5f 100644
--- a/soh/soh/Enhancements/debugger/colViewer.cpp
+++ b/soh/soh/Enhancements/debugger/colViewer.cpp
@@ -4,6 +4,7 @@
 
 #include <vector>
 #include <string>
+#include <cmath>
 
 extern "C" {
 #include <z64.h>