comparison build/Makefile.osx @ 371:490e5d01766c

Some os/x build fixes
author Chris Cannam
date Tue, 05 Aug 2014 12:55:55 +0100
parents 32e1b0d944fc
children 3cd80757becf f4e07ae2725a
comparison
equal deleted inserted replaced
370:cb6c59627bcc 371:490e5d01766c
63 MINVERSION := 10.6 63 MINVERSION := 10.6
64 64
65 # Our default is to try to build for all architectures supported by 65 # Our default is to try to build for all architectures supported by
66 # the MINVERSION in a universal binary. 66 # the MINVERSION in a universal binary.
67 # 67 #
68 ARCHFLAGS = -mmacosx-version-min=$(MINVERSION) -arch x86_64 -arch i386 68 ARCHFLAGS ?= -mmacosx-version-min=$(MINVERSION) -arch x86_64 -arch i386
69 69
70 # Compile flags 70 # Compile flags
71 # 71 #
72 CFLAGS = $(ARCHFLAGS) -fPIC 72 CFLAGS += $(ARCHFLAGS) -fPIC
73 CXXFLAGS = $(ARCHFLAGS) -O2 -Wall -I. -I../10.6/inst/include -fPIC 73 CXXFLAGS += $(ARCHFLAGS) -O2 -Wall -I. -fPIC
74 74
75 # Link flags common to all link targets 75 # Link flags common to all link targets
76 # 76 #
77 LDFLAGS = $(ARCHFLAGS) 77 LDFLAGS += $(ARCHFLAGS)
78 78
79 # ar, ranlib 79 # ar, ranlib
80 # 80 #
81 AR = ar 81 AR = ar
82 RANLIB = ranlib 82 RANLIB = ranlib