← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/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/gameengine/Ketsji/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
#
35
35
 
36
36
CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
37
37
 
 
38
CPPFLAGS += $(NAN_SDLCFLAGS)
38
39
CPPFLAGS += $(OGL_CPPFLAGS)
 
40
CPPFLAGS += -I$(NAN_GLEW)/include
39
41
CPPFLAGS += -I$(OPENGL_HEADERS)
40
 
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -I../../blender/python
 
42
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) 
 
43
CPPFLAGS += -I../../blender/python
 
44
CPPFLAGS += -I../../blender/python/api2_2x
41
45
CPPFLAGS += -I$(NAN_STRING)/include    
42
46
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include    
43
47
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO) -I$(NAN_MOTO)/include
60
64
CPPFLAGS += -I../../blender/include
61
65
CPPFLAGS += -I../../blender/makesdna
62
66
CPPFLAGS += -I../../blender/imbuf
 
67
CPPFLAGS += -I../../blender/gpu
63
68
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
64
69
 
65
 
ifeq ($(WITH_BF_GLEXT),true)
66
 
    CPPFLAGS += -DWITH_GLEXT
67
 
endif
68
 
 
69
 
 
70
70
###########################
71
71
 
72
72
SOURCEDIR = source/gameengine/Ketsji