Move sha1.hpp and base64.hpp to util/
This commit is contained in:
parent
aa31e3c7f3
commit
3998a1f8f9
|
@ -362,7 +362,6 @@ set (unittests_SRCS
|
||||||
|
|
||||||
set(common_SRCS
|
set(common_SRCS
|
||||||
ban.cpp
|
ban.cpp
|
||||||
base64.cpp
|
|
||||||
cavegen.cpp
|
cavegen.cpp
|
||||||
clientiface.cpp
|
clientiface.cpp
|
||||||
collision.cpp
|
collision.cpp
|
||||||
|
@ -422,7 +421,6 @@ set(common_SRCS
|
||||||
serverlist.cpp
|
serverlist.cpp
|
||||||
serverobject.cpp
|
serverobject.cpp
|
||||||
settings.cpp
|
settings.cpp
|
||||||
sha1.cpp
|
|
||||||
socket.cpp
|
socket.cpp
|
||||||
sound.cpp
|
sound.cpp
|
||||||
staticobject.cpp
|
staticobject.cpp
|
||||||
|
|
|
@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
|
||||||
#include "clientmedia.h"
|
#include "clientmedia.h"
|
||||||
#include "util/serialize.h"
|
#include "util/serialize.h"
|
||||||
|
#include "util/sha1.h"
|
||||||
#include "util/string.h"
|
#include "util/string.h"
|
||||||
#include "httpfetch.h"
|
#include "httpfetch.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
|
@ -26,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#include "filecache.h"
|
#include "filecache.h"
|
||||||
#include "filesys.h"
|
#include "filesys.h"
|
||||||
#include "hex.h"
|
#include "hex.h"
|
||||||
#include "sha1.h"
|
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "porting.h"
|
#include "porting.h"
|
||||||
|
|
|
@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
|
|
||||||
#include "base64.h"
|
#include "util/base64.h"
|
||||||
#include "clientmedia.h"
|
#include "clientmedia.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "map.h"
|
#include "map.h"
|
||||||
|
|
|
@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
|
||||||
#include "base64.h"
|
|
||||||
#include "content_abm.h"
|
#include "content_abm.h"
|
||||||
#include "content_sao.h"
|
#include "content_sao.h"
|
||||||
#include "emerge.h"
|
#include "emerge.h"
|
||||||
|
@ -34,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
#include "network/networkprotocol.h"
|
#include "network/networkprotocol.h"
|
||||||
#include "network/serveropcodes.h"
|
#include "network/serveropcodes.h"
|
||||||
|
#include "util/base64.h"
|
||||||
#include "util/pointedthing.h"
|
#include "util/pointedthing.h"
|
||||||
#include "util/serialize.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_abm.h"
|
||||||
#include "content_sao.h"
|
#include "content_sao.h"
|
||||||
#include "mods.h"
|
#include "mods.h"
|
||||||
#include "sha1.h"
|
#include "util/sha1.h"
|
||||||
#include "base64.h"
|
#include "util/base64.h"
|
||||||
#include "sound.h" // dummySoundManager
|
#include "sound.h" // dummySoundManager
|
||||||
#include "event_manager.h"
|
#include "event_manager.h"
|
||||||
#include "hex.h"
|
#include "hex.h"
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
set(UTIL_SRCS
|
set(UTIL_SRCS
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/base64.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/numeric.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/numeric.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/pointedthing.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/pointedthing.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/serialize.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/serialize.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/sha1.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/string.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/string.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/timetaker.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/timetaker.cpp
|
||||||
PARENT_SCOPE)
|
PARENT_SCOPE)
|
||||||
|
|
|
@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#include "numeric.h"
|
#include "numeric.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
|
||||||
#include "../sha1.h"
|
#include "sha1.h"
|
||||||
#include "../base64.h"
|
#include "base64.h"
|
||||||
#include "../hex.h"
|
#include "../hex.h"
|
||||||
#include "../porting.h"
|
#include "../porting.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue