np2/x11/main.c - diff

Return to main.c CVS log

Up to [RetroPC.NET] / np2 / x11

version 1.29, 2008/03/18 15:33:14	version 1.31, 2008/04/03 13:52:49
Line 31	Line 31
#include <getopt.h>	#include <getopt.h>
#include <signal.h>	#include <signal.h>

	#if defined(USE_SDLAUDIO) \|\| defined(USE_SDLMIXER)
	#include <SDL.h>
	#endif

#include "np2.h"	#include "np2.h"
#include "diskdrv.h"	#include "diskdrv.h"
#include "dosio.h"	#include "dosio.h"
Line 191 main(int argc, char *argv[])	Line 195 main(int argc, char *argv[])
}	}
if (modulefile[0] != '\0') {	if (modulefile[0] != '\0') {
/* font file */	/* font file */
snprintf(np2cfg.fontfile, sizeof(np2cfg.fontfile),	file_cpyname(np2cfg.fontfile, modulefile,
"%s/font.bmp", modulefile);	sizeof(np2cfg.fontfile));
	file_cutname(np2cfg.fontfile);
	file_setseparator(np2cfg.fontfile, sizeof(np2cfg.fontfile));
	file_catname(np2cfg.fontfile, "font.bmp",
	sizeof(np2cfg.fontfile));

/* resume/statsave dir */	/* resume/statsave dir */
file_cpyname(statpath, modulefile, sizeof(statpath));	file_cpyname(statpath, modulefile, sizeof(statpath));
Line 232 main(int argc, char *argv[])	Line 240 main(int argc, char *argv[])

TRACEINIT();	TRACEINIT();

	#if defined(USE_SDLAUDIO) \|\| defined(USE_SDLMIXER)
	SDL_Init(0);
	#endif

if (fontmng_init() != SUCCESS)	if (fontmng_init() != SUCCESS)
goto fontmng_failure;	goto fontmng_failure;

Line 355 fontmng_failure:	Line 367 fontmng_failure:

skbdwin_deinitialize();	skbdwin_deinitialize();

	#if defined(USE_SDLAUDIO) \|\| defined(USE_SDLMIXER)
	SDL_Quit();
	#endif

TRACETERM();	TRACETERM();
dosio_term();	dosio_term();

RetroPC.NET-CVS <cvs@retropc.net>