Previous

199869 Revisions

Next

r36862 Wednesday 1st April, 2015 at 02:51:10 UTC by Vasantha Crabb
Start removing the use of OSD macros outside OSD since core objects are shared between OSD builds

[src/emu]	emucore.h luaengine.c machine.c
[src/emu/cpu/m68000]	m68kcpu.h
[src/emu/netlist]	plists.h
[src/emu/ui]	ui.c

trunk/src/emu/cpu/m68000/m68kcpu.h

r245373	r245374
32	32
33	33	#include <limits.h>
34	34
35		#ifdef SDLMAME_SOLARIS
	35	#ifdef defined(__sun__) && defined(__svr4__)
36	36	#undef REG_SP
37	37	#undef REG_PC
38	38	#undef REG_FP

trunk/src/emu/emucore.h

r245373	r245374
23	23	#include <stdarg.h>
24	24
25	25	// some cleanups for Solaris for things defined in stdlib.h
26		#ifdef SDLMAME_SOLARIS
	26	#ifdef defined(__sun__) && defined(__svr4__)
27	27	#undef si_status
28	28	#undef WWORD
29	29	#endif
r245373	r245374
373	373	//**************************************************************************
374	374
375	375	// population count
376		#ifndef SDLMAME_NETBSD
	376	#ifndef defined(__NetBSD__)
377	377	inline int popcount(UINT32 val)
378	378	{
379	379	int count;

trunk/src/emu/luaengine.c

r245373	r245374
130	130	cb = -1;
131	131	}
132	132
133		#if defined(SDLMAME_SOLARIS) || defined(__ANDROID__)
	133	#if (defined(__sun__) && defined(__svr4__)) || defined(__ANDROID__)
134	134	#undef _L
135	135	#endif
136	136

trunk/src/emu/machine.c

r245373	r245374
385	385	{
386	386	g_profiler.start(PROFILER_EXTRA);
387	387
388		#ifdef SDLMAME_EMSCRIPTEN
	388	#if defined(EMSCRIPTEN)
389	389	//break out to our async javascript loop and halt
390	390	js_set_main_loop(this);
391	391	#endif
r245373	r245374
1344	1344	//  JAVASCRIPT PORT-SPECIFIC
1345	1345	//**************************************************************************
1346	1346
1347		#ifdef SDLMAME_EMSCRIPTEN
	1347	#if defined(EMSCRIPTEN)
1348	1348
1349	1349	static running_machine * jsmess_machine;
1350	1350
r245373	r245374
1377	1377	return &(jsmess_machine->sound());
1378	1378	}
1379	1379
1380		#endif /* SDLMAME_EMSCRIPTEN */
	1380	#endif /* defined(EMSCRIPTEN) */

trunk/src/emu/netlist/plists.h

r245373	r245374
199	199	// pnamedlist_t: a simple list
200	200	// ----------------------------------------------------------------------------------------
201	201
202		#if defined(SDLMAME_SOLARIS) || defined(__ANDROID__)
	202	#if defined(defined(__sun__) && defined(__svr4__)) || defined(__ANDROID__)
203	203	#undef _C
204	204	#endif
205	205

trunk/src/emu/ui/ui.c

r245373	r245374
319	319	if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
320	320	show_gameinfo = show_warnings = show_disclaimer = show_mandatory_fileman = FALSE;
321	321
322		#ifdef SDLMAME_EMSCRIPTEN
	322	#if defined(EMSCRIPTEN)
323	323	// also disable for the JavaScript port since the startup screens do not run asynchronously
324	324	show_gameinfo = show_warnings = show_disclaimer = FALSE;
325	325	#endif

https://github.com/mamedev/mame/commit/8a4145b48c0c20a9d4daa524b7f360a9c592f309

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team