MAME now represent full build, for building MESS drivers only use [Mi…

…odrag Milanovic] make SUBTARGET=mess, for building only Arcades drivers only use: make SUBTARGET=arcade
mamedev · May 9, 2015 · 5df1b60 · 5df1b60
1 parent 9d82d22
commit 5df1b60
Show file tree

Hide file tree

Showing 32 changed files with 35,690 additions and 35,910 deletions.
diff --git a/scripts/genie.lua b/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"])
 

diff --git a/scripts/src/main.lua b/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  },

diff --git a/scripts/src/tools.lua b/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