From 8e22b1d22f1e1e616ca5e08f1064cad614387b2e Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 9 Oct 2015 14:13:35 +0200 Subject: [PATCH] Renamed DRIVERS parameter to SOURCES since you can add any source you wish to include in target (nw) --- makefile | 8 ++++---- scripts/genie.lua | 10 +++++----- scripts/src/devices.lua | 2 +- scripts/src/main.lua | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/makefile b/makefile index 0b7828a672f..a39823843f8 100644 --- a/makefile +++ b/makefile @@ -90,7 +90,7 @@ # QT_HOME = /usr/lib64/qt48/ -# DRIVERS = src/mame/drivers/1942.c,src/mame/drivers/cops.c +# SOURCES = src/mame/drivers/asteroid.c,src/mame/audio/llander.c # FORCE_VERSION_COMPILE = 1 @@ -628,8 +628,8 @@ ifdef QT_HOME PARAMS += --QT_HOME='$(QT_HOME)' endif -ifdef DRIVERS -PARAMS += --DRIVERS='$(DRIVERS)' +ifdef SOURCES +PARAMS += --SOURCES='$(SOURCES)' endif ifdef FORCE_VERSION_COMPILE @@ -661,7 +661,7 @@ SCRIPTS = scripts/genie.lua \ $(wildcard src/osd/$(OSD)/$(OSD).mak) \ $(wildcard src/$(TARGET)/$(SUBTARGET).mak) -ifndef DRIVERS +ifndef SOURCES SCRIPTS += scripts/target/$(TARGET)/$(SUBTARGET).lua endif diff --git a/scripts/genie.lua b/scripts/genie.lua index 5935b8b1bc5..475c110ecb5 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -370,8 +370,8 @@ newoption { } newoption { - trigger = "DRIVERS", - description = "List of drivers to compile.", + trigger = "SOURCES", + description = "List of sources to compile.", } newoption { @@ -516,15 +516,15 @@ msgarchiving ("Archiving $(notdir $@)...") messageskip { "SkipCreatingMessage", "SkipBuildingMessage", "SkipCleaningMessage" } -if (_OPTIONS["DRIVERS"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then if (not os.isfile(path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))) then error("File definition for TARGET=" .. _OPTIONS["target"] .. " SUBTARGET=" .. _OPTIONS["subtarget"] .. " does not exist") end dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua")) else - OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["DRIVERS"] .. " target " .. _OPTIONS["subtarget"]) + OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " target " .. _OPTIONS["subtarget"]) load(OUT_STR)() - os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["DRIVERS"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"].."/drivlist.c") + os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"].."/drivlist.c") end configuration { "gmake" } flags { diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua index 4abafb0fc5a..c46d0db8427 100644 --- a/scripts/src/devices.lua +++ b/scripts/src/devices.lua @@ -47,7 +47,7 @@ function devicesProject(_target, _subtarget) dofile(path.join("src", "machine.lua")) -if (_OPTIONS["DRIVERS"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then project ("bus") uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d") kind (LIBTYPE) diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 66becff80bd..d4d991dcdfa 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -2,7 +2,7 @@ -- copyright-holders:MAMEdev Team function mainProject(_target, _subtarget) -if (_OPTIONS["DRIVERS"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then if (_target == _subtarget) then project (_target) else @@ -38,7 +38,7 @@ end flags { "Unicode", } -if (_OPTIONS["DRIVERS"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then configuration { "x64", "Release" } targetsuffix "64" if _OPTIONS["PROFILE"] then @@ -91,7 +91,7 @@ end links { "osd_" .. _OPTIONS["osd"], } - if (_OPTIONS["DRIVERS"] == nil) then + if (_OPTIONS["SOURCES"] == nil) then links { "bus", } @@ -232,7 +232,7 @@ end GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c", } -if (_OPTIONS["DRIVERS"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then dependency { { "../../../../generated/mame/mame/drivlist.c", MAME_DIR .. "src/mame/mess.lst", true }, { "../../../../generated/mame/mame/drivlist.c" , MAME_DIR .. "src/mame/arcade.lst", true},