Moved CompressionUtil to Core (to keep zlib/LZO dependencies out of Common and Math)

src/Common/Common.pro

@@ -65,7 +65,6 @@ HEADERS += \
     CColor.h \
     CFourCC.h \
     CHashFNV1A.h \
-    CompressionUtil.h \
     CTimer.h \
     EKeyInputs.h \
     EMouseInputs.h \
@@ -93,7 +92,6 @@ HEADERS += \
 # Source Files
 SOURCES += \
     CColor.cpp \
-    CompressionUtil.cpp \
     CTimer.cpp \
     TString.cpp \
     Log.cpp \

src/Core/CompressionUtil.cpp

@@ -1,7 +1,7 @@
 #include "CompressionUtil.h"
-#include "Log.h"
+#include <Common/Log.h>
-#include "TString.h"
+#include <Common/TString.h>
-#include "types.h"
+#include <Common/types.h>
 
 #include <lzo/lzo1x.h>
 #include <zlib.h>

src/Core/CompressionUtil.h

@@ -1,9 +1,9 @@
 #ifndef COMPRESSIONUTIL_H
 #define COMPRESSIONUTIL_H
 
-#include "TString.h"
-#include "types.h"
 #include <FileIO/FileIO.h>
+#include <Common/TString.h>
+#include <Common/types.h>
 
 namespace CompressionUtil
 {

src/Core/Core.pro

@@ -227,7 +227,9 @@ HEADERS += \
     GameProject/CGameInfo.h \
     Resource/CResTypeInfo.h \
     Resource/Cooker/CResourceCooker.h \
-    Resource/CAudioMacro.h
+    Resource/CAudioMacro.h \
+    Resource/Animation/CCharacter.h \
+    CompressionUtil.h
 
 # Source Files
 SOURCES += \
@@ -332,4 +334,5 @@ SOURCES += \
     GameProject/AssetNameGeneration.cpp \
     GameProject/CAssetNameMap.cpp \
     GameProject/CGameInfo.cpp \
-    Resource/CResTypeInfo.cpp
+    Resource/CResTypeInfo.cpp \
+    CompressionUtil.cpp

src/Core/GameProject/CGameExporter.cpp

@@ -2,11 +2,11 @@
 #include "CGameInfo.h"
 #include "CResourceIterator.h"
 #include "CResourceStore.h"
+#include "Core/CompressionUtil.h"
 #include "Core/Resource/CWorld.h"
 #include "Core/Resource/Script/CMasterTemplate.h"
 #include <FileIO/FileIO.h>
 #include <Common/AssertMacro.h>
-#include <Common/CompressionUtil.h>
 #include <Common/CScopedTimer.h>
 #include <Common/FileUtil.h>
 #include <Common/Serialization/CXMLWriter.h>

src/Core/GameProject/CPackage.cpp

@@ -1,10 +1,10 @@
 #include "CPackage.h"
 #include "DependencyListBuilders.h"
 #include "CGameProject.h"
+#include "Core/CompressionUtil.h"
 #include "Core/Resource/Cooker/CWorldCooker.h"
 #include <FileIO/FileIO.h>
 #include <Common/AssertMacro.h>
-#include <Common/CompressionUtil.h>
 #include <Common/FileUtil.h>
 #include <Common/Serialization/XML.h>
 

src/Core/Resource/Cooker/CAreaCooker.cpp

@@ -1,6 +1,6 @@
 #include "CAreaCooker.h"
 #include "CScriptCooker.h"
-#include <Common/CompressionUtil.h>
+#include "Core/CompressionUtil.h"
 #include <Common/Log.h>
 
 const bool gkForceDisableCompression = false;

src/Core/Resource/Factory/CAreaLoader.cpp

@@ -3,10 +3,10 @@
 #include "CModelLoader.h"
 #include "CMaterialLoader.h"
 #include "CScriptLoader.h"
+#include "Core/CompressionUtil.h"
 #include <Common/Log.h>
 
 #include <Common/CFourCC.h>
-#include <Common/CompressionUtil.h>
 
 #include <iostream>