Changeset 11852
- Timestamp:
- 04/02/12 11:13:08 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/mex/Makefile.am
r11849 r11852 115 115 116 116 if MATLAB 117 AM_LDFLAGS = $(MEXLINK)118 AM_CXXFLAGS = -DMATLAB -ansi -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread119 LDADD += $(MEXLIB)117 AM_LDFLAGS = $(MEXLINK) 118 AM_CXXFLAGS += -DMATLAB -ansi -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread 119 LDADD += $(MEXLIB) 120 120 121 121 #64 vs 32 bits … … 125 125 AM_CXXFLAGS += -DMX_COMPAT_32 -D_SERIAL_ 126 126 endif 127 endif 127 endif 128 128 129 129 if PYTHON 130 AM_LDFLAGS = $(PYTHONLINK)131 AM_CXXFLAGS = -DNPY_NO_DEPRECATED_API132 LDADD += $(BOOSTLIB) $(PYTHONLIB)130 AM_LDFLAGS = $(PYTHONLINK) 131 AM_CXXFLAGS+= -DNPY_NO_DEPRECATED_API 132 LDADD += $(BOOSTLIB) $(PYTHONLIB) 133 133 endif 134 134 135 135 #Triangle library 136 AM_CXXFLAGS += -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER136 AM_CXXFLAGS += -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER 137 137 138 138 #Optimization flags: 139 139 AM_CXXFLAGS += $(CXXOPTFLAGS) 140 141 140 #}}} 142 141 #Bin sources {{{1
Note:
See TracChangeset
for help on using the changeset viewer.