diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
| commit | bb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch) | |
| tree | 6fb8da94c6e43098c606f768e722484b04b8645c /source/blender/makesrna/intern/Makefile | |
| parent | 37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff) | |
| parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) | |
merge with trunk at r31523
Diffstat (limited to 'source/blender/makesrna/intern/Makefile')
| -rw-r--r-- | source/blender/makesrna/intern/Makefile | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/Makefile b/source/blender/makesrna/intern/Makefile index 8aef06e762d..69d5581184d 100644 --- a/source/blender/makesrna/intern/Makefile +++ b/source/blender/makesrna/intern/Makefile @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # Contributor(s): Blender Foundation (2008). # @@ -45,7 +45,10 @@ endif CFLAGS += $(LEVEL_1_C_WARNINGS) +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) + CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +CPPFLAGS += -I$(NAN_MEMUTIL)/include CPPFLAGS += -I../../../../intern/audaspace/intern CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../blenkernel @@ -96,6 +99,18 @@ ifeq ($(WITH_TIFF),true) CPPFLAGS += -DWITH_TIFF endif +ifeq ($(WITH_LCMS),true) + CPPFLAGS += -DWITH_LCMS +endif + +ifeq ($(WITH_CINEON),true) + CPPFLAGS += -DWITH_CINEON +endif + +ifeq ($(WITH_HDR),true) + CPPFLAGS += -DWITH_HDR +endif + ifeq ($(OS),windows) # Windows needs these extra libs because of winstuff... It is not # _really_ needed, but it is the easiest fix for now. If you have |