← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/gameengine/BlenderRoutines/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/BlenderRoutines/Makefile
1
1
#
2
 
# $Id: Makefile 16366 2008-09-04 20:51:28Z blendix $
 
2
# $Id: Makefile 19200 2009-03-05 15:16:43Z ben2610 $
3
3
#
4
4
# ***** BEGIN GPL LICENSE BLOCK *****
5
5
#
35
35
 
36
36
CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
37
37
 
 
38
CPPFLAGS += -I$(NAN_GLEW)/include
38
39
CPPFLAGS += -I$(NAN_SUMO)/include -I$(NAN_SOLID)/include
39
40
CPPFLAGS += -I$(NAN_SOLID)
40
41
CPPFLAGS += -I$(NAN_STRING)/include    
75
76
 
76
77
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
77
78
 
 
79
ifeq ($(WITH_FFMPEG), true)
 
80
   CPPFLAGS += -DWITH_FFMPEG
 
81
endif