diff --git a/Cargo.lock b/Cargo.lock index 789cc4051..2129ecbfd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,6 +57,17 @@ dependencies = [ "url", ] +[[package]] +name = "ak-ffi" +version = "0.44.3" +dependencies = [ + "ak-platform", + "cxx", + "serde", + "url", + "winreg 0.56.0", +] + [[package]] name = "ak-nss" version = "0.44.3" @@ -117,17 +128,6 @@ dependencies = [ "tower", ] -[[package]] -name = "ak_ffi" -version = "0.44.3" -dependencies = [ - "ak-platform", - "cxx", - "serde", - "url", - "winreg 0.56.0", -] - [[package]] name = "allocator-api2" version = "0.2.21" diff --git a/ak-ffi/Cargo.toml b/ak-ffi/Cargo.toml index c29ddbd2c..ad359d564 100644 --- a/ak-ffi/Cargo.toml +++ b/ak-ffi/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ak_ffi" +name = "ak-ffi" version.workspace = true edition.workspace = true license.workspace = true diff --git a/ee/wcp/CMakeLists.txt b/ee/wcp/CMakeLists.txt index 59eaff206..142ae1943 100644 --- a/ee/wcp/CMakeLists.txt +++ b/ee/wcp/CMakeLists.txt @@ -270,22 +270,22 @@ endif() corrosion_import_crate( MANIFEST_PATH ../../ak-ffi/Cargo.toml - CRATES ak_ffi + CRATES ak-ffi ) # getrandom (transitive dep) calls BCryptGenRandom on Windows; propagate the -# requirement to all CMake consumers of ak_ffi via the link interface. -corrosion_link_libraries(ak_ffi bcrypt) +# requirement to all CMake consumers of ak-ffi via the link interface. +corrosion_link_libraries(ak-ffi bcrypt) corrosion_add_cxxbridge( - ak_ffi_bridge - CRATE ak_ffi + ak-ffi-bridge + CRATE ak-ffi FILES ffi.rs ) if(MSVC) - set_property(TARGET ak_ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) - set_property(TARGET ak_ffi_bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) - corrosion_set_env_vars(ak_ffi "CFLAGS=-MT" "CXXFLAGS=-MT") - corrosion_set_env_vars(ak_ffi_bridge "CFLAGS=-MT" "CXXFLAGS=-MT") + set_property(TARGET ak-ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) + set_property(TARGET ak-ffi-bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) + corrosion_set_env_vars(ak-ffi "CFLAGS=-MT" "CXXFLAGS=-MT") + corrosion_set_env_vars(ak-ffi-bridge "CFLAGS=-MT" "CXXFLAGS=-MT") endif() FetchContent_Declare(spdlog diff --git a/ee/wcp/ak_common/CMakeLists.txt b/ee/wcp/ak_common/CMakeLists.txt index 90e1ea69f..c26137e52 100644 --- a/ee/wcp/ak_common/CMakeLists.txt +++ b/ee/wcp/ak_common/CMakeLists.txt @@ -19,9 +19,9 @@ target_include_directories(${PROJECT_NAME} PUBLIC ) target_link_libraries(${PROJECT_NAME} - ak_ffi_bridge + ak-ffi-bridge spdlog sentry ) -set_property(TARGET ak_ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) -set_property(TARGET ak_ffi_bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) +set_property(TARGET ak-ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) +set_property(TARGET ak-ffi-bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) diff --git a/ee/wcp/ak_cred_provider/CMakeLists.txt b/ee/wcp/ak_cred_provider/CMakeLists.txt index d79da6853..7010de9f3 100644 --- a/ee/wcp/ak_cred_provider/CMakeLists.txt +++ b/ee/wcp/ak_cred_provider/CMakeLists.txt @@ -53,7 +53,7 @@ target_link_libraries(${PROJECT_NAME} ${SHLWAPI_LIB_PATH} ak_common cefsimple - ak_ffi_bridge + ak-ffi-bridge ) # TODO: Add tests and install targets if needed. diff --git a/ee/wcp/ak_cred_provider/Credential.cpp b/ee/wcp/ak_cred_provider/Credential.cpp index d7b02e41b..2dc68a89c 100644 --- a/ee/wcp/ak_cred_provider/Credential.cpp +++ b/ee/wcp/ak_cred_provider/Credential.cpp @@ -8,7 +8,7 @@ // { #include "cefsimple/cefsimple_win.h" // } -#include "ak_ffi_bridge/ffi.h" +#include "ak-ffi-bridge/ffi.h" #include #define WIN_PASS_LEN 50 diff --git a/ee/wcp/ak_cred_provider/Provider.cpp b/ee/wcp/ak_cred_provider/Provider.cpp index fabddcf82..7e96f83d9 100644 --- a/ee/wcp/ak_cred_provider/Provider.cpp +++ b/ee/wcp/ak_cred_provider/Provider.cpp @@ -3,7 +3,7 @@ #include "ak_common/include/ak_log.h" #include "ak_common/include/ak_version.h" #include "Provider.h" -#include "ak_ffi_bridge/ffi.h" +#include "ak-ffi-bridge/ffi.h" #include "rust/cxx.h" #include diff --git a/ee/wcp/ak_lsa/CMakeLists.txt b/ee/wcp/ak_lsa/CMakeLists.txt index de94abcc3..c1e49c1de 100644 --- a/ee/wcp/ak_lsa/CMakeLists.txt +++ b/ee/wcp/ak_lsa/CMakeLists.txt @@ -28,10 +28,10 @@ target_link_libraries(${PROJECT_NAME} ${CREDUI_LIB_PATH} ${SECUR32_LIB_PATH} ${SHLWAPI_LIB_PATH} - ak_ffi_bridge + ak-ffi-bridge ak_common spdlog ) set_property(TARGET ak_lsa PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) -set_property(TARGET ak_ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) -set_property(TARGET ak_ffi_bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) +set_property(TARGET ak-ffi PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) +set_property(TARGET ak-ffi-bridge PROPERTY MSVC_RUNTIME_LIBRARY MultiThreaded) diff --git a/ee/wcp/ak_lsa/Utils.hpp b/ee/wcp/ak_lsa/Utils.hpp index f8cd47f96..782402b33 100644 --- a/ee/wcp/ak_lsa/Utils.hpp +++ b/ee/wcp/ak_lsa/Utils.hpp @@ -2,7 +2,7 @@ #include #include #include -#include "ak_ffi_bridge/ffi.h" +#include "ak-ffi-bridge/ffi.h" #include "rust/cxx.h" #include "ak_common/include/ak_log.h" #include "spdlog/spdlog.h" diff --git a/ee/wcp/cefsimple/simple_app.cc b/ee/wcp/cefsimple/simple_app.cc index b44ed9683..42debe8fa 100644 --- a/ee/wcp/cefsimple/simple_app.cc +++ b/ee/wcp/cefsimple/simple_app.cc @@ -16,7 +16,7 @@ #include "cefsimple/simple_handler.h" #include "ak_cred_provider/include/resource.h" #include "include/cef_image.h" -#include "ak_ffi_bridge/ffi.h" +#include "ak-ffi-bridge/ffi.h" #include "rust/cxx.h" // GetModuleHandle(NULL) returns a handle to the module that was used to create the process. diff --git a/ee/wcp/cefsimple/simple_handler.h b/ee/wcp/cefsimple/simple_handler.h index 6e86cb14f..fe7a2d3ef 100644 --- a/ee/wcp/cefsimple/simple_handler.h +++ b/ee/wcp/cefsimple/simple_handler.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFSIMPLE_SIMPLE_HANDLER_H_ #include "rust/cxx.h" -#include "ak_ffi_bridge/ffi.h" +#include "ak-ffi-bridge/ffi.h" #include #include diff --git a/ee/wcp/libcef_dll/CMakeLists.txt b/ee/wcp/libcef_dll/CMakeLists.txt index 477e37e74..0ff7340fb 100644 --- a/ee/wcp/libcef_dll/CMakeLists.txt +++ b/ee/wcp/libcef_dll/CMakeLists.txt @@ -980,7 +980,7 @@ target_link_libraries(${CEF_TARGET} ${CRYPT32_LIB_PATH} ${NETAPI32_LIB_PATH} ak_common - ak_ffi_bridge + ak-ffi-bridge ) # Copy binary and resource files to the target output directory.