1.1 --- a/src/main.c Tue Oct 16 12:28:42 2007 +0000
1.2 +++ b/src/main.c Sun Oct 21 05:20:00 2007 +0000
1.5 - * $Id: main.c,v 1.29 2007-10-16 12:28:42 nkeynes Exp $
1.6 + * $Id: main.c,v 1.30 2007-10-17 11:26:44 nkeynes Exp $
1.8 * Main program, initializes dreamcast and gui, then passes control off to
1.9 * the gtk main loop (currently).
1.11 * GNU General Public License for more details.
1.14 -#ifdef HAVE_CONFIG_H
1.15 -# include <config.h>
1.21 +#include "config.h"
1.22 #include "syscall.h"
1.24 #include "dreamcast.h"
1.25 #include "display.h"
1.28 #include "aica/audio.h"
1.29 #include "gdrom/gdrom.h"
1.30 #include "maple/maple.h"
1.32 char *disc_file = NULL;
1.33 char *display_driver_name = "gtk";
1.34 char *audio_driver_name = "esd";
1.35 -char *config_file = DEFAULT_CONFIG_FILENAME;
1.36 gboolean start_immediately = FALSE;
1.37 gboolean headless = FALSE;
1.38 gboolean without_bios = FALSE;
1.40 aica_program = optarg;
1.42 case 'c': /* Config file */
1.43 - config_file = optarg;
1.44 + lxdream_set_config_filename(optarg);
1.46 case 'd': /* Mount disc */
1.52 - dreamcast_load_config( config_file );
1.53 + lxdream_load_config( );
1.55 if( aica_program == NULL ) {