luanti-org · Feb 21, 2015
diff --git a/‎src/CMakeLists.txt
-2 b/‎src/CMakeLists.txt
-2
diff --git a/‎src/clientmedia.cpp
+1-1 b/‎src/clientmedia.cpp
+1-1
diff --git a/‎src/network/packethandlers/client.cpp
+1-1 b/‎src/network/packethandlers/client.cpp
+1-1
diff --git a/‎src/network/packethandlers/server.cpp
+1-1 b/‎src/network/packethandlers/server.cpp
+1-1
diff --git a/‎src/server.cpp
+2-2 b/‎src/server.cpp
+2-2
diff --git a/‎src/util/CMakeLists.txt
+2 b/‎src/util/CMakeLists.txt
+2
diff --git a/‎src/base64.cpp ‎src/util/base64.cpp b/‎src/base64.cpp ‎src/util/base64.cpp
diff --git a/‎src/base64.h ‎src/util/base64.h b/‎src/base64.h ‎src/util/base64.h
diff --git a/‎src/sha1.cpp ‎src/util/sha1.cpp b/‎src/sha1.cpp ‎src/util/sha1.cpp
diff --git a/‎src/sha1.h ‎src/util/sha1.h b/‎src/sha1.h ‎src/util/sha1.h
diff --git a/‎src/util/string.cpp
+2-2 b/‎src/util/string.cpp
+2-2
@@ -362,7 +362,6 @@ set (unittests_SRCS
 
 set(common_SRCS
 	ban.cpp
-	base64.cpp
 	cavegen.cpp
 	clientiface.cpp
 	collision.cpp
@@ -422,7 +421,6 @@ set(common_SRCS
 	serverlist.cpp
 	serverobject.cpp
 	settings.cpp
-	sha1.cpp
 	socket.cpp
 	sound.cpp
 	staticobject.cpp
 
@@ -19,14 +19,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "clientmedia.h"
 #include "util/serialize.h"
+#include "util/sha1.h"
 #include "util/string.h"
 #include "httpfetch.h"
 #include "client.h"
 #include "network/networkprotocol.h"
 #include "filecache.h"
 #include "filesys.h"
 #include "hex.h"
-#include "sha1.h"
 #include "debug.h"
 #include "log.h"
 #include "porting.h"
 
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "client.h"
 
-#include "base64.h"
+#include "util/base64.h"
 #include "clientmedia.h"
 #include "log.h"
 #include "map.h"
 
@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "server.h"
 #include "log.h"
 
-#include "base64.h"
 #include "content_abm.h"
 #include "content_sao.h"
 #include "emerge.h"
@@ -34,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "version.h"
 #include "network/networkprotocol.h"
 #include "network/serveropcodes.h"
+#include "util/base64.h"
 #include "util/pointedthing.h"
 #include "util/serialize.h"
 
 
@@ -51,8 +51,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_abm.h"
 #include "content_sao.h"
 #include "mods.h"
-#include "sha1.h"
-#include "base64.h"
+#include "util/sha1.h"
+#include "util/base64.h"
 #include "sound.h" // dummySoundManager
 #include "event_manager.h"
 #include "hex.h"
 
@@ -1,8 +1,10 @@
 set(UTIL_SRCS
+	${CMAKE_CURRENT_SOURCE_DIR}/base64.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/numeric.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/pointedthing.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/serialize.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/sha1.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/string.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/timetaker.cpp
 	PARENT_SCOPE)
@@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "numeric.h"
 #include "log.h"
 
-#include "../sha1.h"
-#include "../base64.h"
+#include "sha1.h"
+#include "base64.h"
 #include "../hex.h"
 #include "../porting.h"