Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove SHA512, move md5 to thirdparty #1443

Merged
merged 2 commits into from
Feb 9, 2024
Merged

chore: remove SHA512, move md5 to thirdparty #1443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19103a7
remove sha512, move md5 to thirdparty
EmosewaMC Feb 3, 2024
186a502
Merge branch 'main' into md5-out-of-common
EmosewaMC Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ set(INCLUDED_DIRECTORIES
"thirdparty/SQLite"
"thirdparty/cpplinq"
"thirdparty/cpp-httplib"
"thirdparty/MD5"

"tests"
"tests/dCommonTests"
Expand Down Expand Up @@ -320,7 +321,7 @@ add_subdirectory(dPhysics)
add_subdirectory(dServer)

# Create a list of common libraries shared between all binaries
set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp" "magic_enum")
set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp" "magic_enum" "MD5")

# Add platform specific common libraries
if(UNIX)
Expand Down
7 changes: 0 additions & 7 deletions dCommon/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ set(DCOMMON_SOURCES
"Game.cpp"
"GeneralUtils.cpp"
"LDFFormat.cpp"
"MD5.cpp"
"Metrics.cpp"
"NiPoint3.cpp"
"NiQuaternion.cpp"
"SHA512.cpp"
"Demangler.cpp"
"ZCompression.cpp"
"BrickByBrickFix.cpp"
Expand Down Expand Up @@ -68,8 +66,3 @@ else ()
endif ()

target_link_libraries(dCommon ZLIB::ZLIB)

# Disable deprecation warnings on MD5.cpp and SHA512.cpp for Apple Clang
if (APPLE)
set_source_files_properties("MD5.cpp" "SHA512.cpp" PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
endif()
154 changes: 0 additions & 154 deletions dCommon/SHA512.cpp
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions dCommon/SHA512.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dNet/AuthPackets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "Database.h"
#include "ZoneInstanceManager.h"
#include "MD5.h"
#include "SHA512.h"
#include "GeneralUtils.h"

#include <bcrypt/BCrypt.hpp>
Expand Down
2 changes: 2 additions & 0 deletions thirdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ if(UNIX AND NOT APPLE)
include_directories(${backtrace_SOURCE_DIR})
endif()
endif()

add_subdirectory(MD5)
6 changes: 6 additions & 0 deletions thirdparty/MD5/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
add_library(MD5 "MD5.cpp")

# Disable deprecation warnings on MD5.cpp for Apple Clang
if (APPLE)
set_source_files_properties("MD5.cpp" PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
endif()
0 dCommon/MD5.cpp → thirdparty/MD5/MD5.cpp
View file
Open in desktop
File renamed without changes.
0 dCommon/MD5.h → thirdparty/MD5/MD5.h
View file
Open in desktop
File renamed without changes.
Loading