diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-09-01 19:01:15 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-09-01 19:01:15 +0400 |
commit | 35b61a7512dc1b8b1d8bc562aad2a72d254b8a69 (patch) | |
tree | 5050db48823af6cf23eee62b5a013e2f208fdded /intern | |
parent | 901dea87a1266479d3b7aab6cfd2d5fbf6adc393 (diff) |
Move GCC attributes into a centraized defines
Instead of having ifdef __GNUC__ all over the headers
to use special compiler's hints use a special file where
all things like this are concentrated.
Makes code easier to follow and allows to manage special
attributes in more efficient way.
Thanks Campbell for review!
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/SConscript | 2 | ||||
-rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index d1f1b287e00..e61018bc3dd 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -57,7 +57,7 @@ if env['WITH_BF_CYCLES_OSL']: incs.append(cycles['BF_OSL_INC']) incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split()) -incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna'.split()) +incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna #source/blender/blenlib'.split()) incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.split()) incs.extend('#extern/glew/include #intern/mikktspace'.split()) incs.append(cycles['BF_OIIO_INC']) diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index 29295d664ad..9b72efd90cf 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -10,6 +10,7 @@ set(INC ../../mikktspace ../../../source/blender/makesdna ../../../source/blender/makesrna + ../../../source/blender/blenlib ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern ) |