Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-07 09:25:34 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

move things around this fixes linking (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2014-03-21 19:55:20 +00:00
parent 1b7f7f7217
commit c8513349dd
13 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitattributes vendored
View File

@ -2566,10 +2566,14 @@ src/emu/machine/serflash.c svneol=native#text/plain
src/emu/machine/serflash.h svneol=native#text/plain src/emu/machine/serflash.h svneol=native#text/plain
src/emu/machine/smc91c9x.c svneol=native#text/plain src/emu/machine/smc91c9x.c svneol=native#text/plain
src/emu/machine/smc91c9x.h svneol=native#text/plain src/emu/machine/smc91c9x.h svneol=native#text/plain
src/emu/machine/smc92x4.c svneol=native#text/plain
src/emu/machine/smc92x4.h svneol=native#text/plain
src/emu/machine/smpc.c svneol=native#text/plain src/emu/machine/smpc.c svneol=native#text/plain
src/emu/machine/smpc.h svneol=native#text/plain src/emu/machine/smpc.h svneol=native#text/plain
src/emu/machine/spchrom.c svneol=native#text/plain src/emu/machine/spchrom.c svneol=native#text/plain
src/emu/machine/spchrom.h svneol=native#text/plain src/emu/machine/spchrom.h svneol=native#text/plain
src/emu/machine/strata.c svneol=native#text/plain
src/emu/machine/strata.h svneol=native#text/plain
src/emu/machine/stvcd.c svneol=native#text/plain src/emu/machine/stvcd.c svneol=native#text/plain
src/emu/machine/t10mmc.c svneol=native#text/plain src/emu/machine/t10mmc.c svneol=native#text/plain
src/emu/machine/t10mmc.h svneol=native#text/plain src/emu/machine/t10mmc.h svneol=native#text/plain
@ -2581,6 +2585,8 @@ src/emu/machine/tc009xlvc.c svneol=native#text/plain
src/emu/machine/tc009xlvc.h svneol=native#text/plain src/emu/machine/tc009xlvc.h svneol=native#text/plain
src/emu/machine/terminal.c svneol=native#text/plain src/emu/machine/terminal.c svneol=native#text/plain
src/emu/machine/terminal.h svneol=native#text/plain src/emu/machine/terminal.h svneol=native#text/plain
src/emu/machine/ti99_hd.c svneol=native#text/plain
src/emu/machine/ti99_hd.h svneol=native#text/plain
src/emu/machine/timekpr.c svneol=native#text/plain src/emu/machine/timekpr.c svneol=native#text/plain
src/emu/machine/timekpr.h svneol=native#text/plain src/emu/machine/timekpr.h svneol=native#text/plain
src/emu/machine/tmp68301.c svneol=native#text/plain src/emu/machine/tmp68301.c svneol=native#text/plain
@ -8551,8 +8557,6 @@ src/mess/machine/sgi.c svneol=native#text/plain
src/mess/machine/sgi.h svneol=native#text/plain src/mess/machine/sgi.h svneol=native#text/plain
src/mess/machine/smartmed.c svneol=native#text/plain src/mess/machine/smartmed.c svneol=native#text/plain
src/mess/machine/smartmed.h svneol=native#text/plain src/mess/machine/smartmed.h svneol=native#text/plain
src/mess/machine/smc92x4.c svneol=native#text/plain
src/mess/machine/smc92x4.h svneol=native#text/plain
src/mess/machine/sms.c svneol=native#text/plain src/mess/machine/sms.c svneol=native#text/plain
src/mess/machine/snescx4.c svneol=native#text/plain src/mess/machine/snescx4.c svneol=native#text/plain
src/mess/machine/snescx4.h svneol=native#text/plain src/mess/machine/snescx4.h svneol=native#text/plain
@ -8562,8 +8566,6 @@ src/mess/machine/sorcerer.c svneol=native#text/plain
src/mess/machine/spec_snqk.c svneol=native#text/plain src/mess/machine/spec_snqk.c svneol=native#text/plain
src/mess/machine/spec_snqk.h svneol=native#text/plain src/mess/machine/spec_snqk.h svneol=native#text/plain
src/mess/machine/special.c svneol=native#text/plain src/mess/machine/special.c svneol=native#text/plain
src/mess/machine/strata.c svneol=native#text/plain
src/mess/machine/strata.h svneol=native#text/plain
src/mess/machine/super80.c svneol=native#text/plain src/mess/machine/super80.c svneol=native#text/plain
src/mess/machine/svi318.c svneol=native#text/plain src/mess/machine/svi318.c svneol=native#text/plain
src/mess/machine/swim.c svneol=native#text/plain src/mess/machine/swim.c svneol=native#text/plain
@ -8601,8 +8603,6 @@ src/mess/machine/ti99/speech8.c svneol=native#text/plain
src/mess/machine/ti99/speech8.h svneol=native#text/plain src/mess/machine/ti99/speech8.h svneol=native#text/plain
src/mess/machine/ti99/ti990.c svneol=native#text/plain src/mess/machine/ti99/ti990.c svneol=native#text/plain
src/mess/machine/ti99/ti990.h svneol=native#text/plain src/mess/machine/ti99/ti990.h svneol=native#text/plain
src/mess/machine/ti99/ti99_hd.c svneol=native#text/plain
src/mess/machine/ti99/ti99_hd.h svneol=native#text/plain
src/mess/machine/ti99/ti99defs.h svneol=native#text/plain src/mess/machine/ti99/ti99defs.h svneol=native#text/plain
src/mess/machine/ti99/videowrp.c svneol=native#text/plain src/mess/machine/ti99/videowrp.c svneol=native#text/plain
src/mess/machine/ti99/videowrp.h svneol=native#text/plain src/mess/machine/ti99/videowrp.h svneol=native#text/plain

2
src/emu/bus/ti99_peb/hfdc.h
View File

@ -16,7 +16,7 @@
#include "emu.h" #include "emu.h"
#include "peribox.h" #include "peribox.h"
#include "machine/ti99/ti99_hd.h" #include "machine/ti99_hd.h"
#include "machine/smc92x4.h" #include "machine/smc92x4.h"
#include "machine/mm58274c.h" #include "machine/mm58274c.h"

2
src/emu/bus/ti99_peb/peribox.c
View File

@ -180,7 +180,7 @@ CRUCLK* 51||52 DBIN
#include "peribox.h" #include "peribox.h"
// MFM hard drives // MFM hard drives
#include "machine/ti99/ti99_hd.h" #include "machine/ti99_hd.h"
// The cards // The cards
#include "ti_32kmem.h" #include "ti_32kmem.h"

2
src/emu/bus/ti99_peb/tn_ide.c
View File

@ -31,7 +31,7 @@
#include "peribox.h" #include "peribox.h"
#include "machine/ataintf.h" #include "machine/ataintf.h"
#include "tn_ide.h" #include "tn_ide.h"
#include "machine/ti99/ti99_hd.h" #include "machine/ti99_hd.h"
#define CRU_BASE 0x1000 #define CRU_BASE 0x1000

27
src/emu/machine/machine.mak
View File

@ -1811,3 +1811,30 @@ endif
ifneq ($(filter AT_KEYBC,$(MACHINES)),) ifneq ($(filter AT_KEYBC,$(MACHINES)),)
MACHINEOBJS += $(MACHINEOBJ)/at_keybc.o MACHINEOBJS += $(MACHINEOBJ)/at_keybc.o
endif endif
#-------------------------------------------------
#
#@src/emu/machine/smc92x4.h,MACHINES += SMC92X4
#-------------------------------------------------
ifneq ($(filter SMC92X4,$(MACHINES)),)
MACHINEOBJS += $(MACHINEOBJ)/smc92x4.o
endif
#-------------------------------------------------
#
#@src/emu/machine/ti99_hd.h,MACHINES += TI99_HD
#-------------------------------------------------
ifneq ($(filter TI99_HD,$(MACHINES)),)
MACHINEOBJS += $(MACHINEOBJ)/ti99_hd.o
endif
#-------------------------------------------------
#
#@src/emu/machine/strata.h,MACHINES += STRATA
#-------------------------------------------------
ifneq ($(filter STRATA,$(MACHINES)),)
MACHINEOBJS += $(MACHINEOBJ)/strata.o
endif

0
src/mess/machine/smc92x4.c → src/emu/machine/smc92x4.c
View File

2
src/mess/machine/smc92x4.h → src/emu/machine/smc92x4.h
View File

@ -3,7 +3,7 @@
#ifndef __SMC92X4_H__ #ifndef __SMC92X4_H__
#define __SMC92X4_H__ #define __SMC92X4_H__
#include "ti99/ti99_hd.h" #include "ti99_hd.h"
#include "imagedev/flopdrv.h" #include "imagedev/flopdrv.h"
#include "formats/imageutl.h" #include "formats/imageutl.h"
#include "imagedev/harddriv.h" #include "imagedev/harddriv.h"

0
src/mess/machine/strata.c → src/emu/machine/strata.c
View File

0
src/mess/machine/strata.h → src/emu/machine/strata.h
View File

2
src/mess/machine/ti99/ti99_hd.c → src/emu/machine/ti99_hd.c
View File

@ -18,7 +18,7 @@
#include "emu.h" #include "emu.h"
#include "formats/imageutl.h" #include "formats/imageutl.h"
#include "harddisk.h" #include "harddisk.h"
#include "machine/smc92x4.h" #include "smc92x4.h"
#include "ti99_hd.h" #include "ti99_hd.h"

0
src/mess/machine/ti99/ti99_hd.h → src/emu/machine/ti99_hd.h
View File

14
src/mess/drivers/ti99_2.c
View File

@ -81,11 +81,6 @@ would just have taken three extra tracks on the main board and a OR gate in an A
#include "machine/tms9901.h" #include "machine/tms9901.h"
#include "cpu/tms9900/tms9995.h" #include "cpu/tms9900/tms9995.h"
// FIXME: The following includes are here for the sole purpose of forcing the linker to include the specified objects
#include "machine/smc92x4.h"
#include "machine/ti99/ti99_hd.h"
#include "machine/strata.h"
class ti99_2_state : public driver_device class ti99_2_state : public driver_device
{ {
public: public:
@ -94,11 +89,7 @@ public:
m_videoram(*this, "videoram"), m_videoram(*this, "videoram"),
m_maincpu(*this, "maincpu"), m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"), m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"), m_palette(*this, "palette") { }
m_dummy1(*this, "linkingdummy1"),
m_dummy2(*this, "linkingdummy2"),
m_dummy3(*this, "linkingdummy3")
{ }
required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_videoram;
int m_ROM_paged; int m_ROM_paged;
@ -116,9 +107,6 @@ public:
required_device<cpu_device> m_maincpu; required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode; required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette; required_device<palette_device> m_palette;
optional_device<smc92x4_device> m_dummy1;
optional_device<mfm_harddisk_device> m_dummy2;
optional_device<strataflash_device> m_dummy3;
}; };

