MAME now represent full build, for building MESS drivers only use [Miodrag Milanovic]

make SUBTARGET=mess, for building only Arcades drivers only use:
make SUBTARGET=arcade

scripts/genie.lua

@@ -333,7 +333,11 @@ if (_OPTIONS["subtarget"] == nil) then return false end
 if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then
 	solution (_OPTIONS["target"])
 else
-	solution (_OPTIONS["target"] .. _OPTIONS["subtarget"])
+	if (_OPTIONS["subtarget"]=="mess") then
+		solution (_OPTIONS["subtarget"])
+	else
+		solution (_OPTIONS["target"] .. _OPTIONS["subtarget"])
+	end	
 end
 
 configurations {
@@ -1107,7 +1111,11 @@ dofile(path.join("src", "main.lua"))
 if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then
 	startproject (_OPTIONS["target"])
 else
-	startproject (_OPTIONS["target"] .. _OPTIONS["subtarget"])
+	if (_OPTIONS["subtarget"]=="mess") then
+		startproject (_OPTIONS["subtarget"])
+	else
+		startproject (_OPTIONS["target"] .. _OPTIONS["subtarget"])
+	end
 end
 mainProject(_OPTIONS["target"],_OPTIONS["subtarget"])
 

scripts/src/main.lua

@@ -2,7 +2,11 @@ function mainProject(_target, _subtarget)
 	if (_target == _subtarget) then
 		project (_target)
 	else
-		project (_target .. _subtarget)
+		if (_subtarget=="mess") then
+			project (_subtarget)
+		else
+			project (_target .. _subtarget)
+		end
 	end	
 	uuid (os.uuid(_target .."_" .. _subtarget))
 	kind "ConsoleApp"
@@ -141,21 +145,20 @@ function mainProject(_target, _subtarget)
 	end
 
 	if _OPTIONS["targetos"]=="windows" and (not override_resources) then
-		local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/".._OPTIONS["osd"].."/" .. _target ..".rc"
+		local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/".._OPTIONS["osd"].."/"  .. _subtarget .. "/" .. _subtarget ..".rc"
 		if not os.isfile(rcfile) then
-			rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _target ..".rc"
+			rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _subtarget .. "/" .. _subtarget ..".rc"
 		end
-		
 		if os.isfile(rcfile) then
 			files {
 				rcfile,
 			}
 			dependency {
-				{ "$(OBJDIR)/".._target ..".res" ,  GEN_DIR  .. "/resource/" .. _target .. "vers.rc", true  },
+				{ "$(OBJDIR)/".._subtarget ..".res" ,  GEN_DIR  .. "/resource/" .. _target .. "vers.rc", true  },
 			}
 		else
 			files {
-				MAME_DIR .. "src/osd/windows/mame.rc",
+				MAME_DIR .. "src/mame/osd/windows/mame/mame.rc",
 			}
 			dependency {
 				{ "$(OBJDIR)/mame.res" ,  GEN_DIR  .. "/resource/" .. _target .. "vers.rc", true  },

scripts/src/tools.lua

@@ -454,8 +454,6 @@ files {
 
 dofile("netlist.lua")
 
-
-if (_OPTIONS["target"]~="mame") then
 --------------------------------------------------
 -- castool
 --------------------------------------------------
@@ -610,5 +608,3 @@ files {
 	MAME_DIR .. "src/mess/tools/imgtool/modules/bml3.c",
 	MAME_DIR .. "src/mess/tools/imgtool/modules/hp48.c",
 }
-
-end

scripts/target/mame/dummy.lua

@@ -1,19 +1,19 @@
 ---------------------------------------------------------------------------
 --
---   ume.lua
+--   dummy.lua
 --
---   Universal target makefile
+--   Dummy target makefile
 --
 ---------------------------------------------------------------------------
 
-dofile("../mess/mess.lua")
+dofile("arcade.lua")
-dofile("../mame/mame.lua")
+dofile("mess.lua")
 
-function createProjects_ume_dummy(_target, _subtarget)
+function createProjects_mame_dummy(_target, _subtarget)
-	project ("ume_dummy")
+	project ("mame_dummy")
 	targetsubdir(_target .."_" .. _subtarget)
 	kind "StaticLib"
-	uuid (os.uuid("drv-ume_dummy"))
+	uuid (os.uuid("drv-mame_dummy"))
 	
 	options {
 		"ForceCPP",
@@ -36,8 +36,8 @@ function createProjects_ume_dummy(_target, _subtarget)
 	}
 end
 
-function linkProjects_ume_dummy(_target, _subtarget)
+function linkProjects_mame_dummy(_target, _subtarget)
 	links {
-		"ume_dummy",
+		"mame_dummy",
 	}
 end

scripts/target/mame/mess.lua

@@ -1,6 +1,6 @@
 ---------------------------------------------------------------------------
 --
---   mess.mak
+--   mess.lua
 --
 --   MESS target makefile
 --
@@ -651,7 +651,7 @@ BUSES["ZORRO"] = true
 -- comprise MESS plus messdriv.*", which contains
 -- the list of drivers
 --------------------------------------------------
-function linkProjects_mess_mess(_target, _subtarget)
+function linkProjects_mame_mess(_target, _subtarget)
 	links {
 		"acorn",
 		"act",
@@ -840,7 +840,7 @@ function linkProjects_mess_mess(_target, _subtarget)
 		"zvt",
 		"messshared",
 	}
-	if (_target=="mess") then
+	if (_subtarget=="mess") then
 	links {
 		"mameshared",
 	}
@@ -872,7 +872,7 @@ function createMESSProjects(_target, _subtarget, _name)
 	}
 end
 	
-function createProjects_mess_mess(_target, _subtarget)
+function createProjects_mame_mess(_target, _subtarget)
 --------------------------------------------------
 -- the following files are MAME components and
 -- shared across a number of drivers
@@ -896,7 +896,7 @@ function createProjects_mess_mess(_target, _subtarget)
 -- vectrex.c (MESS + MAME)
 -- cps1.c (MESS + MAME)
 --------------------------------------------------
-if (_target=="mess") then
+if (_subtarget=="mess") then
 createMESSProjects(_target, _subtarget, "mameshared")
 files { 
 	MAME_DIR .. "src/mame/machine/archimds.c",  

scripts/target/mame/tiny.lua

@@ -5,9 +5,6 @@
 --   Small driver-specific example makefile
 --   Use make SUBTARGET=tiny to build
 --
---   Copyright Nicola Salmoria and the MAME Team.
---   Visit  http://mamedev.org for licensing and usage restrictions.
---
 ---------------------------------------------------------------------------
 
 

scripts/target/mess/tiny.lua

@@ -1,40 +0,0 @@
-CPUS["Z80"] = true
-
-SOUNDS["SN76496"] = true
-
-VIDEOS["TMS9928A"] = true
-
-BUSES["COLECO"] = true
-
-function createProjects_mess_tiny(_target, _subtarget)
-	project ("mess_tiny")
-	targetsubdir(_target .."_" .. _subtarget)
-	kind "StaticLib"
-	uuid (os.uuid("drv-mess-tiny"))
-	
-	options {
-		"ForceCPP",
-	}
-	
-	includedirs {
-		MAME_DIR .. "src/osd",
-		MAME_DIR .. "src/emu",
-		MAME_DIR .. "src/mess",
-		MAME_DIR .. "src/lib",
-		MAME_DIR .. "src/lib/util",
-		MAME_DIR .. "3rdparty",
-		MAME_DIR .. "3rdparty/zlib",
-		GEN_DIR  .. "mess/layout",
-	}	
-
-	files{
-		MAME_DIR .. "src/mess/drivers/coleco.c",
-		MAME_DIR .. "src/mess/machine/coleco.c",
-	}
-end
-
-function linkProjects_mess_tiny(_target, _subtarget)
-	links {
-		"mess_tiny",
-	}
-end

scripts/target/ume/tiny.lua

@@ -1,12 +0,0 @@
-dofile("../mess/tiny.lua")
-dofile("../mame/tiny.lua")
-
-function createProjects_ume_tiny(_target, _subtarget)
-	createProjects_mess_tiny(_target, _subtarget)
-	createProjects_mame_tiny(_target, _subtarget)
-end
-
-function linkProjects_ume_tiny(_target, _subtarget)
-	linkProjects_mess_tiny(_target, _subtarget)
-	linkProjects_mame_tiny(_target, _subtarget)
-end

scripts/target/ume/ume.lua

@@ -1,20 +0,0 @@
----------------------------------------------------------------------------
---
---   ume.lua
---
---   Universal target makefile
---
----------------------------------------------------------------------------
-
-dofile("../mess/mess.lua")
-dofile("../mame/mame.lua")
-
-function createProjects_ume_ume(_target, _subtarget)
-	createProjects_mess_mess(_target, _subtarget)
-	createProjects_mame_mame(_target, _subtarget)
-end
-
-function linkProjects_ume_ume(_target, _subtarget)
-	linkProjects_mess_mess(_target, _subtarget)
-	linkProjects_mame_mame(_target, _subtarget)
-end

src/mame/mame.c

@@ -1,14 +1,11 @@
-// license:???
+// license:BSD-3-Clause
-// copyright-holders:???
+// copyright-holders:Aaron Giles
 /***************************************************************************
 
     mame.c
 
     Specific (per target) constants
 
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
 ****************************************************************************/
 
 #include "emu.h"

src/mame/mame.mak

@@ -2,9 +2,9 @@
 #
 #   makefile
 #
-#   Additional makefile for building MESS
+#   Additional makefile for building MAME
 #
 ###########################################################################
 
-GEN_FOLDERS += $(GENDIR)/mame/layout/
+GEN_FOLDERS += $(GENDIR)/mess/layout/
-LAYOUTS += $(SRC)/mame/layout/cdi.lay $(SRC)/mame/layout/neogeo.lay
+LAYOUTS += $(wildcard $(SRC)/mess/layout/*.lay)

src/mess/mess.c

@@ -1,58 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/***************************************************************************
-
-    mess.c
-
-    Specific (per target) constants
-
-    Copyright Nicola Salmoria and the MAME Team.
-    Visit http://mamedev.org for licensing and usage restrictions.
-
-****************************************************************************/
-#include "emu.h"
-
-#define APPNAME                 "MESS"
-#define APPNAME_LOWER           "mess"
-#define CONFIGNAME              "mess"
-#define APPLONGNAME             "M.E.S.S."
-#define FULLLONGNAME            "Multi Emulator Super System"
-#define CAPGAMENOUN             "SYSTEM"
-#define CAPSTARTGAMENOUN        "System"
-#define GAMENOUN                "system"
-#define GAMESNOUN               "systems"
-#define COPYRIGHT               "Copyright the MESS team\nhttp://mess.org"
-#define COPYRIGHT_INFO          "Copyright the MESS team\n\n" \
-								"MESS is based on MAME Source code\n" \
-								"Copyright Nicola Salmoria and the MAME team"
-#define DISCLAIMER              "MESS is an emulator: it reproduces, more or less faithfully, the behaviour of\n"\
-								"several computer and console systems. But hardware is useless without software\n" \
-								"so a file dump of the ROM, cartridges, discs, and cassettes which run on that\n" \
-								"hardware is required. Such files, like any other commercial software, are\n" \
-								"copyrighted material and it is therefore illegal to use them if you don't own\n" \
-								"the original media from which the files are derived. Needless to say, these\n" \
-								"files are not distributed together with MESS. Distribution of MESS together\n" \
-								"with these files is a violation of copyright law and should be promptly\n" \
-								"reported to the authors so that appropriate legal action can be taken.\n"
-#define USAGE                   "Usage:  %s [%s] [media] [software] [options]"
-#define XML_ROOT                "mess"
-#define XML_TOP                 "machine"
-#define STATE_MAGIC_NUM         "MESSSAVE"
-
-const char * emulator_info::get_appname() { return APPNAME;}
-const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}
-const char * emulator_info::get_configname() { return CONFIGNAME;}
-const char * emulator_info::get_applongname() { return APPLONGNAME;}
-const char * emulator_info::get_fulllongname() { return FULLLONGNAME;}
-const char * emulator_info::get_capgamenoun() { return CAPGAMENOUN;}
-const char * emulator_info::get_capstartgamenoun() { return CAPSTARTGAMENOUN;}
-const char * emulator_info::get_gamenoun() { return GAMENOUN;}
-const char * emulator_info::get_gamesnoun() { return GAMESNOUN;}
-const char * emulator_info::get_copyright() { return COPYRIGHT;}
-const char * emulator_info::get_copyright_info() { return COPYRIGHT_INFO;}
-const char * emulator_info::get_disclaimer() { return DISCLAIMER;}
-const char * emulator_info::get_usage() { return USAGE;}
-const char * emulator_info::get_xml_root() { return XML_ROOT;}
-const char * emulator_info::get_xml_top() { return XML_TOP;}
-const char * emulator_info::get_state_magic_num() { return STATE_MAGIC_NUM;}
-void emulator_info::printf_usage(const char *par1, const char *par2) { osd_printf_info(USAGE, par1, par2); }

src/mess/tiny.lst

@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/******************************************************************************
-
-    tiny.lst
-
-    List of all enabled drivers in the system. This file is parsed by
-    makelist.exe, sorted, and output as C code describing the drivers.
-
-******************************************************************************/
-
-coleco      // NTSC ColecoVision
-colecop     // PAL Colecovision

src/ume/osd/windows/ume.man

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-	<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="UME" type="win32" />
-	<description>Universal Machine Emulator</description>
-	<dependency>
-		<dependentAssembly>
-			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/>
-		</dependentAssembly>
-	</dependency>
-</assembly>

src/ume/osd/windows/ume.rc

@@ -1,14 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-//============================================================
-//
-//	ume.rc - Minimal resource file for Win32 MAME
-//
-//============================================================
-
-#include <windows.h>
-#include "umevers.rc"
-
-1                       24      MOVEABLE PURE   "ume.man"
-
-2                       ICON    DISCARDABLE     "ume.ico"

src/ume/tiny.lst

@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/******************************************************************************
-
-    ume.lst
-
-    List of all enabled drivers in the system. This file is parsed by
-    makelist.exe, sorted, and output as C code describing the drivers.
-
-******************************************************************************/
-
-#../../../../../src/mame/tiny.lst
-#../../../../../src/mess/tiny.lst

src/ume/ume.c

@@ -1,48 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/***************************************************************************
-
-    ume.c
-
-    Specific (per target) constants
-
-****************************************************************************/
-#include "emu.h"
-
-#define APPNAME                 "UME"
-#define APPNAME_LOWER           "ume"
-#define CONFIGNAME              "ume"
-#define APPLONGNAME             "U.M.E."
-#define FULLLONGNAME            "Universal Machine Emulator"
-#define CAPGAMENOUN             "GAME"
-#define CAPSTARTGAMENOUN        "Game"
-#define GAMENOUN                "game"
-#define GAMESNOUN               "games"
-#define COPYRIGHT               "Copyright Nicola Salmoria\nand the MAME and MESS teams"
-#define COPYRIGHT_INFO          "Copyright Nicola Salmoria and the MAME and MESS teams"
-#define DISCLAIMER              "This is promo build of combined MAME and MESS emulators made in order to\n" \
-								"promote both projects and show possibilities to new potential users.\n\n" \
-								"Note that bugs noticed in this build should not be forwarded to development\n"\
-								"teams unless those are confirmed in original builds as well.\n"
-#define USAGE                   "Usage:  %s [%s] [media] [software] [options]"
-#define XML_ROOT                "mame"
-#define XML_TOP                 "game"
-#define STATE_MAGIC_NUM         "MAMESAVE"
-
-const char * emulator_info::get_appname() { return APPNAME;}
-const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}
-const char * emulator_info::get_configname() { return CONFIGNAME;}
-const char * emulator_info::get_applongname() { return APPLONGNAME;}
-const char * emulator_info::get_fulllongname() { return FULLLONGNAME;}
-const char * emulator_info::get_capgamenoun() { return CAPGAMENOUN;}
-const char * emulator_info::get_capstartgamenoun() { return CAPSTARTGAMENOUN;}
-const char * emulator_info::get_gamenoun() { return GAMENOUN;}
-const char * emulator_info::get_gamesnoun() { return GAMESNOUN;}
-const char * emulator_info::get_copyright() { return COPYRIGHT;}
-const char * emulator_info::get_copyright_info() { return COPYRIGHT_INFO;}
-const char * emulator_info::get_disclaimer() { return DISCLAIMER;}
-const char * emulator_info::get_usage() { return USAGE;}
-const char * emulator_info::get_xml_root() { return XML_ROOT;}
-const char * emulator_info::get_xml_top() { return XML_TOP;}
-const char * emulator_info::get_state_magic_num() { return STATE_MAGIC_NUM;}
-void emulator_info::printf_usage(const char *par1, const char *par2) { osd_printf_info(USAGE, par1, par2); }

src/ume/ume.lst

@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/******************************************************************************
-
-    ume.lst
-
-    List of all enabled drivers in the system. This file is parsed by
-    makelist.exe, sorted, and output as C code describing the drivers.
-
-******************************************************************************/
-
-#../../../../../src/mame/mame.lst
-#../../../../../src/mess/mess.lst

src/ume/ume.mak

@@ -1,10 +0,0 @@
-###########################################################################
-#
-#   makefile
-#
-#   Additional makefile for building UME
-#
-###########################################################################
-
-GEN_FOLDERS += $(GENDIR)/mame/layout/ $(GENDIR)/mess/layout/
-LAYOUTS += $(wildcard $(SRC)/mame/layout/*.lay) $(wildcard $(SRC)/mess/layout/*.lay)