diff options
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/clientmedia.cpp | 2 | ||||
| -rw-r--r-- | src/network/packethandlers/client.cpp | 2 | ||||
| -rw-r--r-- | src/network/packethandlers/server.cpp | 2 | ||||
| -rw-r--r-- | src/server.cpp | 4 | ||||
| -rw-r--r-- | src/util/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/util/base64.cpp (renamed from src/base64.cpp) | 0 | ||||
| -rw-r--r-- | src/util/base64.h (renamed from src/base64.h) | 0 | ||||
| -rw-r--r-- | src/util/sha1.cpp (renamed from src/sha1.cpp) | 0 | ||||
| -rw-r--r-- | src/util/sha1.h (renamed from src/sha1.h) | 0 | ||||
| -rw-r--r-- | src/util/string.cpp | 4 |
11 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3bf803ea0..6aa1a35a1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 diff --git a/src/clientmedia.cpp b/src/clientmedia.cpp index 7c24b76d0..2ccf04678 100644 --- a/src/clientmedia.cpp +++ b/src/clientmedia.cpp @@ -19,6 +19,7 @@ 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" @@ -26,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "filecache.h" #include "filesys.h" #include "hex.h" -#include "sha1.h" #include "debug.h" #include "log.h" #include "porting.h" diff --git a/src/network/packethandlers/client.cpp b/src/network/packethandlers/client.cpp index 1ce54e38c..1d3a343bf 100644 --- a/src/network/packethandlers/client.cpp +++ b/src/network/packethandlers/client.cpp @@ -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" diff --git a/src/network/packethandlers/server.cpp b/src/network/packethandlers/server.cpp index 4627bd5ed..feb8d66be 100644 --- a/src/network/packethandlers/server.cpp +++ b/src/network/packethandlers/server.cpp @@ -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" diff --git a/src/server.cpp b/src/server.cpp index a75e27456..0d52863d2 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -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" diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 9cb8a19b6..56bf8a25a 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -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) diff --git a/src/base64.cpp b/src/util/base64.cpp index e14de7de2..e14de7de2 100644 --- a/src/base64.cpp +++ b/src/util/base64.cpp diff --git a/src/base64.h b/src/util/base64.h index 1cb175518..1cb175518 100644 --- a/src/base64.h +++ b/src/util/base64.h diff --git a/src/sha1.cpp b/src/util/sha1.cpp index 6ed7385d5..6ed7385d5 100644 --- a/src/sha1.cpp +++ b/src/util/sha1.cpp diff --git a/src/sha1.h b/src/util/sha1.h index c04947373..c04947373 100644 --- a/src/sha1.h +++ b/src/util/sha1.h diff --git a/src/util/string.cpp b/src/util/string.cpp index de669b473..babf7e62b 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -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" |