mirror of
https://github.com/BeamMP/BeamMP-Launcher.git
synced 2026-06-19 23:20:57 +00:00
vcpkg to handle rapidjson
This commit is contained in:
@@ -18,7 +18,7 @@ jobs:
|
|||||||
uses: lukka/run-vcpkg@v7
|
uses: lukka/run-vcpkg@v7
|
||||||
id: runvcpkg
|
id: runvcpkg
|
||||||
with:
|
with:
|
||||||
vcpkgArguments: 'zlib discord-rpc openssl'
|
vcpkgArguments: 'zlib discord-rpc rapidjson openssl'
|
||||||
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
|
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
|
||||||
vcpkgGitCommitId: '75522bb1f2e7d863078bcd06322348f053a9e33f'
|
vcpkgGitCommitId: '75522bb1f2e7d863078bcd06322348f053a9e33f'
|
||||||
vcpkgTriplet: 'x64-windows-static'
|
vcpkgTriplet: 'x64-windows-static'
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ jobs:
|
|||||||
uses: lukka/run-vcpkg@main
|
uses: lukka/run-vcpkg@main
|
||||||
id: runvcpkg
|
id: runvcpkg
|
||||||
with:
|
with:
|
||||||
vcpkgArguments: 'zlib discord-rpc openssl'
|
vcpkgArguments: 'zlib discord-rpc rapidjson openssl'
|
||||||
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
|
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
|
||||||
vcpkgGitCommitId: '75522bb1f2e7d863078bcd06322348f053a9e33f'
|
vcpkgGitCommitId: '75522bb1f2e7d863078bcd06322348f053a9e33f'
|
||||||
vcpkgTriplet: 'x64-windows-static'
|
vcpkgTriplet: 'x64-windows-static'
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
[submodule "wxWidgets"]
|
[submodule "wxWidgets"]
|
||||||
path = include/wxWidgets
|
path = include/wxWidgets
|
||||||
url = https://github.com/wxWidgets/wxWidgets.git
|
url = https://github.com/wxWidgets/wxWidgets.git
|
||||||
[submodule "rapidjson"]
|
|
||||||
path = include/rapidjson
|
|
||||||
url = https://github.com/Tencent/rapidjson.git
|
|
||||||
[submodule "include/cpp-httplib"]
|
[submodule "include/cpp-httplib"]
|
||||||
path = include/cpp-httplib
|
path = include/cpp-httplib
|
||||||
url = https://github.com/yhirose/cpp-httplib.git
|
url = https://github.com/yhirose/cpp-httplib.git
|
||||||
|
|||||||
@@ -18,12 +18,10 @@ endif(WIN32)
|
|||||||
set(wxUSE_STL ON)
|
set(wxUSE_STL ON)
|
||||||
set(BUILD_EXAMPLES OFF)
|
set(BUILD_EXAMPLES OFF)
|
||||||
set(wxBUILD_SHARED OFF)
|
set(wxBUILD_SHARED OFF)
|
||||||
set(build_static_lib ON)
|
|
||||||
set(wxBUILD_MSVC_MULTIPROC ON)
|
set(wxBUILD_MSVC_MULTIPROC ON)
|
||||||
set(wxBUILD_USE_STATIC_RUNTIME ON)
|
set(wxBUILD_USE_STATIC_RUNTIME ON)
|
||||||
|
|
||||||
add_subdirectory(include/wxWidgets)
|
add_subdirectory(include/wxWidgets)
|
||||||
add_subdirectory(include/rapidjson)
|
|
||||||
add_subdirectory(include/cpp-httplib)
|
add_subdirectory(include/cpp-httplib)
|
||||||
add_subdirectory(include/tomlplusplus)
|
add_subdirectory(include/tomlplusplus)
|
||||||
|
|
||||||
@@ -54,5 +52,3 @@ else(WIN32) #MINGW
|
|||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
add_definitions(-DELPP_NO_DEFAULT_LOG_FILE)
|
add_definitions(-DELPP_NO_DEFAULT_LOG_FILE)
|
||||||
target_include_directories(${PROJECT_NAME} PRIVATE "include")
|
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")
|
|
||||||
|
|||||||
Submodule include/rapidjson deleted from fd3dc29a5c
Reference in New Issue
Block a user