MAME SVN History

199869 Revisions

r26793 Saturday 28th December, 2013 at 14:57:22 UTC by Couriersud
Netlist, make some class variables protected. No wn

trunk/src/osd/windows/windows.mak
r26792	r26793
290	290
291	291	ifeq ($(DIRECTINPUT),8)
292	292	LIBS += -ldinput8
293		CCOMFLAGS += -DDIRECTINPUT_VERSION=0x0800
	293	CCOMFLAGS += -DDIRECTINPUT_VERSION=0x0800 -Idirectx
294	294	else
295	295	LIBS += -ldinput
296		CCOMFLAGS += -DDIRECTINPUT_VERSION=0x0700
	296	CCOMFLAGS += -DDIRECTINPUT_VERSION=0x0700 -Idirectx
297	297	endif
298	298
299	299	LIBS += -lcomdlg32

trunk/src/osd/sdl/sdl.mak
r26792	r26793
59	59	# active development on sdlmame or SDL.
60	60
61	61	# uncomment the next line to compile and link against SDL2.0
62		# SDL_LIBVER = sdl2
	62	SDL_LIBVER = sdl2
63	63
64	64	# uncomment the next line to use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release)
65	65	# SDL2_MULTIAPI = 1
66	66
67	67	# uncomment the next line to specify where you have installed
68	68	# SDL. Equivalent to the ./configure --prefix=<path>
69		# SDL_INSTALL_ROOT = /usr/local/sdl13
	69	SDL_INSTALL_ROOT = /usr/local/sdl20
70	70
71	71	# uncomment to disable the Qt debugger (on non-OSX this disables all debugging)
72	72	# NO_USE_QTDEBUG = 1

Property changes on: trunk/src/osd
Added: svn:ignore + winui

trunk/src/emu/machine/netlist.c
r26792	r26793
200	200	netlist_net_t *n = m_netlist->m_nets[i];
201	201	if (n->isRailNet())
202	202	{
203		state_add(i*2, n->name(), n->m_cur.Q);
	203	state_add(i*2, n->name(), n->Q_state_ptr());
204	204	}
205	205	else
206	206	{
207		state_add(i*2+1, n->name(), n->m_~~cur.~~Analog).formatstr("%20s");
	207	state_add(i*2+1, n->name(), n->Q_Analog_state_ptr()).formatstr("%20s");
208	208	}
209	209	}
210	210

trunk/src/emu/netlist/nl_base.h
r26792	r26793
581	581	ATTR_HOT inline void push_to_queue(const netlist_time &delay);
582	582	ATTR_HOT bool is_queued() { return m_in_queue == 1; }
583	583
	584	/* internal state support
	585	* FIXME: get rid of this and implement export/import in MAME
	586	*/
	587	ATTR_COLD inline netlist_sig_t &Q_state_ptr()
	588	{
	589	assert(family() == LOGIC);
	590	return m_cur.Q;
	591	}
	592
	593	ATTR_COLD inline double &Q_Analog_state_ptr()
	594	{
	595	//assert(object_type(SIGNAL_MASK) == SIGNAL_ANALOG);
	596	assert(family() == ANALOG);
	597	return m_cur.Analog;
	598	}
	599
584	600	// m_terms is only used by analog subsystem
585	601	typedef netlist_list_t<netlist_terminal_t *> terminal_list_t;
586	602
r26792	r26793
589	605
590	606	netlist_core_terminal_t *m_head;
591	607
592		// the following three must be public for mame support
593		//protected:
594
595		hybrid_t m_last;
596		hybrid_t m_cur;
597		hybrid_t m_new;
598
599	608	/* use this to register state.... */
600	609	ATTR_COLD virtual void late_save_register()
601	610	{
r26792	r26793
612	621	}
613	622
614	623	protected:
615		UINT32 m_num_cons;
616	624
	625	UINT32 m_num_cons;
	626
	627	hybrid_t m_last;
	628	hybrid_t m_cur;
	629	hybrid_t m_new;
	630
617	631	/* we don't use this to save state
618	632	* because we may get deleted again ...
619	633	*/

199869 Revisions