macosx.mk (e0ac9675) macosx.mk (746748b1)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 45 unchanged lines hidden (view full) ---

54 -D_REENTRANT \
55 -DNO_PTHREAD_PRIORITY \
56 -DQUARTZ \
57 $(EXTRA_CDEFS) \
58
59gb_COMPILERDEFS := \
60 -D$(COM) \
61 -DHAVE_GCC_VISIBILITY_FEATURE \
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 45 unchanged lines hidden (view full) ---

54 -D_REENTRANT \
55 -DNO_PTHREAD_PRIORITY \
56 -DQUARTZ \
57 $(EXTRA_CDEFS) \
58
59gb_COMPILERDEFS := \
60 -D$(COM) \
61 -DHAVE_GCC_VISIBILITY_FEATURE \
62 -DCPPU_ENV=$(COMID) \
63 -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
62 -DCPPU_ENV=$(COMID)
63# -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
64
65ifeq ($(CPUNAME),POWERPC)
66gb_CPUDEFS := -DPOWERPC -DPPC
67else ifeq ($(CPUNAME),INTEL)
68gb_CPUDEFS := -DX86
69else ifeq ($(CPUNAME),X86_64)
70gb_CPUDEFS := -DX86_64
71endif

--- 30 unchanged lines hidden (view full) ---

102 -fno-strict-aliasing \
103 -fsigned-char \
104 -pipe
105
106ifneq ($(COM),GCC)
107 gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH -I../v1/
108endif
109
64
65ifeq ($(CPUNAME),POWERPC)
66gb_CPUDEFS := -DPOWERPC -DPPC
67else ifeq ($(CPUNAME),INTEL)
68gb_CPUDEFS := -DX86
69else ifeq ($(CPUNAME),X86_64)
70gb_CPUDEFS := -DX86_64
71endif

--- 30 unchanged lines hidden (view full) ---

102 -fno-strict-aliasing \
103 -fsigned-char \
104 -pipe
105
106ifneq ($(COM),GCC)
107 gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH -I../v1/
108endif
109
110ifeq ($(MACOSX_DEPLOYMENT_TARGET),$(filter $(MACOSX_DEPLOYMENT_TARGET), 10.7 10.8))
111 gb_CXXFLAGS += -std=c++11 -stdlib=libc++
112 gb_macos_LDFLAGS := -std=c++11 -stdlib=libc++
113endif
114
110# these are to get g++ to switch to Objective-C++ mode
111# (see toolkit module for a case where it is necessary to do it this way)
112gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
115# these are to get g++ to switch to Objective-C++ mode
116# (see toolkit module for a case where it is necessary to do it this way)
117gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
118gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
113
114ifneq ($(MACOSX_DEPLOYMENT_TARGET),)
115 gb_CXXFLAGS += -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_$(subst .,_,$(MACOSX_DEPLOYMENT_TARGET))
116endif
117
118ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
119gb_CFLAGS_WERROR := -Werror -Wno-error=deprecated
120gb_CXXFLAGS_WERROR := -Werror -Wno-error=deprecated

--- 341 unchanged lines hidden --- 		119
120ifneq ($(MACOSX_DEPLOYMENT_TARGET),)
121 gb_CXXFLAGS += -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_$(subst .,_,$(MACOSX_DEPLOYMENT_TARGET))
122endif
123
124ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
125gb_CFLAGS_WERROR := -Werror -Wno-error=deprecated
126gb_CXXFLAGS_WERROR := -Werror -Wno-error=deprecated

--- 341 unchanged lines hidden ---