From 059429e7c26d86e021a23ac5d00afd5bfc0d54aa Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Wed, 28 Jun 2023 00:40:38 +0300 Subject: [PATCH] logging and dosbox conf --- dosbox.conf | 43 +++++++++++++++++++++++++++++++++++++++++++ src/dos/main.c | 11 ++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 dosbox.conf diff --git a/dosbox.conf b/dosbox.conf new file mode 100644 index 0000000..06dfc43 --- /dev/null +++ b/dosbox.conf @@ -0,0 +1,43 @@ +[dosbox] +memsize = 31 + +[cpu] +core = dynamic +cycles = max 50% + +[sdl] +windowresolution=1280x960 +output=opengl +fullresolution=2560x1440 +autolock=true + +[render] +aspect=true +scaler=normal + +[gus] +gus=true +gusbase=240 +irq1=5 +irq2=5 +dma1=3 +dma2=3 +ultradir=C:\ULTRASND + +[midi] +mpu401 = uart +mididevice = default +midiconfig = 128:0 + +[serial] +serial1=file file:serial.log + +[autoexec] +@echo off +mount c: /home/nuclear/dos +mount d: . +d: +set PATH=%PATH%;c:\bin;C:\NC;C:\prog\nasm;C:\prog\vim\vim72;C:\windows +set TEMP=c:\windows\temp +set RRLOG=COM1 +echo For dev env setup: watdev, bcdev, djdev, tpdev diff --git a/src/dos/main.c b/src/dos/main.c index 1c694c8..8bcc718 100644 --- a/src/dos/main.c +++ b/src/dos/main.c @@ -18,6 +18,7 @@ along with this program. If not, see . #include #include #include +#include #include #include "app.h" #include "keyb.h" @@ -47,6 +48,7 @@ int main(int argc, char **argv) int vmidx; int mx, my, mdx, mdy, prev_mx, prev_my, bnstate, bndiff; static int prev_bnstate; + char *env; #ifdef __DJGPP__ __djgpp_nearptr_enable(); @@ -65,7 +67,14 @@ int main(int argc, char **argv) return 1; } - /*add_log_file("retroray.log");*/ + if((env = getenv("RRLOG"))) { + if(tolower(env[0]) == 'c' && tolower(env[1]) == 'o' && tolower(env[2]) == 'm' + && isdigit(env[3])) { + add_log_console(env); + } else { + add_log_file(env); + } + } if(vid_init() == -1) { return 1; -- 1.7.10.4