1
0
Fork 0

added help messages for the configfile and updated the readme and install to reflect libpng and zlib

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@396
This commit is contained in:
Peter Veenstra 2002-10-22 17:52:38 +00:00
parent 2f528432fc
commit 18ae21e866
13 changed files with 35 additions and 11 deletions

15
INSTALL
View file

@ -11,8 +11,17 @@ Curses
ncurses should be installed on just about every unix distro.
For win32 get pdcurses at http://pdcurses.sourceforge.net
Libpng
Needed for the screenshots.
For win32 get libpng from http://www.sourceforge.net/projects/gnuwin32
Zlib
Needed by libpng.
For win32 get libz (rename to zlib) from http://www.sourceforge.net/projects/gnuwin32
If you want compile from the CVS under a unix system, you'll also need
automake, autoconf. Should be available at http://www.gnu.org
automake (>=1.6), autoconf(>=2.50). Should be available at http://www.gnu.org
For building on unix systems.
If you are building from the cvs run ./autogen.sh first before doing the following.
@ -21,8 +30,7 @@ If you are building from the cvs run ./autogen.sh first before doing the followi
2. Check settings.h for some setup options.
3. make
Check the src subdir for the binary and dosbox.lang file.
These 2 files should be in the same dir if you want to run dosbox.
Check the src subdir for the binary.
Compiling on FreeBSD might be a problem since SDL has no joystick support there.
To get around this edit sdlmain.cpp to enable some #define.
@ -32,5 +40,4 @@ Let's hope someday the sdl people will just report 0 joysticks in freebsd or get
Build instructions for VC++6
Open the workspace in the visualc subdir and build from there.
Copy the src/dosbox.lang file to the same dir as your executable.

8
README
View file

@ -1,10 +1,11 @@
DOSBox v0.55
DOSBox v0.56
Usage:
======
With the new internal shell I've changed the command line a bit, so let's just give some
examples of what you can do now.
dosbox
With nothing on the command line you'll end up on the internal drive and from there you
can mount directories as drives.
@ -14,6 +15,11 @@ dosbox [filename/directory]
.bat .com .exe. Doesn't need to have extension included. Then it'll strip the directory
from the filename and mount that as c:\ and then run the file.
dosbox -fullscreen
starts dosbox in fullscreen mode.
dosbox -conf file
loads file as a configfile.
You can also add commands to be executed before the main program starts. Or you can use them
to start the program.
To add commands use the -c command line switch.

View file

@ -170,5 +170,6 @@ void CPU_Init(Section* sec) {
reg_al=0;
reg_ah=0;
MSG_Add("CPU_CONFIGFILE_HELP","The amount of cycles to execute each loop. Lowering this setting will slowdown dosbox\n");
}

View file

