mirror of
https://github.com/Qv2ray/Qv2ray.git
synced 2025-05-20 19:00:22 +08:00
Re-enable grpc support for mac (#386) by @ymshenyu
* re-enable grpc support for mac * update -1 * update -2 * update -3 * update -4 * update build version * DONE
This commit is contained in:
parent
804422a2c4
commit
cf25d760c7
4
.github/workflows/build-qv2ray.yml
vendored
4
.github/workflows/build-qv2ray.yml
vendored
@ -60,7 +60,9 @@ jobs:
|
||||
|
||||
- name: macOS - Install Packages
|
||||
if: matrix.platform == 'macos-latest'
|
||||
run: brew install protobuf
|
||||
run: |
|
||||
brew install protobuf
|
||||
brew install grpc
|
||||
|
||||
- name: Windows - Install Packages
|
||||
if: matrix.platform == 'windows-latest'
|
||||
|
@ -3,9 +3,14 @@ message(" ")
|
||||
# For Linux and macOS
|
||||
message("Configuring for macOS specific environment")
|
||||
LIBS += -framework Carbon -framework Cocoa
|
||||
|
||||
use_grpc: error("The use of gRPC backend is not supported on macOS platform.")
|
||||
|
||||
message(" --> Linking libqvb static library and Security framework, for macOS platform.")
|
||||
LIBS += -L$$PWD/../libs/ -lqvb-darwin
|
||||
message(" --> Linking Security framework, for macOS platform.")
|
||||
LIBS += -framework Security
|
||||
|
||||
use_grpc {
|
||||
# For gRPC and protobuf in macOS
|
||||
message(" --> Linking against gRPC library.")
|
||||
LIBS += -L/usr/local/lib -lgrpc++ -lgrpc -lgpr -lupb
|
||||
} else {
|
||||
message(" --> Linking libqvb static library, for macOS platform.")
|
||||
LIBS += -L$$PWD/../libs/ -lqvb-darwin
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
3862
|
||||
3867
|
||||
|
Loading…
Reference in New Issue
Block a user