Commit 359b90d4 authored by Houtan Bastani's avatar Houtan Bastani
Browse files

use __APPLE__ as opposed to passing a MACOSX flag via make

parent aa625cc0
......@@ -6,7 +6,7 @@
# MACHINE
STANDALONE_HB = STANDALONE_HB
MACOSX = MACOSX
#MACOSX = MACOSX
# LIBRARIES
USE_TAO = USE_TAO
......@@ -22,7 +22,7 @@ USE_GSL = USE_GSL
WORK_DIR = .
OUT_DIR = ../bin
CFLAGS = -g -DINTELCMATHLIBRARY
CFLAGS = -g -DINTELCMATHLIBRARY -ansi
# MACHINE DEPENDENT DIRECTORIES
......@@ -75,21 +75,21 @@ ifdef STANDALONE_HB
CC = gcc
FC = gfortran
GSL_INCLUDE_DIR = /usr/local/include/gsl
GSL_LIBS_DIR = /usr/local/lib
GSL_INCLUDE_DIR = /usr/local64/include/gsl
GSL_LIBS_DIR = /usr/local64/lib
TAO_DIR = $(WORK_DIR)/utilities/TZCcode
endif
ifdef MACOSX
MAC_LIBS = -framework Accelerate
CFLAGS := $(CFLAGS) -DMACOSX
endif
#ifdef MACOSX
#MAC_LIBS = #-framework Accelerate #-lmx -lmex -lmat -lstdc++ -L/Applications/MATLAB_R2009b.app/bin/maci64/ -lmwblas -lmwlapack
#CFLAGS := $(CFLAGS) -DMACOSX
#endif
#################################################################################
VPATH =
INCLUDE_DIR = -I/Applications/MatlabR2010a/MATLAB_R2010a.app/extern/include/
INCLUDE_DIR = -I/Applications/MATLAB_R2009b.app/extern/include
LIBS_DIR =
LIBS = $(MAC_LIBS)
OBJS =
......
......@@ -5,7 +5,7 @@
#include <stdlib.h>
#include <string.h>
#if defined(MACOSX)
#ifdef __APPLE__
#include <sys/malloc.h>
#else
#include <malloc.h>
......
......@@ -4,26 +4,23 @@ SWZ_SRC_DIRS = $(WORKING_DIR)/matlab/swz/c-code/utilities/TZCcode $(WORKING_DIR)
vpath %.c $(SWZ_SRC_DIRS)
###
# TO BE REMOVED
####
# 64
BIT = /usr/local64
# 32
#BIT = /usr/local
###
###
# TO BE REMOVED
#MAC
MAC_FLAG = -DMACOSX
#GSL
GSL_INCLUDE_DIR = -I$(BIT)/include/gsl -I/usr/local/include
LIBS += -lgsl -lgslcblas
LIBS += -lgsl
#
###
DEBUG = -g
CPPFLAGS += $(DEBUG) -DINTELCMATHLIBRARY $(MAC_FLAG) $(GSL_INCLUDE_DIR) -I$(WORKING_DIR)/matlab/swz/c-code/utilities/TZCcode -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/matrix -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/error -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/arrays -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/ascii -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/stat -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/spherical -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/sort -I$(WORKING_DIR)/matlab/swz/c-code/sbvar/switching -I$(WORKING_DIR)/matlab/swz/c-code/sbvar/var -I$(WORKING_DIR)/matlab/swz/c-code/mex
CPPFLAGS += $(DEBUG) -DINTELCMATHLIBRARY $(GSL_INCLUDE_DIR) -I$(WORKING_DIR)/matlab/swz/c-code/utilities/TZCcode -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/matrix -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/error -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/arrays -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/ascii -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/stat -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/spherical -I$(WORKING_DIR)/matlab/swz/c-code/utilities/DWCcode/sort -I$(WORKING_DIR)/matlab/swz/c-code/sbvar/switching -I$(WORKING_DIR)/matlab/swz/c-code/sbvar/var -I$(WORKING_DIR)/matlab/swz/c-code/mex
LDFLAGS += -L$(BIT)/lib
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment