mirror of
https://github.com/pocoproject/poco.git
synced 2024-12-19 20:32:15 +01:00
Merge branch 'develop' of https://github.com/pocoproject/poco into develop
This commit is contained in:
commit
d585599153
@ -31,7 +31,7 @@ TVOS_SDK_VERSION_MIN ?= $(patsubst %.sdk,%,$(patsubst $(TVOS_SDK_ROOT_DIR)%,%,$(
|
||||
POCO_TARGET_OSNAME ?= $(TVOS_SDK)
|
||||
POCO_TARGET_OSARCH ?= arm64
|
||||
TOOL_PREFIX ?= $(shell xcode-select -print-path)/Platforms/$(TVOS_SDK).platform/Developer/usr/bin
|
||||
OSFLAGS ?= -arch $(POCO_TARGET_OSARCH) -isysroot $(TVOS_SDK_BASE) -mtvos-version-min=$(TVOS_SDK_VERSION_MIN)
|
||||
OSFLAGS ?= -arch $(POCO_TARGET_OSARCH) -isysroot $(TVOS_SDK_BASE) -mtvos-version-min=$(TVOS_SDK_VERSION_MIN) -fembed-bitcode
|
||||
|
||||
#
|
||||
# Tools
|
||||
|
@ -8,6 +8,6 @@
|
||||
|
||||
TVOS_SDK = AppleTVSimulator
|
||||
POCO_TARGET_OSARCH = x86_64
|
||||
OSFLAGS = -arch $(POCO_TARGET_OSARCH) -isysroot $(TVOS_SDK_BASE) -mtvos-simulator-version-min=$(TVOS_SDK_VERSION_MIN)
|
||||
OSFLAGS = -arch $(POCO_TARGET_OSARCH) -isysroot $(TVOS_SDK_BASE) -mtvos-simulator-version-min=$(TVOS_SDK_VERSION_MIN) -fembed-bitcode
|
||||
|
||||
include $(POCO_BASE)/build/config/AppleTV
|
||||
|
@ -31,7 +31,7 @@ WATCHOS_SDK_VERSION_MIN ?= $(patsubst %.sdk,%,$(patsubst $(WATCHOS_SDK_ROOT_DIR)
|
||||
POCO_TARGET_OSNAME ?= $(WATCHOS_SDK)
|
||||
POCO_TARGET_OSARCH ?= armv7k
|
||||
TOOL_PREFIX ?= $(shell xcode-select -print-path)/Platforms/$(WATCHOS_SDK).platform/Developer/usr/bin
|
||||
OSFLAGS ?= -arch $(POCO_TARGET_OSARCH) -isysroot $(WATCHOS_SDK_BASE) -mwatchos-version-min=$(WATCHOS_SDK_VERSION_MIN)
|
||||
OSFLAGS ?= -arch $(POCO_TARGET_OSARCH) -isysroot $(WATCHOS_SDK_BASE) -mwatchos-version-min=$(WATCHOS_SDK_VERSION_MIN) -fembed-bitcode
|
||||
|
||||
#
|
||||
# Tools
|
||||
|
@ -8,6 +8,6 @@
|
||||
|
||||
WATCHOS_SDK = WatchSimulator
|
||||
POCO_TARGET_OSARCH = i386
|
||||
OSFLAGS = -arch $(POCO_TARGET_OSARCH) -isysroot $(WATCHOS_SDK_BASE) -mwatchos-simulator-version-min=$(WATCHOS_SDK_VERSION_MIN)
|
||||
OSFLAGS = -arch $(POCO_TARGET_OSARCH) -isysroot $(WATCHOS_SDK_BASE) -mwatchos-simulator-version-min=$(WATCHOS_SDK_VERSION_MIN) -fembed-bitcode
|
||||
|
||||
include $(POCO_BASE)/build/config/WatchOS
|
||||
|
Loading…
Reference in New Issue
Block a user