summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2011-05-06 12:45:56 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2011-05-06 12:45:56 +0000
commit29e7942986f2a2d4daf65619c2c9f1cf607d535b (patch)
tree6eb3eb90106555e53ab029f989caf2c2210fdd59
parentf280fd9f990a676e74880125bc84de378555fd43 (diff)
Moved centronics device to proper location (no whatsnew)
-rw-r--r--.gitattributes4
-rw-r--r--src/emu/emu.mak1
-rw-r--r--src/emu/machine/ctronics.c (renamed from src/mame/machine/ctronics.c)0
-rw-r--r--src/emu/machine/ctronics.h (renamed from src/mame/machine/ctronics.h)0
-rw-r--r--src/mame/mame.mak1
5 files changed, 3 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes
index d6463eaa155..ae287236aaf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -778,6 +778,8 @@ src/emu/machine/com8116.c svneol=native#text/plain
src/emu/machine/com8116.h svneol=native#text/plain
src/emu/machine/cr589.c svneol=native#text/plain
src/emu/machine/cr589.h svneol=native#text/plain
+src/emu/machine/ctronics.c svneol=native#text/plain
+src/emu/machine/ctronics.h svneol=native#text/plain
src/emu/machine/devhelpr.h svneol=native#text/plain
src/emu/machine/ds1302.c svneol=native#text/plain
src/emu/machine/ds1302.h svneol=native#text/plain
@@ -3596,8 +3598,6 @@ src/mame/machine/cdislave.c svneol=native#text/plain
src/mame/machine/cdislave.h svneol=native#text/plain
src/mame/machine/chaknpop.c svneol=native#text/plain
src/mame/machine/cps2crpt.c svneol=native#text/plain
-src/mame/machine/ctronics.c svneol=native#text/plain
-src/mame/machine/ctronics.h svneol=native#text/plain
src/mame/machine/cx4data.c svneol=native#text/plain
src/mame/machine/cx4fn.c svneol=native#text/plain
src/mame/machine/cx4oam.c svneol=native#text/plain
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 98bdd28c7e0..6c51ef8da25 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -164,6 +164,7 @@ EMUMACHINEOBJS = \
$(EMUMACHINE)/cdp1871.o \
$(EMUMACHINE)/com8116.o \
$(EMUMACHINE)/cr589.o \
+ $(EMUMACHINE)/ctronics.o \
$(EMUMACHINE)/ds1302.o \
$(EMUMACHINE)/ds2401.o \
$(EMUMACHINE)/ds2404.o \
diff --git a/src/mame/machine/ctronics.c b/src/emu/machine/ctronics.c
index 8d6acbe7b64..8d6acbe7b64 100644
--- a/src/mame/machine/ctronics.c
+++ b/src/emu/machine/ctronics.c
diff --git a/src/mame/machine/ctronics.h b/src/emu/machine/ctronics.h
index a5d3bdf8e1a..a5d3bdf8e1a 100644
--- a/src/mame/machine/ctronics.h
+++ b/src/emu/machine/ctronics.h
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 3d69df4b3af..2c32248ab48 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -348,7 +348,6 @@ DRVLIBS += \
$(MAMEOBJ)/shared.a: \
$(MACHINE)/nmk112.o \
- $(MACHINE)/ctronics.o \
$(MACHINE)/pckeybrd.o \
$(MACHINE)/pcshare.o \
$(MACHINE)/segacrpt.o \