move mess into mame (nw)

makefile

@@ -1159,7 +1159,6 @@ CPPCHECK_PARAMS += -Isrc/emu
 CPPCHECK_PARAMS += -Isrc/lib
 CPPCHECK_PARAMS += -Isrc/lib/util
 CPPCHECK_PARAMS += -Isrc/mame
-CPPCHECK_PARAMS += -Isrc/mess 
 CPPCHECK_PARAMS += -Isrc/osd/modules/render
 CPPCHECK_PARAMS += -Isrc/osd/windows
 CPPCHECK_PARAMS += -Isrc/emu/cpu/m68000
@@ -1174,7 +1173,6 @@ CPPCHECK_PARAMS += -I3rdparty/bgfx/include
 CPPCHECK_PARAMS += -I3rdparty/bx/include
 CPPCHECK_PARAMS += -Ibuild/generated/emu 
 CPPCHECK_PARAMS += -Ibuild/generated/emu/layout
-CPPCHECK_PARAMS += -Ibuild/generated/mess/layout
 CPPCHECK_PARAMS += -Ibuild/generated/mame/layout 
 CPPCHECK_PARAMS += -DX64_WINDOWS_ABI
 CPPCHECK_PARAMS += -DPTR64=1

scripts/genie.lua

@@ -1268,6 +1268,7 @@ configuration { "vs2015" }
 			"/wd4463", -- warning C4463: overflow; assigning 1 to bit-field that can only hold values from -1 to 0
 			"/wd4297", -- warning C4297: 'xxx::~xxx': function assumed not to throw an exception but does
 			"/wd4319", -- warning C4319: 'operator' : zero extending 'type' to 'type' of greater size
+			"/wd4373", -- warning C4373: 'xxx': virtual function overrides 'xxx', previous versions of the compiler did not override when parameters only differed by const/volatile qualifiers
 		}
 configuration { "vs2010" }
 		buildoptions {

scripts/src/devices.lua

@@ -65,8 +65,7 @@ if (_OPTIONS["DRIVERS"] == nil) then
 		MAME_DIR .. "src/lib",
 		MAME_DIR .. "src/lib/util",
 		MAME_DIR .. "3rdparty",
-		MAME_DIR .. "src/mess", -- some mess bus devices need this
-		MAME_DIR .. "src/mame", -- used for nes bus devices
+		MAME_DIR .. "src/mame", -- used for nes bus devices,some mess bus devices need this
 		GEN_DIR  .. "emu",
 		GEN_DIR  .. "emu/layout",
 	}

scripts/src/tools.lua

@@ -709,7 +709,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/mess/tools/castool/main.c",
+	MAME_DIR .. "src/mame/tools/castool/main.c",
 }
 
 --------------------------------------------------
@@ -768,7 +768,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/mess/tools/floptool/main.c",
+	MAME_DIR .. "src/mame/tools/floptool/main.c",
 }
 
 --------------------------------------------------
