← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/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/Makefile
1
1
#
2
 
# $Id: Makefile 14747 2008-05-08 18:38:21Z sirdude $
 
2
# $Id: Makefile 16512 2008-09-14 03:51:51Z blendix $
3
3
#
4
4
# ***** BEGIN GPL LICENSE BLOCK *****
5
5
#
100
100
COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a
101
101
COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a
102
102
COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a
 
103
COMLIB += $(NAN_IKSOLVER)/lib/libiksolver.a
103
104
COMLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a
104
105
COMLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a   
105
106
COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a
106
107
COMLIB += $(NAN_JPEG)/lib/libjpeg.a
 
108
COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a
 
109
COMLIB += $(NAN_GLEW)/lib/libglew.a
107
110
 
108
111
ifneq ($(NAN_NO_KETSJI),true)
109
112
    COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
225
228
    COMLIB += $(NAN_OPENEXR_LIBS)
226
229
endif
227
230
 
228
 
PULIB = $(NAN_IKSOLVER)/lib/libiksolver.a
229
 
PULIB += $(NAN_MOTO)/lib/libmoto.a
 
231
PULIB = $(NAN_MOTO)/lib/libmoto.a
230
232
PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a
231
233
PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
232
234
PULIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a
240
242
 
241
243
SPLIB1 = $(OCGDIR)/gameengine/GamePlayer/ghost/$(DEBUG_DIR)libghost.a
242
244
SPLIB1 += $(OCGDIR)/gameengine/GamePlayer/common/$(DEBUG_DIR)libcommon.a
 
245
SPLIB1 += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
243
246
SPLIB1 += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
244
247
SPLIB1 += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
245
248
 
249
252
# but somehow it consistently fails to resolve these symbols... or 
250
253
# can I just not check them? nm claims they aren't...
251
254
SPLIB += $(OCGDIR)/blender/blenkernel/blenkernel_blc/$(DEBUG_DIR)libblenkernel_blc.a
 
255
SPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
252
256
 
253
257
# These three need to be explicitly mentioned on the cl, because 
254
258
# if they are offered as a lib, they are optimized away. (nzc)