mirror of
https://github.com/pocoproject/poco.git
synced 2025-11-24 22:29:47 +01:00
added ARM64 and iPhone 5 S 64-bit support
This commit is contained in:
@@ -193,6 +193,15 @@
|
|||||||
#else
|
#else
|
||||||
#define POCO_ARCH_LITTLE_ENDIAN 1
|
#define POCO_ARCH_LITTLE_ENDIAN 1
|
||||||
#endif
|
#endif
|
||||||
|
#elif defined(__arm64__) || defined(__arm64)
|
||||||
|
#define POCO_ARCH POCO_ARCH_ARM64
|
||||||
|
#if defined(__ARMEB__)
|
||||||
|
#define POCO_ARCH_BIG_ENDIAN 1
|
||||||
|
#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
||||||
|
#define POCO_ARCH_BIG_ENDIAN 1
|
||||||
|
#else
|
||||||
|
#define POCO_ARCH_LITTLE_ENDIAN 1
|
||||||
|
#endif
|
||||||
#elif defined(__m68k__)
|
#elif defined(__m68k__)
|
||||||
#define POCO_ARCH POCO_ARCH_M68K
|
#define POCO_ARCH POCO_ARCH_M68K
|
||||||
#define POCO_ARCH_BIG_ENDIAN 1
|
#define POCO_ARCH_BIG_ENDIAN 1
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ namespace Poco {
|
|||||||
#define POCO_HAVE_INT64 1
|
#define POCO_HAVE_INT64 1
|
||||||
#elif defined(__GNUC__) || defined(__clang__)
|
#elif defined(__GNUC__) || defined(__clang__)
|
||||||
//
|
//
|
||||||
// Unix/GCC
|
// Unix/GCC/Clang
|
||||||
//
|
//
|
||||||
typedef signed char Int8;
|
typedef signed char Int8;
|
||||||
typedef unsigned char UInt8;
|
typedef unsigned char UInt8;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# $Id: //poco/1.4/build/config/iPhone#3 $
|
# $Id: //poco/1.4/build/config/iPhone#4 $
|
||||||
#
|
#
|
||||||
# iPhone
|
# iPhone
|
||||||
#
|
#
|
||||||
@@ -23,14 +23,14 @@ LINKMODE ?= STATIC
|
|||||||
# Otherwise use the version found.
|
# Otherwise use the version found.
|
||||||
|
|
||||||
IPHONE_SDK ?= iPhoneOS
|
IPHONE_SDK ?= iPhoneOS
|
||||||
IPHONE_SDK_ROOT ?= $(shell xcode-select -print-path)/Platforms/$(IPHONE_SDK).platform/Developer/SDKs
|
IPHONE_SDK_ROOT = $(shell xcode-select -print-path)/Platforms/$(IPHONE_SDK).platform/Developer/SDKs
|
||||||
IPHONE_SDK_ROOT_DIR = $(IPHONE_SDK_ROOT)/$(IPHONE_SDK)
|
IPHONE_SDK_ROOT_DIR = $(IPHONE_SDK_ROOT)/$(IPHONE_SDK)
|
||||||
IPHONE_SDK_BASE = $(shell ls -d $(IPHONE_SDK_ROOT_DIR)$(IPHONE_SDK_VERSION)*.sdk | tail -1)
|
IPHONE_SDK_BASE = $(shell ls -d $(IPHONE_SDK_ROOT_DIR)$(IPHONE_SDK_VERSION)*.sdk | tail -1)
|
||||||
IPHONE_SDK_VERSION_MIN ?= $(patsubst %.sdk,%,$(patsubst $(IPHONE_SDK_ROOT_DIR)%,%,$(IPHONE_SDK_BASE)))
|
IPHONE_SDK_VERSION_MIN ?= $(patsubst %.sdk,%,$(patsubst $(IPHONE_SDK_ROOT_DIR)%,%,$(IPHONE_SDK_BASE)))
|
||||||
|
|
||||||
POCO_TARGET_OSNAME ?= $(IPHONE_SDK)
|
POCO_TARGET_OSNAME ?= $(IPHONE_SDK)
|
||||||
POCO_TARGET_OSARCH ?= armv6
|
POCO_TARGET_OSARCH ?= armv6
|
||||||
TOOL_PREFIX ?= $(shell xcode-select -print-path)/Platforms/$(IPHONE_SDK).platform/Developer/usr/bin
|
TOOL_PREFIX ?= /Developer/Platforms/$(IPHONE_SDK).platform/Developer/usr/bin
|
||||||
OSFLAGS ?= -arch $(POCO_TARGET_OSARCH) -isysroot $(IPHONE_SDK_BASE) -mthumb -miphoneos-version-min=$(IPHONE_SDK_VERSION_MIN)
|
OSFLAGS ?= -arch $(POCO_TARGET_OSARCH) -isysroot $(IPHONE_SDK_BASE) -mthumb -miphoneos-version-min=$(IPHONE_SDK_VERSION_MIN)
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -89,7 +89,7 @@ RELEASEOPT_LINK =
|
|||||||
#
|
#
|
||||||
# System Specific Flags
|
# System Specific Flags
|
||||||
#
|
#
|
||||||
SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_STAT64 -DPOCO_NO_SHAREDLIBS -DPOCO_NO_NET_IFTYPES
|
SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_STAT64 -DPOCO_NO_SHAREDLIBS
|
||||||
|
|
||||||
#
|
#
|
||||||
# System Specific Libraries
|
# System Specific Libraries
|
||||||
|
|||||||
101
build/config/iPhone-clang
Normal file
101
build/config/iPhone-clang
Normal file
@@ -0,0 +1,101 @@
|
|||||||
|
#
|
||||||
|
# $Id: //poco/1.4/build/config/iPhone-clang#2 $
|
||||||
|
#
|
||||||
|
# iPhone-clang
|
||||||
|
#
|
||||||
|
# Build settings for iPhone OS, using Apple's iPhone SDK
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# General Settings
|
||||||
|
#
|
||||||
|
# iPhone OS does not allow dynamic linking to user libraries
|
||||||
|
#
|
||||||
|
LINKMODE ?= STATIC
|
||||||
|
|
||||||
|
#
|
||||||
|
# If the SDK is defined use it
|
||||||
|
# Otherwise find the latest version installed
|
||||||
|
#
|
||||||
|
# IPHONE_SDK_VERSION = 2.2.1
|
||||||
|
|
||||||
|
# if IPHONE_SDK_VERSION_MIN is defined use that
|
||||||
|
# Otherwise use the version found.
|
||||||
|
|
||||||
|
IPHONE_SDK ?= iPhoneOS
|
||||||
|
IPHONE_SDK_ROOT ?= $(shell xcode-select -print-path)/Platforms/$(IPHONE_SDK).platform/Developer/SDKs
|
||||||
|
IPHONE_SDK_ROOT_DIR = $(IPHONE_SDK_ROOT)/$(IPHONE_SDK)
|
||||||
|
IPHONE_SDK_BASE = $(shell ls -d $(IPHONE_SDK_ROOT_DIR)$(IPHONE_SDK_VERSION)*.sdk | tail -1)
|
||||||
|
IPHONE_SDK_VERSION_MIN ?= $(patsubst %.sdk,%,$(patsubst $(IPHONE_SDK_ROOT_DIR)%,%,$(IPHONE_SDK_BASE)))
|
||||||
|
|
||||||
|
POCO_TARGET_OSNAME ?= $(IPHONE_SDK)
|
||||||
|
POCO_TARGET_OSARCH ?= armv7
|
||||||
|
TOOL_PREFIX ?= $(shell xcode-select -print-path)/Platforms/$(IPHONE_SDK).platform/Developer/usr/bin
|
||||||
|
ifneq ($(POCO_TARGET_OSARCH),arm64)
|
||||||
|
THUMB = -mthumb
|
||||||
|
endif
|
||||||
|
OSFLAGS ?= -arch $(POCO_TARGET_OSARCH) -isysroot $(IPHONE_SDK_BASE) $(THUMB) -miphoneos-version-min=$(IPHONE_SDK_VERSION_MIN)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Tools
|
||||||
|
#
|
||||||
|
# If GCC_VER is defined then use it.
|
||||||
|
# Otherwise select the latest version
|
||||||
|
#
|
||||||
|
|
||||||
|
CC = $(shell xcrun -find clang)
|
||||||
|
CXX = $(shell xcrun -find clang++)
|
||||||
|
|
||||||
|
LINK = $(CXX) -bind_at_load
|
||||||
|
LIB = libtool -static -o
|
||||||
|
RANLIB = ranlib
|
||||||
|
SHLIB = $(CXX) $(OSFLAGS) -dynamiclib -Wl,-install_name,$@ -o $@
|
||||||
|
DYLIB = $(CXX) $(OSFLAGS) -dynamic -bundle -read_only_relocs suppress -Wl,-bind_at_load -o $@
|
||||||
|
SHLIBLN = $(POCO_BASE)/build/script/shlibln
|
||||||
|
STRIP =
|
||||||
|
DEP = $(POCO_BASE)/build/script/makedepend.gcc
|
||||||
|
SHELL = sh
|
||||||
|
RM = rm -rf
|
||||||
|
CP = cp
|
||||||
|
MKDIR = mkdir -p
|
||||||
|
|
||||||
|
#
|
||||||
|
# Extension for Shared Libraries
|
||||||
|
#
|
||||||
|
SHAREDLIBEXT = .$(target_version).dylib
|
||||||
|
SHAREDLIBLINKEXT = .dylib
|
||||||
|
|
||||||
|
#
|
||||||
|
# Compiler and Linker Flags
|
||||||
|
#
|
||||||
|
CFLAGS = $(OSFLAGS)
|
||||||
|
CFLAGS32 =
|
||||||
|
CFLAGS64 =
|
||||||
|
CXXFLAGS = $(OSFLAGS) -Wall -Wno-sign-compare
|
||||||
|
CXXFLAGS32 =
|
||||||
|
CXXFLAGS64 =
|
||||||
|
LINKFLAGS = $(OSFLAGS)
|
||||||
|
LINKFLAGS32 =
|
||||||
|
LINKFLAGS64 =
|
||||||
|
STATICOPT_CC =
|
||||||
|
STATICOPT_CXX =
|
||||||
|
STATICOPT_LINK =
|
||||||
|
SHAREDOPT_CC = -fPIC
|
||||||
|
SHAREDOPT_CXX = -fPIC
|
||||||
|
SHAREDOPT_LINK =
|
||||||
|
DEBUGOPT_CC = -g -D_DEBUG=$(DEBUGLEVEL)
|
||||||
|
DEBUGOPT_CXX = -g -D_DEBUG=$(DEBUGLEVEL)
|
||||||
|
DEBUGOPT_LINK =
|
||||||
|
RELEASEOPT_CC = -DNDEBUG -O2
|
||||||
|
RELEASEOPT_CXX = -DNDEBUG -O
|
||||||
|
RELEASEOPT_LINK =
|
||||||
|
|
||||||
|
#
|
||||||
|
# System Specific Flags
|
||||||
|
#
|
||||||
|
SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_STAT64 -DPOCO_NO_SHAREDLIBS -DPOCO_NO_NET_IFTYPES
|
||||||
|
|
||||||
|
#
|
||||||
|
# System Specific Libraries
|
||||||
|
#
|
||||||
|
SYSLIBS = -ldl
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# $Id: //poco/1.4/build/config/iPhone#3 $
|
# $Id: //poco/1.4/build/config/iPhone-clang-libc++#2 $
|
||||||
#
|
#
|
||||||
# iPhone
|
# iPhone-clang-libc++
|
||||||
#
|
#
|
||||||
# Build settings for iPhone OS, using Apple's iPhone SDK
|
# Build settings for iPhone OS, using Apple's iPhone SDK
|
||||||
#
|
#
|
||||||
@@ -31,7 +31,10 @@ IPHONE_SDK_VERSION_MIN ?= $(patsubst %.sdk,%,$(patsubst $(IPHONE_SDK_ROOT_DIR)%,
|
|||||||
POCO_TARGET_OSNAME ?= $(IPHONE_SDK)
|
POCO_TARGET_OSNAME ?= $(IPHONE_SDK)
|
||||||
POCO_TARGET_OSARCH ?= armv7
|
POCO_TARGET_OSARCH ?= armv7
|
||||||
TOOL_PREFIX ?= $(shell xcode-select -print-path)/Platforms/$(IPHONE_SDK).platform/Developer/usr/bin
|
TOOL_PREFIX ?= $(shell xcode-select -print-path)/Platforms/$(IPHONE_SDK).platform/Developer/usr/bin
|
||||||
OSFLAGS ?= -arch $(POCO_TARGET_OSARCH) -isysroot $(IPHONE_SDK_BASE) -mthumb -miphoneos-version-min=$(IPHONE_SDK_VERSION_MIN)
|
ifneq ($(POCO_TARGET_OSARCH),arm64)
|
||||||
|
THUMB = -mthumb
|
||||||
|
endif
|
||||||
|
OSFLAGS ?= -arch $(POCO_TARGET_OSARCH) -isysroot $(IPHONE_SDK_BASE) $(THUMB) -miphoneos-version-min=$(IPHONE_SDK_VERSION_MIN)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Tools
|
# Tools
|
||||||
|
|||||||
13
build/config/iPhoneSimulator-clang
Normal file
13
build/config/iPhoneSimulator-clang
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
#
|
||||||
|
# $Id: //poco/1.4/build/config/iPhoneSimulator-clang#1 $
|
||||||
|
#
|
||||||
|
# iPhoneSimulator-clang
|
||||||
|
#
|
||||||
|
# Build settings for iPhone Simulator, using Apple's iPhone SDK
|
||||||
|
#
|
||||||
|
|
||||||
|
IPHONE_SDK = iPhoneSimulator
|
||||||
|
POCO_TARGET_OSARCH = i686
|
||||||
|
OSFLAGS = -arch $(POCO_TARGET_OSARCH) -isysroot $(IPHONE_SDK_BASE) -miphoneos-version-min=$(IPHONE_SDK_VERSION_MIN)
|
||||||
|
|
||||||
|
include $(POCO_BASE)/build/config/iPhone-clang
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# $Id: //poco/1.4/build/config/iPhoneSimulator#1 $
|
# $Id: //poco/1.4/build/config/iPhoneSimulator-clang-libc++#1 $
|
||||||
#
|
#
|
||||||
# iPhoneSimulator
|
# iPhoneSimulator-clang-libc++
|
||||||
#
|
#
|
||||||
# Build settings for iPhone Simulator, using Apple's iPhone SDK
|
# Build settings for iPhone Simulator, using Apple's iPhone SDK
|
||||||
#
|
#
|
||||||
|
|||||||
Reference in New Issue
Block a user