stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use __APPLE__ as opposed to passing a MACOSX flag via make

time-shift
Houtan Bastani 2010-06-01 14:08:00 +02:00
parent aa625cc046
commit 359b90d4fc
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
matlab/swz/c-code/Makefile
View File

@ -6,7 +6,7 @@
# MACHINE # MACHINE
STANDALONE_HB = STANDALONE_HB STANDALONE_HB = STANDALONE_HB
MACOSX = MACOSX #MACOSX = MACOSX
# LIBRARIES # LIBRARIES
USE_TAO = USE_TAO USE_TAO = USE_TAO
@ -22,7 +22,7 @@ USE_GSL = USE_GSL
WORK_DIR = . WORK_DIR = .
OUT_DIR = ../bin OUT_DIR = ../bin
CFLAGS = -g -DINTELCMATHLIBRARY CFLAGS = -g -DINTELCMATHLIBRARY -ansi
# MACHINE DEPENDENT DIRECTORIES # MACHINE DEPENDENT DIRECTORIES
@ -75,21 +75,21 @@ ifdef STANDALONE_HB
CC = gcc CC = gcc
FC = gfortran FC = gfortran
GSL_INCLUDE_DIR = /usr/local/include/gsl GSL_INCLUDE_DIR = /usr/local64/include/gsl
GSL_LIBS_DIR = /usr/local/lib GSL_LIBS_DIR = /usr/local64/lib
TAO_DIR = $(WORK_DIR)/utilities/TZCcode TAO_DIR = $(WORK_DIR)/utilities/TZCcode
endif endif
ifdef MACOSX #ifdef MACOSX
MAC_LIBS = -framework Accelerate #MAC_LIBS = #-framework Accelerate #-lmx -lmex -lmat -lstdc++ -L/Applications/MATLAB_R2009b.app/bin/maci64/ -lmwblas -lmwlapack
CFLAGS := $(CFLAGS) -DMACOSX #CFLAGS := $(CFLAGS) -DMACOSX
endif #endif
################################################################################# #################################################################################
VPATH = VPATH =
INCLUDE_DIR = -I/Applications/MatlabR2010a/MATLAB_R2010a.app/extern/include/ INCLUDE_DIR = -I/Applications/MATLAB_R2009b.app/extern/include
LIBS_DIR = LIBS_DIR =
LIBS = $(MAC_LIBS) LIBS = $(MAC_LIBS)
OBJS = OBJS =

2
matlab/swz/c-code/utilities/DWCcode/arrays/dw_array.c
View File

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#if defined(MACOSX) #ifdef __APPLE__
#include <sys/malloc.h> #include <sys/malloc.h>
#else #else
#include <malloc.h> #include <malloc.h>

11
mex/build/swz.am
View File

@ -4,26 +4,23 @@ SWZ_SRC_DIRS = $(WORKING_DIR)/matlab/swz/c-code/utilities/TZCcode $(WORKING_DIR)
vpath %.c $(SWZ_SRC_DIRS) vpath %.c $(SWZ_SRC_DIRS)
###
# TO BE REMOVED
#### ####
# 64 # 64
BIT = /usr/local64 BIT = /usr/local64
# 32 # 32
#BIT = /usr/local #BIT = /usr/local
### ###
###
# TO BE REMOVED
#MAC
MAC_FLAG = -DMACOSX
#GSL #GSL
GSL_INCLUDE_DIR = -I$(BIT)/include/gsl -I/usr/local/include GSL_INCLUDE_DIR = -I$(BIT)/include/gsl -I/usr/local/include
LIBS += -lgsl -lgslcblas LIBS += -lgsl
# #
### ###
DEBUG = -g 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 LDFLAGS += -L$(BIT)/lib