diff options
| -rw-r--r-- | extern/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 9 | ||||
| -rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 2 |
5 files changed, 16 insertions, 7 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index a5dd3b16860..60253e08d4c 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -45,7 +45,7 @@ if(WITH_BUILTIN_GLEW) endif() if(WITH_GAMEENGINE) - add_subdirectory(recastnavigation) + add_subdirectory(recastnavigation) endif() if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE)) diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 3dc9ca5d284..114ff47663b 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -36,19 +36,19 @@ if(WITH_CYCLES_OPTIMIZED_KERNEL) endif() if(WITH_CYCLES_NETWORK) - add_definitions(-DWITH_NETWORK) + add_definitions(-DWITH_NETWORK) endif() if(WITH_CYCLES_OSL) - add_definitions(-DWITH_OSL) + add_definitions(-DWITH_OSL) endif() if(WITH_CYCLES_PARTIO) - add_definitions(-DWITH_PARTIO) + add_definitions(-DWITH_PARTIO) endif() if(WITH_CYCLES_CUDA_BINARIES) - add_definitions(-DWITH_CUDA_BINARIES) + add_definitions(-DWITH_CUDA_BINARIES) endif() add_definitions(-DWITH_OPENCL) diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 94189af34fa..abe8fb7d8fe 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -300,4 +300,13 @@ # define BLI_assert(a) (void)0 #endif +/* hints for branch pradiction, only use in code that runs a _lot_ where */ +#ifdef __GNUC__ +# define LIKELY(x) __builtin_expect(!!(x), 1) +# define UNLIKELY(x) __builtin_expect(!!(x), 0) +#else +# define LIKELY(x) (x) +# define UNLIKELY(x) (x) +#endif + #endif // BLI_UTILDEFINES_H diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 87498b3bb63..396e4d556d2 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -40,7 +40,7 @@ set(INC set(INC_SYS ${ZLIB_INCLUDE_DIRS} - ${GLEW_INCLUDE_PATH} + ${GLEW_INCLUDE_PATH} ) set(SRC diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 1899936cb50..f110576a297 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -33,7 +33,7 @@ set(INC ../../makesdna ../../makesrna ../../windowmanager - ../../gpu + ../../gpu ../../../../intern/guardedalloc ) |