From a5fe656c84ff8aca087e54690a30ea8cef8aad99 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 27 May 2023 14:16:44 +1000 Subject: [PATCH] Build: add WITH_CYCLES define for creator Recently added cycles options weren't included in the help message. Also quiet extra token warning. --- source/creator/CMakeLists.txt | 1 + source/creator/creator_args.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 51907636809..69cf74806b0 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -49,6 +49,7 @@ if(WITH_LIBMV) endif() if(WITH_CYCLES) + add_definitions(-DWITH_CYCLES) if(WITH_CYCLES_LOGGING) list(APPEND INC ../../intern/cycles/blender) add_definitions(-DWITH_CYCLES_LOGGING) diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index f84b33f187b..e461ad5c9e3 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -643,13 +643,14 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo printf("Cycles Render Options:\n"); printf("\tCycles add-on options must be specified following a double dash.\n\n"); printf("``--cycles-device OPTIX``\n"); - printf("\tSet the device used for rendering. Options: CPU, CUDA, OPTIX, HIP, ONEAPI, METAL.\n\n"); + printf( + "\tSet the device used for rendering. Options: CPU, CUDA, OPTIX, HIP, ONEAPI, METAL.\n\n"); printf("\tAppend +CPU to a GPU device to render on both CPU and GPU.\n\n"); printf("\tExample:\n"); printf("\t# blender -b file.blend -f 20 -- --cycles-device OPTIX\n"); printf("``--cycles-print-stats``\n"); printf("\tLog statistics about render memory and time usage.\n"); -# endif WITH_CYCLES +# endif /*WITH_CYCLES*/ // printf("\n"); // printf("Experimental Features:\n");