← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to source/blender/src/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/src/Makefile
1
1
#
2
 
# $Id: Makefile 14444 2008-04-16 22:40:48Z hos $
 
2
# $Id: Makefile 16366 2008-09-04 20:51:28Z blendix $
3
3
#
4
4
# ***** BEGIN GPL LICENSE BLOCK *****
5
5
#
68
68
CPPFLAGS += -I../../kernel/gen_system
69
69
CPPFLAGS += -I../../gameengine/SoundSystem
70
70
CPPFLAGS += -I../ftfont
 
71
CPPFLAGS += -I../gpu
71
72
 
72
73
# Only used by py_demo.c !!!
73
74
CPPFLAGS += -I../radiosity/extern/include
143
144
    CPPFLAGS += -DTWEAK_MODE
144
145
endif
145
146
 
 
147
CPPFLAGS += -I$(NAN_GLEW)/include
146
148
CPPFLAGS += -I$(OPENGL_HEADERS)