Commits
Ryan Schmidt authored 697746c35a1
1 - | --- options.mk.orig 2013-12-08 16:40:11.000000000 -0800 |
2 - | +++ options.mk 2013-12-08 16:46:43.000000000 -0800 |
1 + | --- options.mk.orig 2013-08-23 14:06:08.000000000 -0500 |
2 + | +++ options.mk 2018-05-02 17:50:17.000000000 -0500 |
3 3 | |
4 4 | # in $(INSTALL_PREFIX_DIR)/bin, libraries in $(INSTALL_PREFIX_DIR)/lib |
5 5 | # etc,. |
6 6 | # |
7 7 | -INSTALL_PREFIX_DIR=/usr/local |
8 8 | +INSTALL_PREFIX_DIR=@@MP_INSTALL_PREFIX@@ |
9 9 | |
10 10 | # Set RELEASE to 1 to compile with optimizations and without debug info. |
11 11 | -RELEASE=0 |
12 12 | +RELEASE=1 |
22 22 | +CXX = @@MP_CXX@@ |
23 23 | +CC = @@MP_CC@@ |
24 24 | |
25 25 | # Set BENCHMARK or PROFILE to 1 for framerate diagnostics |
26 26 | BENCHMARK=0 |
27 27 | |
28 28 | # linker normally checks. The linker will search the directories |
29 29 | # in the order specified. |
30 30 | # |
31 31 | -LIB_SEARCH_DIRS = |
32 - | +LIB_SEARCH_DIRS = @@MP_PREFIX@@/lib |
32 + | +LIB_SEARCH_DIRS = @@MP_PREFIX@@/lib |
33 33 | |
34 34 | # Set INC_SEARCH_DIRS to a list of directories containing include files |
35 35 | # not on the default search path for the compiler. Typically 3rd party |
36 36 | # dependencies (e.g. netCDF, IDL) are not installed in a location where |
37 37 | # compiler normally checks. The compiler will search the directories |
38 38 | # in the order specified. |
39 39 | -INC_SEARCH_DIRS = |
40 - | +INC_SEARCH_DIRS = @@MP_PREFIX@@/include @@MP_PREFIX@@/include/udunits2 @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/numarray/include @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include |
40 + | +INC_SEARCH_DIRS = @@MP_PREFIX@@/include @@MP_PREFIX@@/include/udunits2 @@MP_FRAMEWORKS_DIR@@/Python.framework/Versions/2.7/include/python2.7 @@MP_FRAMEWORKS_DIR@@/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/numarray/include @@MP_FRAMEWORKS_DIR@@/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include |
41 41 | |
42 42 | # Set NETCDF_LIBS to the name of your netCDF library and any library |
43 43 | # dependencies that netcdf has. The default is simply 'netcdf'. Starting |
44 44 | |
45 45 | # http://www.trolltech.com, and when possible, from the vapor |
46 46 | # web site: www.vapor.ucar.edu. Qt version 4.6.1 or higher is required. |
47 47 | # |
48 48 | -QTDIR = |
49 49 | +QTDIR = @@MP_PREFIX@@ |
50 50 | |
51 51 | # If BUILD_GUI is set to 1 **and** this is a Mac system, set HAVE_QT_FRAMEWORK |
52 52 | # to 1 if your Qt libraries are built as Mac Frameworks, or to 0 if |
53 53 | |
54 54 | # Python directory where the sub directories 'lib', and 'include' |
55 55 | # may be found. Python version 2.6.5 or higher is required. |
56 56 | # |
57 57 | -PYTHONDIR = |
58 - | +PYTHONDIR = @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7 |
58 + | +PYTHONDIR = @@MP_FRAMEWORKS_DIR@@/Python.framework/Versions/2.7 |
59 59 | |
60 60 | # If BUILD_PYTHON is set to 1, set PYTHONVERSION to the version |
61 61 | # number (both major and minor, e.g. "2.6") of Python. |