From 136b87ab1c41e0ecd4e577773ddfc54e802f035c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= Date: Fri, 13 Oct 2023 18:20:20 +0200 Subject: [PATCH] keep COOK_DISABLED --- engine/joint/v4k.h | 13 ++++++++++++- engine/split/v4k_config.h | 12 +++++++++++- engine/split/v4k_cooker.c | 1 + engine/v4k.c | 1 + engine/v4k.h | 12 +++++++++++- 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/engine/joint/v4k.h b/engine/joint/v4k.h index 90d0dd0..c82eb4f 100644 --- a/engine/joint/v4k.h +++ b/engine/joint/v4k.h @@ -14061,7 +14061,11 @@ extern "C" { #endif #ifndef ENABLE_RETAIL -#define ENABLE_RETAIL 0 +#define ENABLE_RETAIL 0 // ifdef(retail, 1, 0) ///+ +#endif + +#ifndef COOK_DISABLED +#define COOK_DISABLED 0 // ifdef(nocook, 1, 0) ///+ #endif // ----------------------------------------------------------------------------- @@ -14159,6 +14163,12 @@ extern "C" { #define ifdef_retail ifdef_false #endif +#if COOK_DISABLED +#define ifdef_nocook ifdef_true +#else +#define ifdef_nocook ifdef_false +#endif + // ----------------------------------------------------------------------------- // new C keywords @@ -335607,6 +335617,7 @@ int cook_jobs() { int num_jobs = optioni("--cook-jobs", maxf(1.15,app_cores()) * 1.75), max_jobs = countof(jobs); ifdef(ems, num_jobs = 0); ifdef(retail, num_jobs = 0); + ifdef(nocook, num_jobs = 0); return clampi(num_jobs, 0, max_jobs); } diff --git a/engine/split/v4k_config.h b/engine/split/v4k_config.h index 0a72600..5f2b089 100644 --- a/engine/split/v4k_config.h +++ b/engine/split/v4k_config.h @@ -30,7 +30,11 @@ #endif #ifndef ENABLE_RETAIL -#define ENABLE_RETAIL 0 +#define ENABLE_RETAIL 0 // ifdef(retail, 1, 0) ///+ +#endif + +#ifndef COOK_DISABLED +#define COOK_DISABLED 0 // ifdef(nocook, 1, 0) ///+ #endif // ----------------------------------------------------------------------------- @@ -128,6 +132,12 @@ #define ifdef_retail ifdef_false #endif +#if COOK_DISABLED +#define ifdef_nocook ifdef_true +#else +#define ifdef_nocook ifdef_false +#endif + // ----------------------------------------------------------------------------- // new C keywords diff --git a/engine/split/v4k_cooker.c b/engine/split/v4k_cooker.c index 4b1ecf5..713bffc 100644 --- a/engine/split/v4k_cooker.c +++ b/engine/split/v4k_cooker.c @@ -800,6 +800,7 @@ int cook_jobs() { int num_jobs = optioni("--cook-jobs", maxf(1.15,app_cores()) * 1.75), max_jobs = countof(jobs); ifdef(ems, num_jobs = 0); ifdef(retail, num_jobs = 0); + ifdef(nocook, num_jobs = 0); return clampi(num_jobs, 0, max_jobs); } diff --git a/engine/v4k.c b/engine/v4k.c index 316a0e2..ac738f7 100644 --- a/engine/v4k.c +++ b/engine/v4k.c @@ -4632,6 +4632,7 @@ int cook_jobs() { int num_jobs = optioni("--cook-jobs", maxf(1.15,app_cores()) * 1.75), max_jobs = countof(jobs); ifdef(ems, num_jobs = 0); ifdef(retail, num_jobs = 0); + ifdef(nocook, num_jobs = 0); return clampi(num_jobs, 0, max_jobs); } diff --git a/engine/v4k.h b/engine/v4k.h index b107544..20c0359 100644 --- a/engine/v4k.h +++ b/engine/v4k.h @@ -128,7 +128,11 @@ extern "C" { #endif #ifndef ENABLE_RETAIL -#define ENABLE_RETAIL 0 +#define ENABLE_RETAIL 0 // ifdef(retail, 1, 0) ///+ +#endif + +#ifndef COOK_DISABLED +#define COOK_DISABLED 0 // ifdef(nocook, 1, 0) ///+ #endif // ----------------------------------------------------------------------------- @@ -226,6 +230,12 @@ extern "C" { #define ifdef_retail ifdef_false #endif +#if COOK_DISABLED +#define ifdef_nocook ifdef_true +#else +#define ifdef_nocook ifdef_false +#endif + // ----------------------------------------------------------------------------- // new C keywords