diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dbf778d..8dc49f39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,14 +31,9 @@ set(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -if(APPLE AND NOT IOS) - set(CMAKE_OSX_ARCHITECTURES "x86_64") -endif() + +set(CMAKE_OSX_ARCHITECTURES "x86_64") + add_subdirectory(client) -if(NOT IOS AND NOT ANDROID) - add_subdirectory(service) - - include(${CMAKE_SOURCE_DIR}/deploy/installer/config.cmake) -endif() diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index e2714918..251a4aae 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -344,7 +344,7 @@ endif() if(IOS) include(cmake/ios.cmake) - include(cmake/ios-arch-fixup.cmake) + #include(cmake/ios-arch-fixup.cmake) elseif(APPLE AND NOT IOS) include(cmake/osxtools.cmake) include(cmake/macos.cmake) diff --git a/client/cmake/ios.cmake b/client/cmake/ios.cmake index 70e2ec6e..7b6b2cfd 100644 --- a/client/cmake/ios.cmake +++ b/client/cmake/ios.cmake @@ -1,10 +1,14 @@ message("Client iOS build") -set(CMAKE_OSX_DEPLOYMENT_TARGET 13.0) + +set_target_properties(${PROJECT} PROPERTIES MACOSX_BUNDLE TRUE) +set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE INTERNAL "" FORCE) +set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15) + set(APPLE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}) enable_language(OBJC) -enable_language(OBJCXX) +# enable_language(OBJCXX) enable_language(Swift) find_package(Qt6 REQUIRED COMPONENTS ShaderTools) @@ -111,13 +115,13 @@ target_sources(${PROJECT} PRIVATE ) target_sources(${PROJECT} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/AmneziaVPNLaunchScreen.storyboard + #${CMAKE_CURRENT_SOURCE_DIR}/ios/app/AmneziaVPNLaunchScreen.storyboard ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/Media.xcassets ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy ) set_property(TARGET ${PROJECT} APPEND PROPERTY RESOURCE - ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/AmneziaVPNLaunchScreen.storyboard + #${CMAKE_CURRENT_SOURCE_DIR}/ios/app/AmneziaVPNLaunchScreen.storyboard ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/Media.xcassets ${CMAKE_CURRENT_SOURCE_DIR}/ios/app/PrivacyInfo.xcprivacy ) diff --git a/client/ios/app/Info.plist.in b/client/ios/app/Info.plist.in index 45b08cc9..7587b4ce 100644 --- a/client/ios/app/Info.plist.in +++ b/client/ios/app/Info.plist.in @@ -26,21 +26,6 @@ ${MACOSX_BUNDLE_COPYRIGHT} ITSAppUsesNonExemptEncryption - LSRequiresIPhoneOS - - LSSupportsOpeningDocumentsInPlace - - UILaunchStoryboardName - AmneziaVPNLaunchScreen - UIRequiredDeviceCapabilities - - UIRequiresFullScreen - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationPortrait - UISupportedInterfaceOrientations~ipad UIUserInterfaceStyle