Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixup various bits #79

Merged
merged 8 commits into from
Jun 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.10)

project(Launcher)

if (WIN32)
Expand All @@ -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")
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
15 changes: 0 additions & 15 deletions include/Discord/discord_info.h

This file was deleted.

26 changes: 0 additions & 26 deletions include/Discord/discord_register.h

This file was deleted.

87 changes: 0 additions & 87 deletions include/Discord/discord_rpc.h

This file was deleted.

Empty file modified include/Http.h
100755 → 100644
Empty file.
1 change: 1 addition & 0 deletions include/Logger.h
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Empty file modified include/Network/network.h
100755 → 100644
Empty file.
Empty file modified include/Security/Game.h
100755 → 100644
Empty file.
Empty file modified include/Security/Init.h
100755 → 100644
Empty file.
Empty file modified include/Startup.h
100755 → 100644
Empty file.
Empty file modified include/Zlib/Compressor.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/allocators.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/cursorstreamwrapper.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/document.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/encodedstream.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/encodings.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/error/en.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/error/error.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/filereadstream.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/filewritestream.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/fwd.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/biginteger.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/clzll.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/diyfp.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/dtoa.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/ieee754.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/itoa.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/meta.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/pow10.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/regex.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/stack.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/strfunc.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/strtod.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/internal/swap.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/istreamwrapper.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/memorybuffer.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/memorystream.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/msinttypes/inttypes.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/msinttypes/stdint.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/ostreamwrapper.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/pointer.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/prettywriter.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/rapidjson.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/reader.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/schema.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/stream.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/stringbuffer.h
100755 → 100644
Empty file.
Empty file modified include/rapidjson/writer.h
100755 → 100644
Empty file.
Empty file modified src/Compressor.cpp
100755 → 100644
Empty file.
Empty file modified src/Config.cpp
100755 → 100644
Empty file.
111 changes: 0 additions & 111 deletions src/Discord.cpp

This file was deleted.

Empty file modified src/GameStart.cpp
100755 → 100644
Empty file.
Empty file modified src/Logger.cpp
100755 → 100644
Empty file.
Empty file modified src/Network/Core.cpp
100755 → 100644
Empty file.
Empty file modified src/Network/DNS.cpp
100755 → 100644
Empty file.
Empty file modified src/Network/GlobalHandler.cpp
100755 → 100644
Empty file.
Loading
Loading