mirror of
https://github.com/acidicoala/SmokeAPI.git
synced 2026-01-24 13:32:51 -05:00
Fix mbedtls include attempt 3
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="linux_exports_generator [32]" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="--input_libs_glob $ProjectFileDir$/res/steamworks/*/binaries/linux32/libsteam_api.so --output_path $ProjectFileDir$/src/generated/32/proxy_exports" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="SmokeAPI" TARGET_NAME="linux_exports_generator" CONFIG_NAME="Debug [32]" RUN_TARGET_PROJECT_NAME="SmokeAPI" RUN_TARGET_NAME="linux_exports_generator">
|
<configuration default="false" name="linux_exports_generator [32]" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="--input_libs_glob $ProjectFileDir$/res/steamworks/*/binaries/linux32/libsteam_api.so --output_path $ProjectFileDir$/src/generated/32/proxy_exports" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="SmokeAPI" TARGET_NAME="linux_exports_generator" CONFIG_NAME="Debug [64]" RUN_TARGET_PROJECT_NAME="SmokeAPI" RUN_TARGET_NAME="linux_exports_generator">
|
||||||
<method v="2">
|
<method v="2">
|
||||||
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
|
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
|
||||||
</method>
|
</method>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="steamworks_downloader [prompt]" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="$Prompt$" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" WORKING_DIR="file://$ProjectFileDir$/res" PASS_PARENT_ENVS_2="true" PROJECT_NAME="SmokeAPI" TARGET_NAME="steamworks_downloader" CONFIG_NAME="Debug [32]" RUN_TARGET_PROJECT_NAME="SmokeAPI" RUN_TARGET_NAME="steamworks_downloader">
|
<configuration default="false" name="steamworks_downloader [prompt]" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="$Prompt$" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" WORKING_DIR="file://$ProjectFileDir$/res" PASS_PARENT_ENVS_2="true" PROJECT_NAME="SmokeAPI" TARGET_NAME="steamworks_downloader" CONFIG_NAME="Debug [64]" RUN_TARGET_PROJECT_NAME="SmokeAPI" RUN_TARGET_NAME="steamworks_downloader">
|
||||||
<method v="2">
|
<method v="2">
|
||||||
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
|
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
|
||||||
</method>
|
</method>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
cmake_minimum_required(VERSION 3.24)
|
cmake_minimum_required(VERSION 3.24)
|
||||||
|
|
||||||
project(SmokeAPI VERSION 4.1.0)
|
project(SmokeAPI VERSION 4.1.1)
|
||||||
|
|
||||||
include(KoalaBox/cmake/KoalaBox.cmake)
|
include(KoalaBox/cmake/KoalaBox.cmake)
|
||||||
add_subdirectory(KoalaBox)
|
add_subdirectory(KoalaBox)
|
||||||
|
|||||||
2
KoalaBox
2
KoalaBox
Submodule KoalaBox updated: d725c86389...6a262ff96b
@@ -432,6 +432,7 @@ This project makes use of the following open source projects:
|
|||||||
- [pantor/inja](https://github.com/pantor/inja)
|
- [pantor/inja](https://github.com/pantor/inja)
|
||||||
- [jarro2783/cxxopts](https://github.com/jarro2783/cxxopts)
|
- [jarro2783/cxxopts](https://github.com/jarro2783/cxxopts)
|
||||||
- [serge1/ELFIO](https://github.com/serge1/ELFIO)
|
- [serge1/ELFIO](https://github.com/serge1/ELFIO)
|
||||||
|
- [Mbed-TLS/mbedtls](https://github.com/Mbed-TLS/mbedtls)
|
||||||
- [bshoshany/thread-pool](https://github.com/bshoshany/thread-pool)
|
- [bshoshany/thread-pool](https://github.com/bshoshany/thread-pool)
|
||||||
- [batterycenter/embed](https://github.com/batterycenter/embed)
|
- [batterycenter/embed](https://github.com/batterycenter/embed)
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
#include <koalabox/config.hpp>
|
#include <koalabox/config.hpp>
|
||||||
#include <koalabox/globals.hpp>
|
#include <koalabox/globals.hpp>
|
||||||
#include <koalabox/hook.hpp>
|
#include <koalabox/hook.hpp>
|
||||||
|
#include <koalabox/http_client.hpp>
|
||||||
#include <koalabox/lib.hpp>
|
#include <koalabox/lib.hpp>
|
||||||
#include <koalabox/lib_monitor.hpp>
|
#include <koalabox/lib_monitor.hpp>
|
||||||
#include <koalabox/logger.hpp>
|
#include <koalabox/logger.hpp>
|
||||||
@@ -57,6 +58,27 @@ namespace {
|
|||||||
void* original_steamapi_handle = nullptr;
|
void* original_steamapi_handle = nullptr;
|
||||||
bool is_hook_mode;
|
bool is_hook_mode;
|
||||||
|
|
||||||
|
void check_for_updates() {
|
||||||
|
const auto latest_release_url = std::format(
|
||||||
|
"https://api.github.com/repos/acidicoala/{}/releases/latest",
|
||||||
|
PROJECT_NAME
|
||||||
|
);
|
||||||
|
const auto res = kb::http_client::get_json(latest_release_url);
|
||||||
|
const auto latest_tag = res["tag_name"].get<std::string>();
|
||||||
|
const auto current_tag = std::format("v{}", PROJECT_VERSION);
|
||||||
|
|
||||||
|
if(current_tag == latest_tag) {
|
||||||
|
LOG_DEBUG("Running the latest version");
|
||||||
|
} else {
|
||||||
|
const auto release_page = std::format(
|
||||||
|
"https://github.com/acidicoala/{}/releases/{}",
|
||||||
|
PROJECT_NAME, latest_tag
|
||||||
|
);
|
||||||
|
|
||||||
|
LOG_WARN("New version {} available: {}", latest_tag, release_page);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
std::set<std::string> find_steamclient_versions(void* steamapi_handle) {
|
std::set<std::string> find_steamclient_versions(void* steamapi_handle) {
|
||||||
if(!steamapi_handle) {
|
if(!steamapi_handle) {
|
||||||
kb::util::panic("Invalid state. steamapi_handle is null.");
|
kb::util::panic("Invalid state. steamapi_handle is null.");
|
||||||
@@ -255,6 +277,12 @@ namespace smoke_api {
|
|||||||
kb::win::check_self_duplicates();
|
kb::win::check_self_duplicates();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef KB_DEBUG
|
||||||
|
// TODO: Add config option to toggle this and show native OS notification
|
||||||
|
// The real reason behind this is for automatic testing of HTTPs dependencies
|
||||||
|
std::thread(check_for_updates).detach();
|
||||||
|
#endif
|
||||||
|
|
||||||
// We need to hook functions in either mode
|
// We need to hook functions in either mode
|
||||||
kb::hook::init(true);
|
kb::hook::init(true);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user