From da8c30dfe4a7b13454ed28386ec009208016dba7 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 17 Jan 2015 10:06:55 +0100 Subject: fixed osdmini compile (nw) --- src/osd/osdmini/minimain.c | 21 ++++++++++++++++----- src/osd/osdmini/osdmini.h | 13 +++++++++++-- src/osd/osdmini/osdmini.mak | 13 ++++++++----- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/osd/osdmini/minimain.c b/src/osd/osdmini/minimain.c index 98964fc546f..c0598e65dfd 100644 --- a/src/osd/osdmini/minimain.c +++ b/src/osd/osdmini/minimain.c @@ -54,6 +54,16 @@ static UINT8 keyboard_state[KEY_TOTAL]; static INT32 keyboard_get_state(void *device_internal, void *item_internal); +//============================================================ +// mini_osd_options +//============================================================ + +mini_osd_options::mini_osd_options() +: osd_options() +{ + //add_entries(s_option_entries); +} + //============================================================ // main //============================================================ @@ -62,9 +72,9 @@ int main(int argc, char *argv[]) { // cli_frontend does the heavy lifting; if we have osd-specific options, we // create a derivative of cli_options and add our own - cli_options options; - mini_osd_interface osd; - osd.register_options(options); + mini_osd_options options; + mini_osd_interface osd(options); + osd.register_options(); cli_frontend frontend(options, osd); return frontend.execute(argc, argv); } @@ -74,7 +84,8 @@ int main(int argc, char *argv[]) // constructor //============================================================ -mini_osd_interface::mini_osd_interface() +mini_osd_interface::mini_osd_interface(mini_osd_options &options) +: osd_common_t(options) { } @@ -95,7 +106,7 @@ mini_osd_interface::~mini_osd_interface() void mini_osd_interface::init(running_machine &machine) { // call our parent - osd_interface::init(machine); + osd_common_t::init(machine); // initialize the video system by allocating a rendering target our_target = machine.render().target_alloc(); diff --git a/src/osd/osdmini/osdmini.h b/src/osd/osdmini/osdmini.h index 35db06c881c..c0519c98b12 100644 --- a/src/osd/osdmini/osdmini.h +++ b/src/osd/osdmini/osdmini.h @@ -8,17 +8,26 @@ #include "options.h" #include "osdepend.h" +#include "modules/lib/osdobj_common.h" +class mini_osd_options : public osd_options +{ +public: + // construction/destruction + mini_osd_options(); + +}; + //============================================================ // TYPE DEFINITIONS //============================================================ -class mini_osd_interface : public osd_interface +class mini_osd_interface : public osd_common_t { public: // construction/destruction - mini_osd_interface(); + mini_osd_interface(mini_osd_options &options); virtual ~mini_osd_interface(); // general overridables diff --git a/src/osd/osdmini/osdmini.mak b/src/osd/osdmini/osdmini.mak index db78f4fce78..4ce98edbcd0 100644 --- a/src/osd/osdmini/osdmini.mak +++ b/src/osd/osdmini/osdmini.mak @@ -50,9 +50,10 @@ MINIOBJ = $(OBJ)/osd/$(OSD) OSDSRC = $(SRC)/osd OSDOBJ = $(OBJ)/osd -OBJDIRS += $(MINIOBJ) $(OSDOBJ)/modules/sync - - +OBJDIRS += $(MINIOBJ) \ + $(OSDOBJ)/modules/sync \ + $(OSDOBJ)/modules/lib \ + $(OSDOBJ)/modules/midi #------------------------------------------------- # OSD core library @@ -64,14 +65,16 @@ OSDCOREOBJS = \ $(MINIOBJ)/minimisc.o \ $(MINIOBJ)/minisync.o \ $(MINIOBJ)/minitime.o \ - $(OSDOBJ)/modules/sync/work_mini.o \ #------------------------------------------------- # OSD mini library #------------------------------------------------- OSDOBJS = \ - $(MINIOBJ)/minimain.o + $(MINIOBJ)/minimain.o \ + $(OSDOBJ)/modules/sync/work_mini.o \ + $(OSDOBJ)/modules/lib/osdobj_common.o \ + $(OSDOBJ)/modules/midi/none.o \ ifeq ($(OS),Windows_NT) LIBS += -lwinmm -lwsock32 -- cgit v1.2.3