From b6e72e93a2e3baef86011b6b1eb5e069af28fe2e Mon Sep 17 00:00:00 2001
From: Sandu Liviu Catalin <slc.universe@gmail.com>
Date: Mon, 22 Feb 2016 22:00:44 +0200
Subject: [PATCH] Incorporated the hash project into the module project.

---
 cbp/Hash.cbp                               | 182 ---------------------
 cbp/Module.cbp                             |  17 +-
 cbp/Sandbox.cbp                            |   1 -
 {external/Hash => config/mingw32}/endian.h |   0
 config/mingw64/endian.h                    |  14 ++
 5 files changed, 30 insertions(+), 184 deletions(-)
 delete mode 100644 cbp/Hash.cbp
 rename {external/Hash => config/mingw32}/endian.h (100%)
 create mode 100644 config/mingw64/endian.h

diff --git a/cbp/Hash.cbp b/cbp/Hash.cbp
deleted file mode 100644
index 243a9207..00000000
--- a/cbp/Hash.cbp
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="Hash" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Win32 Debug Static">
-				<Option output="../lib/mingw32-d/hash" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/mingw32-d/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-m32" />
-					<Add option="-g" />
-					<Add option="-D_DEBUG" />
-					<Add directory="../config/mingw32" />
-				</Compiler>
-				<Linker>
-					<Add option="-m32" />
-				</Linker>
-			</Target>
-			<Target title="Win32 Release Static">
-				<Option output="../lib/mingw32/hash" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/mingw32/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-m32" />
-					<Add option="-DNDEBUG" />
-					<Add directory="../config/mingw32" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-m32" />
-				</Linker>
-			</Target>
-			<Target title="Win64 Debug Static">
-				<Option output="../lib/mingw64-d/hash" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/mingw64-d/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-m64" />
-					<Add option="-g" />
-					<Add option="-D_DEBUG" />
-					<Add directory="../config/mingw64" />
-				</Compiler>
-				<Linker>
-					<Add option="-m64" />
-				</Linker>
-			</Target>
-			<Target title="Win64 Release Static">
-				<Option output="../lib/mingw64/hash" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/mingw64/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-m64" />
-					<Add option="-DNDEBUG" />
-					<Add directory="../config/mingw64" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-m64" />
-				</Linker>
-			</Target>
-			<Target title="Linux32 Debug Static">
-				<Option output="../lib/gcc32-d/hash" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/gcc32-d/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-m32" />
-					<Add option="-g" />
-					<Add option="-fPIC" />
-					<Add option="-D_DEBUG" />
-					<Add directory="../config/gcc32" />
-				</Compiler>
-				<Linker>
-					<Add option="-m32" />
-				</Linker>
-			</Target>
-			<Target title="Linux32 Release Static">
-				<Option output="../lib/gcc32/hash" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/gcc32/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-m32" />
-					<Add option="-fPIC" />
-					<Add option="-DNDEBUG" />
-					<Add directory="../config/gcc32" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-m32" />
-				</Linker>
-			</Target>
-			<Target title="Linux64 Debug Static">
-				<Option output="../lib/gcc64-d/hash" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/gcc64-d/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-m64" />
-					<Add option="-g" />
-					<Add option="-fPIC" />
-					<Add option="-D_DEBUG" />
-					<Add directory="../config/gcc64" />
-				</Compiler>
-				<Linker>
-					<Add option="-m64" />
-				</Linker>
-			</Target>
-			<Target title="Linux64 Release Static">
-				<Option output="../lib/gcc64/hash" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="" />
-				<Option object_output="../obj/gcc64/" />
-				<Option type="2" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-m64" />
-					<Add option="-fPIC" />
-					<Add option="-DNDEBUG" />
-					<Add directory="../config/gcc64" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-m64" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-			<Add directory="../include" />
-			<Add directory="../config/common" />
-			<Add directory="../external/Hash" />
-		</Compiler>
-		<Unit filename="../external/Hash/crc32.cpp" />
-		<Unit filename="../external/Hash/crc32.h" />
-		<Unit filename="../external/Hash/digest.cpp" />
-		<Unit filename="../external/Hash/endian.h" />
-		<Unit filename="../external/Hash/hash.h" />
-		<Unit filename="../external/Hash/hmac.h" />
-		<Unit filename="../external/Hash/keccak.cpp" />
-		<Unit filename="../external/Hash/keccak.h" />
-		<Unit filename="../external/Hash/md5.cpp" />
-		<Unit filename="../external/Hash/md5.h" />
-		<Unit filename="../external/Hash/sha1.cpp" />
-		<Unit filename="../external/Hash/sha1.h" />
-		<Unit filename="../external/Hash/sha256.cpp" />
-		<Unit filename="../external/Hash/sha256.h" />
-		<Unit filename="../external/Hash/sha3.cpp" />
-		<Unit filename="../external/Hash/sha3.h" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/cbp/Module.cbp b/cbp/Module.cbp
index a6e3e874..5403bf32 100644
--- a/cbp/Module.cbp
+++ b/cbp/Module.cbp
@@ -194,8 +194,23 @@
 		<Linker>
 			<Add library="squirrel" />
 			<Add library="sqlite" />
