提交 7e4d6a93 编写于 作者: K katleman

Merge

...@@ -406,10 +406,16 @@ endif ...@@ -406,10 +406,16 @@ endif
LIB_LOCATION ?= $(LIBDIR) LIB_LOCATION ?= $(LIBDIR)
# Adding these macros will make it an error to link to mac APIs newer than OS version 10.7 # Setting these parameters makes it an error to link to macosx APIs that are
ifeq ($(MACOSX_REQUIRED_VERSION),) # newer than the given OS version and makes the linked binaries compatible even
MACOSX_REQUIRED_VERSION:=1070 # if built on a newer version of the OS.
# The expected format is X.Y.Z
ifeq ($(MACOSX_VERSION_MIN),)
MACOSX_VERSION_MIN=10.7.0
endif endif
MACOSX_OS_VERSION_CFLAGS := -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MACOSX_REQUIRED_VERSION) # The macro takes the version with no dots, ex: 1070
MACOSX_OS_VERSION_CFLAGS := -DMAC_OS_X_VERSION_MAX_ALLOWED=$(subst .,,$(MACOSX_VERSION_MIN)) \
-mmacosx-version-min=$(MACOSX_VERSION_MIN)
OTHER_CFLAGS += $(MACOSX_OS_VERSION_CFLAGS) OTHER_CFLAGS += $(MACOSX_OS_VERSION_CFLAGS)
OTHER_CXXFLAGS += $(MACOSX_OS_VERSION_CFLAGS) OTHER_CXXFLAGS += $(MACOSX_OS_VERSION_CFLAGS)
OTHER_LDFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN)
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
ifndef CONFIGURE_BUILD
CC = $(COMPILER_PATH)cl CC = $(COMPILER_PATH)cl
CPP = $(COMPILER_PATH)cl CPP = $(COMPILER_PATH)cl
CXX = $(COMPILER_PATH)cl CXX = $(COMPILER_PATH)cl
...@@ -36,7 +37,7 @@ ifeq ($(PLATFORM), windows) ...@@ -36,7 +37,7 @@ ifeq ($(PLATFORM), windows)
LINK = $(COMPILER_PATH)link LINK = $(COMPILER_PATH)link
LINK32 = $(LINK) LINK32 = $(LINK)
DUMPBIN = $(COMPILER_PATH)dumpbin.exe DUMPBIN = $(COMPILER_PATH)dumpbin.exe
# Fill in unknown values # Fill in unknown values
COMPILER_NAME=Unknown MSVC Compiler COMPILER_NAME=Unknown MSVC Compiler
COMPILER_VERSION= COMPILER_VERSION=
...@@ -87,6 +88,6 @@ ifeq ($(PLATFORM), windows) ...@@ -87,6 +88,6 @@ ifeq ($(PLATFORM), windows)
SHARED_LIBRARY_FLAG = -LD SHARED_LIBRARY_FLAG = -LD
# RSC is always same as RC (Not sure who uses this RSC variable) # RSC is always same as RC (Not sure who uses this RSC variable)
RSC = $(RC) RSC = $(RC)
endif
endif endif
...@@ -74,22 +74,24 @@ ifeq ($(PLATFORM),macosx) ...@@ -74,22 +74,24 @@ ifeq ($(PLATFORM),macosx)
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH) UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
endif endif
# Utilities ifndef CONFIGURE_BUILD
ifdef CROSS_COMPILE_ARCH # Utilities
AR = $(COMPILER_PATH)ar ifdef CROSS_COMPILE_ARCH
AS = $(COMPILER_PATH)as AR = $(COMPILER_PATH)ar
LD = $(COMPILER_PATH)ld AS = $(COMPILER_PATH)as
MCS = $(COMPILER_PATH)mcs LD = $(COMPILER_PATH)ld
NM = $(COMPILER_PATH)nm MCS = $(COMPILER_PATH)mcs
STRIP = $(COMPILER_PATH)strip NM = $(COMPILER_PATH)nm
else STRIP = $(COMPILER_PATH)strip
AR = $(UTILS_CCS_BIN_PATH)ar else
AS = $(UTILS_CCS_BIN_PATH)as AR = $(UTILS_CCS_BIN_PATH)ar
LD = $(UTILS_CCS_BIN_PATH)ld AS = $(UTILS_CCS_BIN_PATH)as
MCS = $(UTILS_CCS_BIN_PATH)mcs LD = $(UTILS_CCS_BIN_PATH)ld
NM = $(UTILS_CCS_BIN_PATH)nm MCS = $(UTILS_CCS_BIN_PATH)mcs
STRIP = $(UTILS_CCS_BIN_PATH)strip NM = $(UTILS_CCS_BIN_PATH)nm
endif STRIP = $(UTILS_CCS_BIN_PATH)strip
endif
endif # CONFIGURE_BUILD
ADB = $(UTILS_COMMAND_PATH)adb ADB = $(UTILS_COMMAND_PATH)adb
BASENAME = $(UTILS_COMMAND_PATH)basename BASENAME = $(UTILS_COMMAND_PATH)basename
......
...@@ -59,7 +59,7 @@ define process-doc-file ...@@ -59,7 +59,7 @@ define process-doc-file
$(ECHO) $(LOG_INFO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(SED) 's/$$//g' $< > $@ LC_ALL=C $(SED) 's/$$//g' $< > $@
$(CHMOD) 444 $@ $(CHMOD) 444 $@
endef endef
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册