mirror of
https://github.com/BeamMP/BeamMP-Launcher.git
synced 2025-08-17 08:46:24 +00:00
vcpkg to handle rapidjson
This commit is contained in:
parent
06073727de
commit
f68e650202
2
.github/workflows/cmake-windows.yml
vendored
2
.github/workflows/cmake-windows.yml
vendored
@ -18,7 +18,7 @@ jobs:
|
||||
uses: lukka/run-vcpkg@v7
|
||||
id: runvcpkg
|
||||
with:
|
||||
vcpkgArguments: 'zlib discord-rpc openssl'
|
||||
vcpkgArguments: 'zlib discord-rpc rapidjson openssl'
|
||||
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
|
||||
vcpkgGitCommitId: '75522bb1f2e7d863078bcd06322348f053a9e33f'
|
||||
vcpkgTriplet: 'x64-windows-static'
|
||||
|
2
.github/workflows/release-build.yml
vendored
2
.github/workflows/release-build.yml
vendored
@ -42,7 +42,7 @@ jobs:
|
||||
uses: lukka/run-vcpkg@main
|
||||
id: runvcpkg
|
||||
with:
|
||||
vcpkgArguments: 'zlib discord-rpc openssl'
|
||||
vcpkgArguments: 'zlib discord-rpc rapidjson openssl'
|
||||
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
|
||||
vcpkgGitCommitId: '75522bb1f2e7d863078bcd06322348f053a9e33f'
|
||||
vcpkgTriplet: 'x64-windows-static'
|
||||
|
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,9 +1,6 @@
|
||||
[submodule "wxWidgets"]
|
||||
path = include/wxWidgets
|
||||
url = https://github.com/wxWidgets/wxWidgets.git
|
||||
[submodule "rapidjson"]
|
||||
path = include/rapidjson
|
||||
url = https://github.com/Tencent/rapidjson.git
|
||||
[submodule "include/cpp-httplib"]
|
||||
path = include/cpp-httplib
|
||||
url = https://github.com/yhirose/cpp-httplib.git
|
||||
|
@ -18,12 +18,10 @@ endif(WIN32)
|
||||
set(wxUSE_STL ON)
|
||||
set(BUILD_EXAMPLES OFF)
|
||||
set(wxBUILD_SHARED OFF)
|
||||
set(build_static_lib ON)
|
||||
set(wxBUILD_MSVC_MULTIPROC ON)
|
||||
set(wxBUILD_USE_STATIC_RUNTIME ON)
|
||||
|
||||
add_subdirectory(include/wxWidgets)
|
||||
add_subdirectory(include/rapidjson)
|
||||
add_subdirectory(include/cpp-httplib)
|
||||
add_subdirectory(include/tomlplusplus)
|
||||
|
||||
@ -54,5 +52,3 @@ else(WIN32) #MINGW
|
||||
endif(WIN32)
|
||||
add_definitions(-DELPP_NO_DEFAULT_LOG_FILE)
|
||||
target_include_directories(${PROJECT_NAME} PRIVATE "include")
|
||||
target_include_directories(${PROJECT_NAME} PRIVATE "include/rapidjson/include")
|
||||
target_include_directories(${PROJECT_NAME} PRIVATE "include/discord-rpc/include")
|
||||
|
@ -1 +0,0 @@
|
||||
Subproject commit fd3dc29a5c2852df569e1ea81dbde2c412ac5051
|
Loading…
x
Reference in New Issue
Block a user