macosx.mk (6d1ed1dd) macosx.mk (3d82938a)
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

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

53 -D_REENTRANT \
54 -DNO_PTHREAD_PRIORITY \
55 -DQUARTZ \
56 $(EXTRA_CDEFS) \
57
58gb_COMPILERDEFS := \
59 -D$(COM) \
60 -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

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

53 -D_REENTRANT \
54 -DNO_PTHREAD_PRIORITY \
55 -DQUARTZ \
56 $(EXTRA_CDEFS) \
57
58gb_COMPILERDEFS := \
59 -D$(COM) \
60 -DHAVE_GCC_VISIBILITY_FEATURE \
61 -DCPPU_ENV=gcc3 \
61 -DCPPU_ENV=$(COMID) \
62 -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
63
64ifeq ($(CPUNAME),POWERPC)
65gb_CPUDEFS := -DPOWERPC -DPPC
62 -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
63
64ifeq ($(CPUNAME),POWERPC)
65gb_CPUDEFS := -DPOWERPC -DPPC
66else
66else ifeq ($(CPUNAME),INTEL)
67gb_CPUDEFS := -DX86
67gb_CPUDEFS := -DX86
68else ifeq ($(CPUNAME),X86_64)
69gb_CPUDEFS := -DX86_64
68endif
69
70ifeq ($(strip $(SYSBASE)),)
71gb_SDKDIR := /Developer/SDKs/MacOSX10.4u.sdk
72else
73gb_SDKDIR := $(SYSBASE)/MacOSX10.4u.sdk
74endif
75

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

93 -Wextra \
94 -Wno-ctor-dtor-privacy \
95 -Wno-non-virtual-dtor \
96 -fPIC \
97 -fmessage-length=0 \
98 -fno-common \
99 -fno-strict-aliasing \
100 -fsigned-char \
70endif
71
72ifeq ($(strip $(SYSBASE)),)
73gb_SDKDIR := /Developer/SDKs/MacOSX10.4u.sdk
74else
75gb_SDKDIR := $(SYSBASE)/MacOSX10.4u.sdk
76endif
77

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

95 -Wextra \
96 -Wno-ctor-dtor-privacy \
97 -Wno-non-virtual-dtor \
98 -fPIC \
99 -fmessage-length=0 \
100 -fno-common \
101 -fno-strict-aliasing \
102 -fsigned-char \
101 -malign-natural \
102 -pipe \
103 #-Wshadow \ break in compiler headers already
104 #-fsigned-char \ might be removed?
105 #-malign-natural \ might be removed?
103 -pipe
106
107# these are to get g++ to switch to Objective-C++ mode
108# (see toolkit module for a case where it is necessary to do it this way)
109gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
110
111ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
112gb_CFLAGS_WERROR := -Werror
113gb_CXXFLAGS_WERROR := -Werror
114endif
115
116gb_LinkTarget_EXCEPTIONFLAGS := \
117 -DEXCEPTIONS_ON \
104
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
113
114gb_LinkTarget_EXCEPTIONFLAGS := \
115 -DEXCEPTIONS_ON \
118 -fexceptions \
119 -fno-enforce-eh-specs \
116 -fexceptions
120
117
118ifeq ($(COM),GCC)
119 gb_LinkTarget_EXCEPTIONFLAGS += -fno-enforce-eh-specs
120endif
121
121gb_LinkTarget_NOEXCEPTIONFLAGS := \
122 -DEXCEPTIONS_OFF \
122gb_LinkTarget_NOEXCEPTIONFLAGS := \
123 -DEXCEPTIONS_OFF \
123 -fno-exceptions \
124 -fno-exceptions
124
125gb_LinkTarget_LDFLAGS := \
126 -Wl,-syslibroot,$(gb_SDKDIR) \
127 $(subst -L../lib , ,$(SOLARLIB)) \
128#man ld says: obsolete -Wl,-multiply_defined,suppress \
129
130ifeq ($(gb_DEBUGLEVEL),2)
131gb_COMPILEROPTFLAGS := -O0

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

297
298# Library class
299
300gb_Library_DEFS :=
301gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
302gb_Library_SYSPRE := lib
303gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
304gb_Library_PLAINEXT := .dylib
125
126gb_LinkTarget_LDFLAGS := \
127 -Wl,-syslibroot,$(gb_SDKDIR) \
128 $(subst -L../lib , ,$(SOLARLIB)) \
129#man ld says: obsolete -Wl,-multiply_defined,suppress \
130
131ifeq ($(gb_DEBUGLEVEL),2)
132gb_COMPILEROPTFLAGS := -O0

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

298
299# Library class
300
301gb_Library_DEFS :=
302gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
303gb_Library_SYSPRE := lib
304gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
305gb_Library_PLAINEXT := .dylib
305gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
306gb_Library_RTEXT := $(COMID)$(gb_Library_PLAINEXT)
306
307gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
308gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
309
310gb_Library__FRAMEWORKS := \
311 Cocoa \
312
313gb_Library_PLAINLIBS_NONE += \

--- 138 unchanged lines hidden --- 		307
308gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
309gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
310
311gb_Library__FRAMEWORKS := \
312 Cocoa \
313
314gb_Library_PLAINLIBS_NONE += \

--- 138 unchanged lines hidden ---