diff --git a/CMakeLists.txt b/CMakeLists.txt index c766ad7..cb0a352 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,5 +8,18 @@ add_executable(${PROJECT_NAME} ${source_files}) set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "BeamMP-Launcher") find_package(ZLIB REQUIRED) find_package(CURL CONFIG REQUIRED) -target_link_libraries(${PROJECT_NAME} PRIVATE ws2_32 rstrtmgr discord-rpc CURL::libcurl ZLIB::ZLIB) + +# This might cause issues with old windows headers, but it's worth the trouble to keep the code +# completely cross platform. For fixes to common issues arising from /permissive- visit: +# https://docs.microsoft.com/en-us/cpp/build/reference/permissive-standards-conformance + +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /permissive-") +message(STATUS "MSVC -> forcing use of statically-linked runtime.") +STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) +STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) +#-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static + + + +target_link_libraries(${PROJECT_NAME} PRIVATE rstrtmgr discord-rpc CURL::libcurl ZLIB::ZLIB) target_include_directories(${PROJECT_NAME} PUBLIC $) \ No newline at end of file diff --git a/src/Network/GlobalHandler.cpp b/src/Network/GlobalHandler.cpp index 3b83056..d0f60c1 100644 --- a/src/Network/GlobalHandler.cpp +++ b/src/Network/GlobalHandler.cpp @@ -6,8 +6,6 @@ /// Created by Anonymous275 on 7/25/2020 /// #include "Network/network.h" -#include "Security/Init.h" - #include #include #include "Logger.h" diff --git a/src/Security/BeamNG.cpp b/src/Security/BeamNG.cpp index 4e2b200..0659fa1 100644 --- a/src/Security/BeamNG.cpp +++ b/src/Security/BeamNG.cpp @@ -256,8 +256,8 @@ void LegitimacyCheck(){ if(fs::exists(Result)){ if(!Find("284160.json",Result))Exit(2); if(FindHack(Result)) { - std::string maliciousFileName = fs::directory_iterator(Result)->path().filename().string(); - error("Found malicious file " + maliciousFileName + ". Please remove it in order to play\n"); + std::string Name = fs::directory_iterator(Result)->path().filename().string(); + error("Found malicious file " + Name + ". Please remove it in order to play\n"); SteamExit(1); } }else Exit(3); diff --git a/src/Startup.cpp b/src/Startup.cpp index 3281f14..3abf391 100644 --- a/src/Startup.cpp +++ b/src/Startup.cpp @@ -27,7 +27,7 @@ std::string GetVer(){ return "1.80"; } std::string GetPatch(){ - return ".10"; + return ".91"; } void ReLaunch(int argc,char*args[]){ std::string Arg;