macosx.mk (3d82938a) macosx.mk (1e1ac450)
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

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

17# specific language governing permissions and limitations
18# under the License.
19#
20#**************************************************************
21
22
23
24GUI := UNX
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

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

17# specific language governing permissions and limitations
18# under the License.
19#
20#**************************************************************
21
22
23
24GUI := UNX
25COM := GCC
25COM := S5ABI
26COMID := s5abi
26#COM := S5ABI
27#COMID := s5abi
28
29# Darwin mktemp -t expects a prefix, not a pattern
30gb_MKTEMP ?= /usr/bin/mktemp -t gbuild.
31
32gb_CC := cc
33gb_CXX := g++

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

65gb_CPUDEFS := -DPOWERPC -DPPC
66else ifeq ($(CPUNAME),INTEL)
67gb_CPUDEFS := -DX86
68else ifeq ($(CPUNAME),X86_64)
69gb_CPUDEFS := -DX86_64
70endif
71
72ifeq ($(strip $(SYSBASE)),)
27#COM := S5ABI
28#COMID := s5abi
29
30# Darwin mktemp -t expects a prefix, not a pattern
31gb_MKTEMP ?= /usr/bin/mktemp -t gbuild.
32
33gb_CC := cc
34gb_CXX := g++

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

66gb_CPUDEFS := -DPOWERPC -DPPC
67else ifeq ($(CPUNAME),INTEL)
68gb_CPUDEFS := -DX86
69else ifeq ($(CPUNAME),X86_64)
70gb_CPUDEFS := -DX86_64
71endif
72
73ifeq ($(strip $(SYSBASE)),)
73gb_SDKDIR := /Developer/SDKs/MacOSX10.4u.sdk
74gb_SDKDIR := $(SDK_PATH)
74else
75else
75gb_SDKDIR := $(SYSBASE)/MacOSX10.4u.sdk
76gb_SDKDIR := $(SYSBASE)/MacOSX10.7.sdk
76endif
77
78
79gb_CFLAGS := \
80 -isysroot $(gb_SDKDIR) \
81 -Wall \
82 -Wendif-labels \
83 -Wextra \

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

97 -Wno-non-virtual-dtor \
98 -fPIC \
99 -fmessage-length=0 \
100 -fno-common \
101 -fno-strict-aliasing \
102 -fsigned-char \
103 -pipe
104
77endif
78
79
80gb_CFLAGS := \
81 -isysroot $(gb_SDKDIR) \
82 -Wall \
83 -Wendif-labels \
84 -Wextra \

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

98 -Wno-non-virtual-dtor \
99 -fPIC \
100 -fmessage-length=0 \
101 -fno-common \
102 -fno-strict-aliasing \
103 -fsigned-char \
104 -pipe
105
106ifneq ($(COM),GCC)
107 gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH -I../v1/
108endif
109
105# these are to get g++ to switch to Objective-C++ mode
106# (see toolkit module for a case where it is necessary to do it this way)
107gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
108
109ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
110gb_CFLAGS_WERROR := -Werror
111gb_CXXFLAGS_WERROR := -Werror
112endif

--- 340 unchanged lines hidden --- 		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
113
114ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
115gb_CFLAGS_WERROR := -Werror
116gb_CXXFLAGS_WERROR := -Werror
117endif

--- 340 unchanged lines hidden ---