- moved the last remaining utilities.

src/CMakeLists.txt

@@ -1125,7 +1125,7 @@ set (PCH_SOURCES
 	common/utility/i_module.cpp
 	common/utility/m_alloc.cpp
 	common/utility/utf8.cpp
-	utility/palette.cpp
+	common/utility/palette.cpp
 	utility/palettecontainer.cpp
 	common/utility/files.cpp
 	common/utility/files_decompress.cpp
@@ -1173,7 +1173,7 @@ add_executable( zdoom WIN32 MACOSX_BUNDLE
 	${SYSTEM_SOURCES}
 	${FASTMATH_SOURCES}
 	${PCH_SOURCES}
-	utility/x86.cpp
+	common/utility/x86.cpp
 	common/thirdparty/strnatcmp.c
 	common/utility/zstring.cpp
 	common/utility/findfile.cpp

src/common/utility/palutil.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <stdint.h>
+#include "palentry.h"
+
+int BestColor(const uint32_t* pal, int r, int g, int b, int first = 1, int num = 255);
+int PTM_BestColor(const uint32_t* pal_in, int r, int g, int b, bool reverselookup, float powtable, int first = 1, int num = 255);
+void DoBlending(const PalEntry* from, PalEntry* to, int count, int r, int g, int b, int a);
+// Colorspace conversion RGB <-> HSV
+void RGBtoHSV (float r, float g, float b, float *h, float *s, float *v);
+void HSVtoRGB (float *r, float *g, float *b, float h, float s, float v);
+

src/r_data/r_translate.h

@@ -3,7 +3,7 @@
 
 #include "doomtype.h"
 #include "tarray.h"
-#include "palutil.h"
+#include "palettecontainer.h"
 
 class FSerializer;
 

src/utility/palettecontainer.cpp

@@ -39,6 +39,7 @@
 #include "printf.h"
 #include "colormatcher.h"
 #include "templates.h"
+#include "palettecontainer.h"
 
 
 //----------------------------------------------------------------------------

src/utility/palettecontainer.h

@@ -4,13 +4,6 @@
 #include "memarena.h"
 #include "palentry.h"
 
-int BestColor(const uint32_t* pal, int r, int g, int b, int first = 1, int num = 255);
-int PTM_BestColor(const uint32_t* pal_in, int r, int g, int b, bool reverselookup, float powtable, int first = 1, int num = 255);
-void DoBlending(const PalEntry* from, PalEntry* to, int count, int r, int g, int b, int a);
-// Colorspace conversion RGB <-> HSV
-void RGBtoHSV (float r, float g, float b, float *h, float *s, float *v);
-void HSVtoRGB (float *r, float *g, float *b, float h, float s, float v);
-
 struct FRemapTable
 {
 	FRemapTable(int count = 256) { NumEntries = count; }