Changes to make SICS compile on OSX Maverick with clang

This commit is contained in:
Mark Könnecke
2014-03-14 09:48:14 +01:00
parent a43e3838e3
commit bc31c6cd1e
30 changed files with 49 additions and 53 deletions

View File

@ -5,6 +5,7 @@
# Mark Koennecke 1996-2001
# Markus Zolliker, March 2003
# Mark Koennecke, July 2008
# Mark Koennecke, March 2014 for Maverick
#==========================================================================
# assign if the National Instrument GPIB driver is available
SINQDIR=/Users/Shared
@ -12,23 +13,21 @@ SINQDIR=/Users/Shared
#NIOBJ= nigpib.o
#NILIB=$(SINQDIR)/sl5/lib/cib.o
SICSROOT=/Users/konnecke/src
include macosx_def
CC = gcc
CFLAGS = -I$(HDFROOT)/include -I/sw/include -DNXXML -DHDF5 -DHDF4 $(NI) -DMACOSX \
-Ipsi/hardsup -I. \
CC = clang
CFLAGS = -I$(HDFROOT)/include -I/usr/local/include -DNXXML -DHDF5 $(NI) -DMACOSX \
-I$(SICSROOT)/psi/hardsup -I$(SICSROOT)/sicspsi -I. -I/usr/pkg/include \
-Werror -DNONINTF -g $(DFORTIFY) \
-Wall -Wno-unused -Wno-comment -Wno-switch
BINTARGET = bin
EXTRA=nintf.o
SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \
psi/tecs/libtecsl.a
LIBS = -L$(HDFROOT)/lib -L/sw/lib $(SUBLIBS) $(NILIB)\
-ltcl $(HDFROOT)/lib/libhdf5.a -lmfhdf -ldf \
$(HDFROOT)/lib/libsz.a \
$(HDFROOT)/lib/libjson.a -ljpeg \
-ldl -lz -lmxml $(HDFROOT)/lib/libghttp.a -lm -lc
SUBLIBS = $(SICSROOT)/sicspsi/libpsi.a $(SICSROOT)/sicspsi/hardsup/libhlib.a matrix/libmatrix.a \
$(SICSROOT)/sicspsi/tecs/libtecsl.a
LIBS = -L$(HDFROOT)/lib -L/usr/local/lib $(SUBLIBS) $(NILIB)\
-ltcl -lhdf5 -lNeXus -ljson -lghttp -ldl -lz -lmxml -lm -lc
include make_gen