diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-09-16 21:43:09 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-09-16 21:43:09 +0400 |
| commit | deebf4f8f0d79169a0e6c2a391670419b6492bfe (patch) | |
| tree | 2a0aaf4042aa78e9d1d835f4544e07c6123e67a9 /intern/guardedalloc | |
| parent | 6b0679a3999d8e5abc60730f523879eadbedcd8f (diff) | |
merge with 2.5/trunk at r23271
Diffstat (limited to 'intern/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/guardedalloc/SConscript | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index b29837fac7d..40ca35632d7 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -32,6 +32,6 @@ BLENDERLIB(bf_guardedalloc "${SRC}" "${INC}") # Override C++ alloc optional IF(WITH_CXX_GUARDEDALLOC) - FILE(GLOB SRC cpp/*.cpp) - BLENDERLIB(bf_guardedalloc_cpp "${SRC}" "${INC}") + FILE(GLOB SRC cpp/*.cpp) + BLENDERLIB(bf_guardedalloc_cpp "${SRC}" "${INC}") ENDIF(WITH_CXX_GUARDEDALLOC) diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript index ef6c6b49266..2ee0f84b464 100644 --- a/intern/guardedalloc/SConscript +++ b/intern/guardedalloc/SConscript @@ -5,4 +5,4 @@ Import('env') sources = env.Glob('intern/*.c') incs = '.' -env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [10, 175] ) +env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern','player'], priority = [5,150] ) |