From 359b90d4fcd9a08ddc12524724b76d0fa6e202c6 Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtanb@gmail.com>
Date: Tue, 1 Jun 2010 14:08:00 +0200
Subject: [PATCH] use __APPLE__ as opposed to passing a MACOSX flag via make

---
 matlab/swz/c-code/Makefile                     | 18 +++++++++---------
 .../c-code/utilities/DWCcode/arrays/dw_array.c |  2 +-
 mex/build/swz.am                               | 11 ++++-------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/matlab/swz/c-code/Makefile b/matlab/swz/c-code/Makefile
index fcd606a43..e17d93406 100644
--- a/matlab/swz/c-code/Makefile
+++ b/matlab/swz/c-code/Makefile
@@ -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 =
diff --git a/matlab/swz/c-code/utilities/DWCcode/arrays/dw_array.c b/matlab/swz/c-code/utilities/DWCcode/arrays/dw_array.c
index aa92eea1b..4f1156270 100644
--- a/matlab/swz/c-code/utilities/DWCcode/arrays/dw_array.c
+++ b/matlab/swz/c-code/utilities/DWCcode/arrays/dw_array.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(MACOSX)
+#ifdef __APPLE__
 #include <sys/malloc.h>
 #else
 #include <malloc.h>
diff --git a/mex/build/swz.am b/mex/build/swz.am
index 51767558b..ddeb93d0d 100644
--- a/mex/build/swz.am
+++ b/mex/build/swz.am
@@ -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