diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-23 23:36:47 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-23 23:36:47 +0300 |
| commit | c86579b11e6fe140f07029469e3644d7dbe0640e (patch) | |
| tree | d27544e7f183f016be96c0c7d391ec9823b8c391 /source/blender/blenkernel/CMakeLists.txt | |
| parent | 4531e8e6a731af71936d09bb79a15297685ff0dc (diff) | |
2.5: multiple small fixes
- wm draw method is now initialized correct when reading older
files, but the SDNA bug causing the problem is still unsolved.
is due to // char pad[8]; not being recognized as commented.
- triple buffer proxy texture test follows spec better now,
was disabling triple buffer unnecessarily on some drivers.
- some cmake compile fixes related to sequencer pthread usage
and removed bad level calls lib for player.
- show outliner header buttons in oops mode as well until that
can be switched in the UI.
- fix region data free issue for tooltips
- warning fixes
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 3948a2bf2af..46153b928aa 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -56,18 +56,12 @@ IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) -IF(WITH_PLAYER) - SUBDIRS(bad_level_call_stubs) -ENDIF(WITH_PLAYER) - IF(WITH_PYTHON) SET(INC ${INC} ../python ${PYTHON_INC}) ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) -BLENDERLIB(bf_blenkernel "${SRC}" "${INC}") - IF(WITH_INTERNATIONAL) ADD_DEFINITIONS(-DWITH_FREETYPE2) ENDIF(WITH_INTERNATIONAL) @@ -75,3 +69,10 @@ ENDIF(WITH_INTERNATIONAL) IF(NOT WITH_ELBEEM) ADD_DEFINITIONS(-DDISABLE_ELBEEM) ENDIF(NOT WITH_ELBEEM) + +IF(WIN32) + SET(INC ${INC} ${PTHREADS_INC}) +ENDIF(WIN32) + +BLENDERLIB(bf_blenkernel "${SRC}" "${INC}") + |