diff --git a/Makefile.config b/Makefile.config
index 356493a180c8d4191c783a0cdf1435636fb6d453..7ff8d3dec5937a479243a00630118582edb176eb 100644 (file)
--- a/Makefile.config
+++ b/Makefile.config
-# define third-party library paths
-# CHANGE YOUR CUDA PATH IF IT IS NOT THIS
-CUDA_DIR := /usr/local/cuda
-# CHANGE YOUR CUDA ARCH IF IT IS NOT THIS
+# CUDA directory contains bin/ and lib/ directories that we need.
+CUDA_DIR := /Developer/NVIDIA/CUDA-5.5
+
+# CUDA architecture setting.
CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
-gencode arch=compute_20,code=sm_21 \
-gencode arch=compute_30,code=sm_30 \
-gencode arch=compute_35,code=sm_35
-# CHANGE YOUR MKL PATH IF IT IS NOT THIS
+
+# MKL directory contains include/ and lib/ directions that we need.
MKL_DIR := /opt/intel/mkl
-# CHANGE YOUR MATLAB PATH IF IT IS NOT THIS
-# your mex binary should be located at $(MATLAB_DIR)/bin/mex
+
+# NOTE: this is required only if you will compile the matlab interface.
+# MATLAB directory should contain the mex binary in /bin
MATLAB_DIR := /usr/local
-# PUT ALL OTHER INCLUDE AND LIB DIRECTORIES HERE
-INCLUDE_DIRS := /usr/local/include /usr/include/python2.7 \
- /usr/local/lib/python2.7/dist-packages/numpy/core/include
-LIBRARY_DIRS := /usr/lib /usr/local/lib
-# DEFINE THE CXX PATH
-CXX=/usr/bin/g++
+# NOTE: this is required only if you will compile the python interface.
+# We need to be able to find Python.h and numpy/arrayobject.h.
+PYTHON_INCLUDES := /usr/local/Cellar/python/2.7.6/Frameworks/Python.framework/Versions/2.7/include/python2.7 /usr/local/lib/python2.7/site-packages/numpy/core/include
+# We need to be able to find libpythonX.X.so or .dylib.
+PYTHON_LIB := /usr/local/Cellar/python/2.7.6/Frameworks/Python.framework/Versions/2.7/lib
+
+# Whatever else you find you need goes here.
+INCLUDE_DIRS := $(PYTHON_INCLUDES) /usr/local/include
+LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib
+
+# For OS X, use clang++.
+CXX=/usr/bin/clang++
BUILD_DIR=build
-DISTRIBUTE_DIR=distribute
\ No newline at end of file
+DISTRIBUTE_DIR=distribute