@ -706,6 +706,7 @@ void DEBUG_Init(Section* sec) {
#ifdef WIN32
WIN32_Console();
#endif
MSG_Add("DEBUG_CONFIGFILE_HELP","Nothing to setup yet!\n");
memset((void *)&dbg,0,sizeof(dbg));
debugging=false;
dbg.active_win=3;

View file

@ -830,6 +830,7 @@ static Bitu DOS_20Handler(void) {
void DOS_Init(Section* sec) {
MSG_Add("DOS_CONFIGFILE_HELP","Setting a memory size to 0 will disable it.\n");
call_20=CALLBACK_Allocate();
CALLBACK_Setup(call_20,DOS_20Handler,CB_IRET);
RealSetVec(0x20,CALLBACK_RealPointer(call_20));

View file

@ -123,7 +123,8 @@ static void DOSBOX_RealInit(Section * sec) {
Section_prop * section=static_cast<Section_prop *>(sec);
/* Initialize some dosbox internals */
errorlevel=section->Get_int("warnings");
LastTicks=GetTicks();
MSG_Add("DOSBOX_CONFIGFILE_HELP","General Dosbox settings\n");
LastTicks=GetTicks();
DOSBOX_SetLoop(&Normal_Loop);
MSG_Init(section);
}
@ -137,7 +138,7 @@ void DOSBOX_Init(void) {
/* Setup all the different modules making up DOSBox */
secprop=control->AddSection_prop("dosbox",&DOSBOX_RealInit);
secprop->Add_string("language","");
secprop->Add_string("language","");
secprop->Add_int("warnings",4);
secprop->AddInitFunction(&MEM_Init);
@ -191,7 +192,7 @@ void DOSBOX_Init(void) {
secprop->Add_int("xmssize",8);
secline=control->AddSection_line("autoexec",&AUTOEXEC_Init);
control->SetStartUp(&SHELL_Init);
#if C_FPU

View file

@ -225,6 +225,7 @@ static void GUI_ShutDown(Section * sec) {
}
static void GUI_StartUp(Section * sec) {
MSG_Add("SDL_CONFIGFILE_HELP","SDL related options.\n");
sec->AddDestroyFunction(&GUI_ShutDown);
Section_prop * section=static_cast<Section_prop *>(sec);
sdl.active=false;
@ -507,7 +508,7 @@ int main(int argc, char* argv[]) {
#endif
) < 0 ) E_Exit("Can't init SDL %s",SDL_GetError());
Section_prop * sdl_sec=control->AddSection_prop("SDL",&GUI_StartUp);
sdl_sec->Add_bool("FULLSCREEN",false);
sdl_sec->Add_bool("fullscreen",false);
/* Init all the dosbox subsystems */
DOSBOX_Init();
std::string config_file;
@ -529,7 +530,7 @@ int main(int argc, char* argv[]) {
JOYSTICK_Enable(0,true);
}
#endif
if (control->cmdline->FindExist("-fullscreen") || sdl_sec->Get_bool("FULLSCREEN")) {
if (control->cmdline->FindExist("-fullscreen") || sdl_sec->Get_bool("fullscreen")) {
SwitchFullScreen();
}
/* Start up main machine */

View file

@ -218,6 +218,7 @@ static void MIXER_CallBack(void * userdata, Uint8 *stream, int len) {
void MIXER_Init(Section* sec) {
MSG_Add("MIXER_CONFIGFILE_HELP","Nothing to setup yet!\n");
/* Initialize the internal stuff */
first_channel=0;
mix_ticks=GetTicks();

View file

@ -96,6 +96,7 @@ static void PCSPEAKER_CallBack(Bit8u * stream,Bit32u len) {
}
void PCSPEAKER_Init(Section* sec) {
MSG_Add("SPEAKER_CONFIGFILE_HELP","pcspeaker related options.\n");
spkr.chan=MIXER_AddChannel(&PCSPEAKER_CallBack,SPKR_RATE,"PC-SPEAKER");
MIXER_Enable(spkr.chan,false);
MIXER_SetMode(spkr.chan,MIXER_16MONO);

View file

@ -557,6 +557,7 @@ static void SB_Enable(bool enable) {
}
void SBLASTER_Init(Section* sec) {
MSG_Add("SBLASTER_CONFIGFILE_HELP","Sound Blaster related options.\n");
Section_prop * section=static_cast<Section_prop *>(sec);
if(!section->Get_bool("enabled")) return;
sb.chan=MIXER_AddChannel(&SBLASTER_CallBack,22050,"SBLASTER");

View file

@ -208,6 +208,7 @@ void BIOS_SetupKeyboard(void);
void BIOS_SetupDisks(void);
void BIOS_Init(Section* sec) {
MSG_Add("BIOS_CONFIGFILE_HELP","Nothing to setup yet!\n");
/* Clear the Bios Data Area */
for (Bit16u i=0;i<1024;i++) real_writeb(0x40,i,0);
/* Setup all the interrupt handlers the bios controls */

View file

@ -41,7 +41,7 @@ void Prop_string::SetValue(char* input){
void Prop_bool::SetValue(char* input){
input=trim(input);
if((input[0]=='0') ||(input[0]=='D')||( (input[0]=='O') && (input[0]=='F'))){
if((input[0]=='0') ||(input[0]=='D')||( (input[0]=='O') && (input[0]=='F'))||(input[0]=='f')){
__value._bool=false;
}else{
__value._bool=true;
@ -231,6 +231,7 @@ void Config::ParseConfigFile(const char* configfilename){
case '%':
case '\0':
case '\n':
case '#':
case ' ':
continue;
break;

View file

@ -134,6 +134,7 @@ void DOS_Shell::SyntaxError(void) {
void AUTOEXEC_Init(Section * sec) {
MSG_Add("AUTOEXEC_CONFIGFILE_HELP","Add here the lines you want to execute on startup.\n");
/* Register a virtual AUOEXEC.BAT file */
Section_line * section=static_cast<Section_line *>(sec);