diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index 0e9cadd..de11054 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -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' diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 68fa249..674f390 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -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' diff --git a/.gitmodules b/.gitmodules index 0c68433..49407e2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index b6c6881..324c55b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/include/rapidjson b/include/rapidjson deleted file mode 160000 index fd3dc29..0000000 --- a/include/rapidjson +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fd3dc29a5c2852df569e1ea81dbde2c412ac5051