about summary refs log tree commit diff stats
path: root/src/tools
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2024-04-29 11:23:35 +0200
committerptitSeb <sebastien.chev@gmail.com>2024-04-29 11:23:35 +0200
commitf256c48505690dfa39405156f626ca8762d8f1d5 (patch)
tree54446bbea1144aa8520b15df63a2ccffd706bfa9 /src/tools
parent71c5447b8ad534f2507c0405a348d902e9374517 (diff)
downloadbox64-f256c48505690dfa39405156f626ca8762d8f1d5.tar.gz
box64-f256c48505690dfa39405156f626ca8762d8f1d5.zip
Fixed non-dynarec build by introducing BOX64_JVM to replace BOX64_DYNAREC_JVM
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/rcfile.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/rcfile.c b/src/tools/rcfile.c
index 9098f9dc..191badad 100644
--- a/src/tools/rcfile.c
+++ b/src/tools/rcfile.c
@@ -106,6 +106,7 @@ ENTRYBOOL(BOX64_CEFDISABLEGPU, box64_cefdisablegpu)     \
 ENTRYBOOL(BOX64_CEFDISABLEGPUCOMPOSITOR, box64_cefdisablegpucompositor)\
 ENTRYBOOL(BOX64_EXIT, want_exit)                        \
 ENTRYBOOL(BOX64_LIBCEF, box64_libcef)                   \
+ENTRYBOOL(BOX64_JVM, box64_jvm)                         \
 ENTRYBOOL(BOX64_SDL2_JGUID, box64_sdl2_jguid)           \
 ENTRYINT(BOX64_MALLOC_HACK, box64_malloc_hack, 0, 2, 2) \
 ENTRYINTPOS(BOX64_MAXCPU, new_maxcpu)                   \
@@ -500,6 +501,7 @@ void ApplyParams(const char* name)
         return;
     int new_cycle_log = cycle_log;
     int new_maxcpu = box64_maxcpu;
+    int box64_dynarec_jvm = box64_jvm;
     if(!strcmp(name, old_name)) {
         return;
     }
@@ -547,6 +549,8 @@ void ApplyParams(const char* name)
         cycle_log = new_cycle_log;
         initCycleLog(my_context);
     }
+    if(param->is_box64_dynarec_jvm_present && !param->is_box64_jvm_present)
+        box64_jvm = box64_dynarec_jvm;
     if(!box64_maxcpu_immutable) {
         if(new_maxcpu!=box64_maxcpu && box64_maxcpu && box64_maxcpu<new_maxcpu) {
         printf_log(LOG_INFO, "Not applying BOX64_MAXCPU=%d because a lesser value is already active: %d\n", new_maxcpu, box64_maxcpu);