github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 02:40:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolved conflict...

Browse Source 
...In a not only quite straightforward but also extremely hacky method.
This commit is contained in:
Qv2ray-dev 2020-02-26 17:30:49 +08:00 committed by GitHub
parent 784e995dbf
commit a4754eccdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makespec/03-Windows.pri
View File

@ -3,6 +3,14 @@ message("Configuring for Windows environment")
QMAKE_CXXFLAGS += /MP /wo4251 QMAKE_CXXFLAGS += /MP /wo4251
DEFINES += QHTTPSERVER_EXPORT DEFINES += QHTTPSERVER_EXPORT
!has_std_byte {
message("WARN: c++17 std::byte is disabled")
DEFINES += _HAS_STD_BYTE=0
} else {
message("WARN: You are playing with a conflict between c++17 std::byte and Windows.h typedef byte")
message(" --> Be careful and good luck")
}
CONFIG += Qv2ray_Windows use_grpc CONFIG += Qv2ray_Windows use_grpc
!contains(QMAKE_TARGET.arch, x86_64) { !contains(QMAKE_TARGET.arch, x86_64) {
CONFIG+=Qv2ray_win32 CONFIG+=Qv2ray_win32