@@ -825,44 +825,44 @@ includedirs {
 	MAME_DIR .. "src/lib",	
 	MAME_DIR .. "src/lib/util",
 	MAME_DIR .. "3rdparty/zlib",
-	MAME_DIR .. "src/mess/tools/imgtool",	
+	MAME_DIR .. "src/mame/tools/imgtool",	
 }
 
 files {
-	MAME_DIR .. "src/mess/tools/imgtool/main.c",
-	MAME_DIR .. "src/mess/tools/imgtool/stream.c",
-	MAME_DIR .. "src/mess/tools/imgtool/library.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules.c",
-	MAME_DIR .. "src/mess/tools/imgtool/iflopimg.c",
-	MAME_DIR .. "src/mess/tools/imgtool/filter.c",
-	MAME_DIR .. "src/mess/tools/imgtool/filteoln.c",
-	MAME_DIR .. "src/mess/tools/imgtool/filtbas.c",
-	MAME_DIR .. "src/mess/tools/imgtool/imgtool.c",
-	MAME_DIR .. "src/mess/tools/imgtool/imgterrs.c",
-	MAME_DIR .. "src/mess/tools/imgtool/imghd.c", 
-	MAME_DIR .. "src/mess/tools/imgtool/charconv.c",
-	MAME_DIR .. "src/mess/tools/imgtool/formats/vt_dsk.c",
-	MAME_DIR .. "src/mess/tools/imgtool/formats/vt_dsk.h",
-	MAME_DIR .. "src/mess/tools/imgtool/formats/coco_dsk.c",
-	MAME_DIR .. "src/mess/tools/imgtool/formats/coco_dsk.h",	
-	MAME_DIR .. "src/mess/tools/imgtool/modules/amiga.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/macbin.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/rsdos.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/os9.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/mac.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/ti99.c", 
-	MAME_DIR .. "src/mess/tools/imgtool/modules/ti990hd.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/concept.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/fat.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/pc_flop.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/pc_hard.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/prodos.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/vzdos.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/thomson.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/macutil.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/cybiko.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/cybikoxt.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/psion.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/bml3.c",
-	MAME_DIR .. "src/mess/tools/imgtool/modules/hp48.c",
+	MAME_DIR .. "src/mame/tools/imgtool/main.c",
+	MAME_DIR .. "src/mame/tools/imgtool/stream.c",
+	MAME_DIR .. "src/mame/tools/imgtool/library.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules.c",
+	MAME_DIR .. "src/mame/tools/imgtool/iflopimg.c",
+	MAME_DIR .. "src/mame/tools/imgtool/filter.c",
+	MAME_DIR .. "src/mame/tools/imgtool/filteoln.c",
+	MAME_DIR .. "src/mame/tools/imgtool/filtbas.c",
+	MAME_DIR .. "src/mame/tools/imgtool/imgtool.c",
+	MAME_DIR .. "src/mame/tools/imgtool/imgterrs.c",
+	MAME_DIR .. "src/mame/tools/imgtool/imghd.c", 
+	MAME_DIR .. "src/mame/tools/imgtool/charconv.c",
+	MAME_DIR .. "src/mame/tools/imgtool/formats/vt_dsk.c",
+	MAME_DIR .. "src/mame/tools/imgtool/formats/vt_dsk.h",
+	MAME_DIR .. "src/mame/tools/imgtool/formats/coco_dsk.c",
+	MAME_DIR .. "src/mame/tools/imgtool/formats/coco_dsk.h",	
+	MAME_DIR .. "src/mame/tools/imgtool/modules/amiga.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/macbin.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/rsdos.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/os9.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/mac.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/ti99.c", 
+	MAME_DIR .. "src/mame/tools/imgtool/modules/ti990hd.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/concept.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/fat.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/pc_flop.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/pc_hard.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/prodos.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/vzdos.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/thomson.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/macutil.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/cybiko.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/cybikoxt.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/psion.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/bml3.c",
+	MAME_DIR .. "src/mame/tools/imgtool/modules/hp48.c",
 }

scripts/target/mame/dummy.lua

@@ -26,7 +26,7 @@ function createProjects_mame_dummy(_target, _subtarget)
 		MAME_DIR .. "src/osd",
 		MAME_DIR .. "src/emu",
 		MAME_DIR .. "src/devices",
-		MAME_DIR .. "src/mess",
+		MAME_DIR .. "src/mame",
 		MAME_DIR .. "src/lib",
 		MAME_DIR .. "src/lib/util",
 		MAME_DIR .. "3rdparty",
@@ -34,8 +34,8 @@ function createProjects_mame_dummy(_target, _subtarget)
 	}
 
 	files{
-		MAME_DIR .. "src/mess/drivers/coleco.c",
-		MAME_DIR .. "src/mess/machine/coleco.c",
+		MAME_DIR .. "src/mame/drivers/coleco.c",
+		MAME_DIR .. "src/mame/machine/coleco.c",
 	}
 end
 

src/build/makedep.py

@@ -10,13 +10,13 @@ import sys
 
 files_included = ['src/emu/emu.h']
 
-include_dirs = ['src/emu/', 'src/devices/', 'src/mame/', 'src/mess/']
+include_dirs = ['src/emu/', 'src/devices/', 'src/mame/']
 
 mappings = dict()
 
 deps_files_included = [ ]
 
-deps_include_dirs = ['src/mame/', 'src/mess/']
+deps_include_dirs = ['src/mame/']
 
 components = [ ]
 
@@ -289,7 +289,6 @@ if sys.argv[3]=='target':
     sys.stdout.write('        MAME_DIR .. "src/emu",\n')
     sys.stdout.write('        MAME_DIR .. "src/devices",\n')
     sys.stdout.write('        MAME_DIR .. "src/mame",\n')
-    sys.stdout.write('        MAME_DIR .. "src/mess",\n')
     sys.stdout.write('        MAME_DIR .. "src/lib",\n')
     sys.stdout.write('        MAME_DIR .. "src/lib/util",\n')
     sys.stdout.write('        MAME_DIR .. "3rdparty",\n')

src/devices/bus/ieee488/softbox.c

@@ -10,7 +10,7 @@
     This is an emulation of the SoftBox as a PET/CBM peripheral, where
     the PET is used as a terminal over IEEE-488.  For the standalone
     mode where an RS-232 terminal is used, and also information on
-    how to set up the Corvus drive, see: src/mess/drivers/softbox.c.
+    how to set up the Corvus drive, see: src/mame/drivers/softbox.c.
 */