build: add json dependency, remove old simdjson stuff
This commit is contained in:
+1
-14
@@ -66,19 +66,6 @@ else()
|
|||||||
target_compile_options(dbd-unlocker-warnings INTERFACE -Wall -Wextra -Werror)
|
target_compile_options(dbd-unlocker-warnings INTERFACE -Wall -Wextra -Werror)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# ------------------------------
|
|
||||||
# simdjson without errors
|
|
||||||
# ------------------------------
|
|
||||||
add_library(simdjson-wrapped INTERFACE)
|
|
||||||
target_link_libraries(simdjson-wrapped INTERFACE simdjson)
|
|
||||||
|
|
||||||
if(CMAKE_GENERATOR MATCHES "Visual Studio")
|
|
||||||
target_compile_options(simdjson-wrapped INTERFACE /W0)
|
|
||||||
else()
|
|
||||||
target_compile_options(simdjson-wrapped INTERFACE -w)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
# ------------------------------
|
# ------------------------------
|
||||||
# unlocker
|
# unlocker
|
||||||
# ------------------------------
|
# ------------------------------
|
||||||
@@ -89,7 +76,7 @@ add_executable(dbd-unlocker ${UNLOCKER_SOURCES})
|
|||||||
string(RANDOM LENGTH 12 ALPHABET "abcdefghijklmnopqrstuvwxyz0123456789" RANDOM_EXE_NAME)
|
string(RANDOM LENGTH 12 ALPHABET "abcdefghijklmnopqrstuvwxyz0123456789" RANDOM_EXE_NAME)
|
||||||
set_target_properties(dbd-unlocker PROPERTIES OUTPUT_NAME "${RANDOM_EXE_NAME}")
|
set_target_properties(dbd-unlocker PROPERTIES OUTPUT_NAME "${RANDOM_EXE_NAME}")
|
||||||
|
|
||||||
target_link_libraries(dbd-unlocker PRIVATE dbd-unlocker-warnings OpenSSL::SSL OpenSSL::Crypto nerutils wsock32 ws2_32 wininet crypt32 simdjson-wrapped)
|
target_link_libraries(dbd-unlocker PRIVATE dbd-unlocker-warnings OpenSSL::SSL OpenSSL::Crypto nerutils wsock32 ws2_32 wininet crypt32 nlohmann_json)
|
||||||
|
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
target_link_options(dbd-unlocker PRIVATE -static -static-libgcc -static-libstdc++)
|
target_link_options(dbd-unlocker PRIVATE -static -static-libgcc -static-libstdc++)
|
||||||
|
|||||||
Reference in New Issue
Block a user