Added launcher

This commit is contained in:
Shahzain Ali 2022-12-06 02:18:45 +05:00
parent b87c5f8a51
commit 5237058016
2 changed files with 11 additions and 33 deletions

View file

@ -308,11 +308,6 @@ endif()
if(IOS) if(IOS)
message("Client iOS build") message("Client iOS build")
# CONFIG += static
# CONFIG += file_copies
find_library(FW_AUTHENTICATIONSERVICES AuthenticationServices) find_library(FW_AUTHENTICATIONSERVICES AuthenticationServices)
find_library(FW_UIKIT UIKit) find_library(FW_UIKIT UIKit)
find_library(FW_FOUNDATION Foundation) find_library(FW_FOUNDATION Foundation)
@ -337,11 +332,6 @@ if(IOS)
${CMAKE_CURRENT_LIST_DIR}/platforms/ios/QtAppDelegate-C-Interface.h ${CMAKE_CURRENT_LIST_DIR}/platforms/ios/QtAppDelegate-C-Interface.h
) )
# i think in cmake it is not necessary? yes in iOS we are using native
# SOURCES -=
# platforms/ios/QRCodeReaderBase.cpp
# platforms/ios/MobileUtils.cpp
set(SOURCES ${SOURCES} set(SOURCES ${SOURCES}
${CMAKE_CURRENT_LIST_DIR}/protocols/ios_vpnprotocol.mm ${CMAKE_CURRENT_LIST_DIR}/protocols/ios_vpnprotocol.mm
${CMAKE_CURRENT_LIST_DIR}/platforms/ios/iosnotificationhandler.mm ${CMAKE_CURRENT_LIST_DIR}/platforms/ios/iosnotificationhandler.mm
@ -356,13 +346,6 @@ if(IOS)
# Q_ENABLE_BITCODE.value = NO
# Q_ENABLE_BITCODE.name = ENABLE_BITCODE
# QMAKE_MAC_XCODE_SETTINGS += Q_ENABLE_BITCODE
endif() endif()
if(CMAKE_OSX_SYSROOT STREQUAL "iphoneos") if(CMAKE_OSX_SYSROOT STREQUAL "iphoneos")
@ -371,22 +354,6 @@ if(CMAKE_OSX_SYSROOT STREQUAL "iphoneos")
# find_library(LIB_LIBCRYPTO NAMES "libcrypto.a"
# PATHS ${PROJECT_SOURCE_DIR}/3rd/OpenSSL/lib/ios/iphone/ NO_DEFAULT_PATH)
#find_library(LIB_SSL NAMES "libssl.a"
# PATHS ${PROJECT_SOURCE_DIR}/3rd/OpenSSL/lib/ios/iphone/ NO_DEFAULT_PATH)
#set(LIBS ${LIBS} LIB_LIBCRYPTO LIB_SSL)
# target_link_libraries(${PROJECT} PRIVATE ${LIB_LIBCRYPTO})
# target_link_libraries(${PROJECT} PRIVATE ${LIB_SSL})
endif() endif()
@ -497,6 +464,15 @@ target_include_directories(${PROJECT} PRIVATE ${CMAKE_SOURCE_DIR})
platforms/ios/iosvpnprotocol.swift platforms/ios/iosvpnprotocol.swift
platforms/ios/ioslogger.swift platforms/ios/ioslogger.swift
) )
target_sources(${PROJECT} PRIVATE
${CMAKE_SOURCE_DIR}/ios/app/launch.png
${CMAKE_SOURCE_DIR}/ios/app/AmneziaVPNLaunchScreen.storyboard)
set_source_files_properties(
${CMAKE_SOURCE_DIR}/ios/app/launch.png
${CMAKE_SOURCE_DIR}/ios/app/AmneziaVPNLaunchScreen.storyboard
PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
add_subdirectory(ios/networkextension) add_subdirectory(ios/networkextension)
add_dependencies(${PROJECT} networkextension) add_dependencies(${PROJECT} networkextension)
set_target_properties(${PROJECT} PROPERTIES XCODE_EMBED_APP_EXTENSIONS networkextension) set_target_properties(${PROJECT} PROPERTIES XCODE_EMBED_APP_EXTENSIONS networkextension)

View file

@ -49,5 +49,7 @@
<string>group.org.amnezia.amneziavpn</string> <string>group.org.amnezia.amneziavpn</string>
<key>UIViewControllerBasedStatusBarAppearance</key> <key>UIViewControllerBasedStatusBarAppearance</key>
<true/> <true/>
<key>NSCameraUsageDescription</key>
<string>Amnezia VPN needs access to the camera for reading QR-codes.</string>
</dict> </dict>
</plist> </plist>