AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'qt_migration' into feature/android_qt6_moving

Browse source
This commit is contained in:
Dmitry Karpushin 2023-01-16 14:58:01 +03:00 • committed by GitHub
commit 21779395ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
205 changed files with 1106 additions and 11973 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/CMakeLists.txt
View file

@ -296,8 +296,6 @@ endif()
if(IOS)
message("Client iOS build")
find_package(Qt6 REQUIRED COMPONENTS ShaderTools)
set(LIBS ${LIBS} Qt6::ShaderTools)
@ -350,7 +348,11 @@ qt_add_executable(${PROJECT} ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
qt_add_translations(${PROJECT} TS_FILES
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts)
# NETWORKEXTENSION=1
if(APPLE AND NOT IOS)
set_target_properties(AmneziaVPN PROPERTIES
MACOSX_BUNDLE TRUE
)
endif()
if(IOS)
enable_language(OBJC)