-			<Add library="hash" />
 		</Linker>
+		<Unit filename="../external/Hash/crc32.cpp" />
+		<Unit filename="../external/Hash/crc32.h" />
+		<Unit filename="../external/Hash/digest.cpp" />
+		<Unit filename="../external/Hash/endian.h" />
+		<Unit filename="../external/Hash/hash.h" />
+		<Unit filename="../external/Hash/hmac.h" />
+		<Unit filename="../external/Hash/keccak.cpp" />
+		<Unit filename="../external/Hash/keccak.h" />
+		<Unit filename="../external/Hash/md5.cpp" />
+		<Unit filename="../external/Hash/md5.h" />
+		<Unit filename="../external/Hash/sha1.cpp" />
+		<Unit filename="../external/Hash/sha1.h" />
+		<Unit filename="../external/Hash/sha256.cpp" />
+		<Unit filename="../external/Hash/sha256.h" />
+		<Unit filename="../external/Hash/sha3.cpp" />
+		<Unit filename="../external/Hash/sha3.h" />
 		<Unit filename="../external/PUGIXML/pugixml.cpp" />
 		<Unit filename="../external/RandomLib/Random.cpp" />
 		<Unit filename="../source/Base/AABB.cpp" />
diff --git a/cbp/Sandbox.cbp b/cbp/Sandbox.cbp
index b8f4905b..b1084fb5 100644
--- a/cbp/Sandbox.cbp
+++ b/cbp/Sandbox.cbp
@@ -160,7 +160,6 @@
 		<Linker>
 			<Add library="squirrel" />
 			<Add library="sqlite" />
-			<Add library="hash" />
 		</Linker>
 		<Unit filename="../sandbox/main.cpp" />
 		<Extensions>
diff --git a/external/Hash/endian.h b/config/mingw32/endian.h
similarity index 100%
rename from external/Hash/endian.h
rename to config/mingw32/endian.h
diff --git a/config/mingw64/endian.h b/config/mingw64/endian.h
new file mode 100644
index 00000000..120371d0
--- /dev/null
+++ b/config/mingw64/endian.h
@@ -0,0 +1,14 @@
+#ifndef _ENDIAN_H_
+#define _ENDIAN_H_
+
+#if defined(__MINGW32__) || defined(__MINGW64__)
+    // Workaround for MinGW and it's lack of <endian.h> file
+    #define __BYTE_ORDER    __BYTE_ORDER__
+    #define __LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__
+    #define __BIG_ENDIAN    __ORDER_BIG_ENDIAN__
+#elif !defined(_MSC_VER)
+    // Just include the system file
+    #include <endian.h>
+#endif
+
+#endif // _ENDIAN_H_
\ No newline at end of file