6
src/mess/mess.mak
View File

@ -511,6 +511,9 @@ MACHINES += Z80PIO
MACHINES += Z80SIO MACHINES += Z80SIO
MACHINES += Z80STI MACHINES += Z80STI
MACHINES += Z8536 MACHINES += Z8536
MACHINES += SMC92X4
MACHINES += TI99_HD
MACHINES += STRATA
#------------------------------------------------- #-------------------------------------------------
# specify available bus cores # specify available bus cores
@ -851,8 +854,6 @@ $(MESSOBJ)/shared.a: \
$(MESS_MACHINE)/applefdc.o \ $(MESS_MACHINE)/applefdc.o \
$(MESS_MACHINE)/microdrv.o \ $(MESS_MACHINE)/microdrv.o \
$(MESS_MACHINE)/smartmed.o \ $(MESS_MACHINE)/smartmed.o \
$(MESS_MACHINE)/smc92x4.o \
$(MESS_MACHINE)/strata.o \
$(MESS_MACHINE)/sonydriv.o \ $(MESS_MACHINE)/sonydriv.o \
$(MESS_MACHINE)/z80bin.o \ $(MESS_MACHINE)/z80bin.o \
@ -1858,7 +1859,6 @@ $(MESSOBJ)/ti.a: \
$(MESS_MACHINE)/ti99/joyport.o \ $(MESS_MACHINE)/ti99/joyport.o \
$(MESS_MACHINE)/ti99/mecmouse.o \ $(MESS_MACHINE)/ti99/mecmouse.o \
$(MESS_MACHINE)/ti99/handset.o \ $(MESS_MACHINE)/ti99/handset.o \
$(MESS_MACHINE)/ti99/ti99_hd.o \
$(MESS_MACHINE)/ti99/speech8.o \ $(MESS_MACHINE)/ti99/speech8.o \
$(MESS_MACHINE)/ti99/mapper8.o \ $(MESS_MACHINE)/ti99/mapper8.o \
$(MESS_MACHINE)/ti99/genboard.o \ $(MESS_MACHINE)/ti99/genboard.o \