From 75585f3d488327a96345ab1fdaa64cd025f6e3d9 Mon Sep 17 00:00:00 2001 From: Paolo Marrone Date: Mon, 8 Jul 2024 15:22:14 +0200 Subject: [PATCH] fixes --- templates/ios-make/Makefile | 2 +- templates/ios-make/project.yml | 44 ++++++++++++++++++---------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/templates/ios-make/Makefile b/templates/ios-make/Makefile index 855f8c2..610d122 100644 --- a/templates/ios-make/Makefile +++ b/templates/ios-make/Makefile @@ -21,7 +21,7 @@ include vars.mk COMMON_DIR := $(or $(COMMON_DIR),.) -DATA_DIR := $(or $(DATA_DIR),.) +DATA_DIR := $(or $(DATA_DIR),.) PLUGIN_DIR := $(or $(PLUGIN_DIR),src) SOURCES := \ diff --git a/templates/ios-make/project.yml b/templates/ios-make/project.yml index 707bb85..d4639ac 100644 --- a/templates/ios-make/project.yml +++ b/templates/ios-make/project.yml @@ -20,39 +20,41 @@ name: {{=it.product.bundleName}} targets: - {{=it.product.bundleName}}: + {{=it.product.bundleName}}: {{?it.ios_make.supportedDestinations}} - supportedDestinations: {{=Array.isArray(it.ios_make.supportedDestinations) ? "[" + it.ios_make.supportedDestinations.toString() + "]" : it.ios_make.supportedDestinations}} + supportedDestinations: {{=Array.isArray(it.ios_make.supportedDestinations) ? "[" + it.ios_make.supportedDestinations.toString() + "]" : it.ios_make.supportedDestinations}} {{??}} - platform: [iOS] + platform: [iOS] {{?}} - deploymentTarget: "{{=it.ios_make.deploymentTarget}}" - type: application - sources: - - path: src - settings: - base: - PRODUCT_BUNDLE_IDENTIFIER: {{=it.ios.productBundleIdentifier}} - SWIFT_OBJC_BRIDGING_HEADER: src/app-Bridging-Header.h + deploymentTarget: "{{=it.ios_make.deploymentTarget}}" + type: application + sources: + - path: src + dependencies: + + settings: + base: + PRODUCT_BUNDLE_IDENTIFIER: {{=it.ios.productBundleIdentifier}} + SWIFT_OBJC_BRIDGING_HEADER: src/app-Bridging-Header.h {{?it.ios_make.headerSearchPaths}} - HEADER_SEARCH_PATHS: {{~it.ios_make.headerSearchPaths :p}} - - {{=p}}{{~}} + HEADER_SEARCH_PATHS: {{~it.ios_make.headerSearchPaths :p}} + - {{=p}}{{~}} {{?}} - info: - path: Info.plist + info: + path: Info.plist {{?(it.product.buses.filter(x => x.type == "audio" && x.direction == "input").length > 0) || it.ios_make.infoProperties || it.ios_make.uiLaunchScreen}} - properties: + properties: {{?it.product.buses.filter(x => x.type == "audio" && x.direction == "input").length > 0}} - NSMicrophoneUsageDescription: Need audio input for processing sound + NSMicrophoneUsageDescription: Need audio input for processing sound {{?}} {{?it.ios_make.infoProperties}} {{~it.ios_make.infoProperties :p}} - {{=p.key}}: {{=Array.isArray(p.value) ? "[" + p.value.toString() + "]" : p.value}} + {{=p.key}}: {{=Array.isArray(p.value) ? "[" + p.value.toString() + "]" : p.value}} {{~}} {{?}} {{?it.ios_make.launchScreen}} - UILaunchScreen: - UIColorName: {{=it.ios_make.launchScreen.colorName}} - UIImageName: {{=it.ios_make.launchScreen.imageName}} + UILaunchScreen: + UIColorName: {{=it.ios_make.launchScreen.colorName}} + UIImageName: {{=it.ios_make.launchScreen.imageName}} {{?}} {{?}}