← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/Physics/Bullet/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Physics/Bullet/CMakeLists.txt
37
37
        ../../../blender/blenkernel
38
38
        ../../../blender/blenlib
39
39
        ../../../blender/makesdna
40
 
        ../../../../extern/bullet2/src
41
40
        ../../../../intern/container
42
41
        ../../../../intern/guardedalloc
43
42
        ../../../../intern/moto/include
60
59
)
61
60
 
62
61
if(WITH_BULLET)
63
 
        add_definitions(-DUSE_BULLET)
 
62
        list(APPEND INC
 
63
                ${BULLET_INCLUDE_DIRS}
 
64
        )
 
65
        add_definitions(-DWITH_BULLET)
64
66
endif()
65
67
 
66
68
blender_add_lib(ge_phys_bullet "${SRC}" "${INC}" "${INC_SYS}")