Merge pull request #79 from BeamMP/hotfix-stuff

Fixup various bits
BeamMP · Jun 15, 2024 · 46690b5 · 46690b5
2 parents 8c9d3a5 + adba66a
commit 46690b5
Show file tree

Hide file tree

Showing 66 changed files with 174 additions and 350 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
+
 project(Launcher)
 
 if (WIN32)
@@ -18,25 +19,14 @@ find_package(nlohmann_json CONFIG REQUIRED)
 add_executable(${PROJECT_NAME} ${source_files})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "BeamMP-Launcher")
 
-
 if (WIN32)
     find_package(ZLIB REQUIRED)
     find_package(OpenSSL REQUIRED)
-    #-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
-    set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
-    include_directories(${VcpkgRoot}/include)
-    link_directories(${VcpkgRoot}/lib)
     target_link_libraries(${PROJECT_NAME} PRIVATE
             ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto ws2_32 httplib::httplib nlohmann_json::nlohmann_json)
-
-    if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-        target_link_libraries(${PROJECT_NAME} PRIVATE ${VcpkgRoot}/lib/discord-rpc.lib)
-    else ()
-        target_link_libraries(${PROJECT_NAME} PRIVATE ${VcpkgRoot}/debug/lib/discord-rpc.lib)
-    endif()
 else(WIN32) #MINGW
     add_definitions("-D_WIN32_WINNT=0x0600")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -s --static")
-    target_link_libraries(${PROJECT_NAME} discord-rpc ssl crypto ws2_32 ssp crypt32 z)
+    target_link_libraries(${PROJECT_NAME} ssl crypto ws2_32 ssp crypt32 z)
 endif(WIN32)
-target_include_directories(${PROJECT_NAME} PRIVATE "include")
+target_include_directories(${PROJECT_NAME} PRIVATE "include")
diff --git a/README.md b/README.md
@@ -2,6 +2,10 @@
 
 The launcher is the way we communitcate to outside the game, it does a few automated actions such as but not limited to: downloading the mod, launching the game, and create a connection to a server.
 
+## How to build
+
+1. `cmake . -B bin -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static`
+2. `cmake --build bin --parallel`
 
 Copyright (c) 2019-present Anonymous275.
 BeamMP Launcher code is not in the public domain and is not free software.

diff --git a/include/Discord/discord_info.h b/include/Discord/discord_info.h
diff --git a/include/Discord/discord_register.h b/include/Discord/discord_register.h
diff --git a/include/Discord/discord_rpc.h b/include/Discord/discord_rpc.h
diff --git a/include/Http.h b/include/Http.h
diff --git a/include/Logger.h b/include/Logger.h
@@ -15,3 +15,4 @@ void debug(const std::string& toPrint);
 void error(const std::string& toPrint);
 void info(const std::string& toPrint);
 void warn(const std::string& toPrint);
+std::string getDate();
diff --git a/include/Network/network.h b/include/Network/network.h
diff --git a/include/Security/Game.h b/include/Security/Game.h
diff --git a/include/Security/Init.h b/include/Security/Init.h
diff --git a/include/Startup.h b/include/Startup.h
diff --git a/include/Zlib/Compressor.h b/include/Zlib/Compressor.h
diff --git a/include/rapidjson/allocators.h b/include/rapidjson/allocators.h
diff --git a/include/rapidjson/cursorstreamwrapper.h b/include/rapidjson/cursorstreamwrapper.h
diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h
diff --git a/include/rapidjson/encodedstream.h b/include/rapidjson/encodedstream.h
diff --git a/include/rapidjson/encodings.h b/include/rapidjson/encodings.h
diff --git a/include/rapidjson/error/en.h b/include/rapidjson/error/en.h
diff --git a/include/rapidjson/error/error.h b/include/rapidjson/error/error.h
diff --git a/include/rapidjson/filereadstream.h b/include/rapidjson/filereadstream.h
diff --git a/include/rapidjson/filewritestream.h b/include/rapidjson/filewritestream.h
diff --git a/include/rapidjson/fwd.h b/include/rapidjson/fwd.h
diff --git a/include/rapidjson/internal/biginteger.h b/include/rapidjson/internal/biginteger.h
diff --git a/include/rapidjson/internal/clzll.h b/include/rapidjson/internal/clzll.h
diff --git a/include/rapidjson/internal/diyfp.h b/include/rapidjson/internal/diyfp.h
diff --git a/include/rapidjson/internal/dtoa.h b/include/rapidjson/internal/dtoa.h
diff --git a/include/rapidjson/internal/ieee754.h b/include/rapidjson/internal/ieee754.h
diff --git a/include/rapidjson/internal/itoa.h b/include/rapidjson/internal/itoa.h
diff --git a/include/rapidjson/internal/meta.h b/include/rapidjson/internal/meta.h
diff --git a/include/rapidjson/internal/pow10.h b/include/rapidjson/internal/pow10.h
diff --git a/include/rapidjson/internal/regex.h b/include/rapidjson/internal/regex.h
diff --git a/include/rapidjson/internal/stack.h b/include/rapidjson/internal/stack.h
diff --git a/include/rapidjson/internal/strfunc.h b/include/rapidjson/internal/strfunc.h
diff --git a/include/rapidjson/internal/strtod.h b/include/rapidjson/internal/strtod.h
diff --git a/include/rapidjson/internal/swap.h b/include/rapidjson/internal/swap.h
diff --git a/include/rapidjson/istreamwrapper.h b/include/rapidjson/istreamwrapper.h
diff --git a/include/rapidjson/memorybuffer.h b/include/rapidjson/memorybuffer.h
diff --git a/include/rapidjson/memorystream.h b/include/rapidjson/memorystream.h
diff --git a/include/rapidjson/msinttypes/inttypes.h b/include/rapidjson/msinttypes/inttypes.h
diff --git a/include/rapidjson/msinttypes/stdint.h b/include/rapidjson/msinttypes/stdint.h
diff --git a/include/rapidjson/ostreamwrapper.h b/include/rapidjson/ostreamwrapper.h
diff --git a/include/rapidjson/pointer.h b/include/rapidjson/pointer.h
diff --git a/include/rapidjson/prettywriter.h b/include/rapidjson/prettywriter.h
diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h
diff --git a/include/rapidjson/reader.h b/include/rapidjson/reader.h
diff --git a/include/rapidjson/schema.h b/include/rapidjson/schema.h
diff --git a/include/rapidjson/stream.h b/include/rapidjson/stream.h
diff --git a/include/rapidjson/stringbuffer.h b/include/rapidjson/stringbuffer.h
diff --git a/include/rapidjson/writer.h b/include/rapidjson/writer.h
diff --git a/src/Compressor.cpp b/src/Compressor.cpp
diff --git a/src/Config.cpp b/src/Config.cpp
diff --git a/src/Discord.cpp b/src/Discord.cpp
diff --git a/src/GameStart.cpp b/src/GameStart.cpp
diff --git a/src/Logger.cpp b/src/Logger.cpp
diff --git a/src/Network/Core.cpp b/src/Network/Core.cpp
diff --git a/src/Network/DNS.cpp b/src/Network/DNS.cpp
diff --git a/src/Network/GlobalHandler.cpp b/src/Network/GlobalHandler.cpp