added SEPARATE_BIN option to put executable files in bin folder and not in main (useful for continuous integration )(nw)

This commit is contained in:
Miodrag Milanovic 2015-04-08 08:52:02 +02:00
parent 03275c7b68
commit cc35d05ec0
6 changed files with 57 additions and 19 deletions

View File

@ -74,6 +74,7 @@
# FASTDEBUG = 1
# FILTER_DEPS = 1
# SEPARATE_BIN = 1
-include useroptions.mak
@ -490,6 +491,9 @@ ifdef FILTER_DEPS
PARAMS += --FILTER_DEPS='$(FILTER_DEPS)'
endif
ifdef SEPARATE_BIN
PARAMS += --SEPARATE_BIN='$(SEPARATE_BIN)'
endif
#-------------------------------------------------
# All scripts

View File

@ -263,6 +263,15 @@ newoption {
}
}
newoption {
trigger = "SEPARATE_BIN",
description = "Use separate bin folders.",
allowed = {
{ "0", "Disabled" },
{ "1", "Enabled" },
}
}
if not _OPTIONS["BIGENDIAN"] then
_OPTIONS["BIGENDIAN"] = "0"
end

View File

@ -26,6 +26,11 @@ function mainProject(_target, _subtarget)
flags {
"Unicode",
}
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
configuration { "mingw*" or "vs*" }
targetextension ".exe"
@ -33,7 +38,6 @@ function mainProject(_target, _subtarget)
targetextension ".bc"
configuration { }
targetdir(MAME_DIR)
findfunction("linkProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarget"])(_OPTIONS["target"], _OPTIONS["subtarget"])
links {

View File

@ -429,7 +429,9 @@ if _OPTIONS["with-tools"] then
MAME_DIR .. "src/lib/util",
}
targetdir(MAME_DIR)
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -480,7 +482,9 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then
dofile("sdl_cfg.lua")
targetdir(MAME_DIR)
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
linkoptions {
"-sectcreate __TEXT __info_plist " .. MAME_DIR .. "src/osd/sdl/aueffectutil-Info.plist",

View File

@ -217,7 +217,9 @@ if _OPTIONS["with-tools"] then
"ForceCPP",
}
targetdir(MAME_DIR)
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"ocore_" .. _OPTIONS["osd"],

View File

@ -10,8 +10,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -41,8 +42,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -76,8 +78,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -107,8 +110,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"dasm",
@ -145,8 +149,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -179,8 +184,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -213,8 +219,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -244,8 +251,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -275,8 +283,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -306,8 +315,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -339,8 +349,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -370,8 +381,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
@ -408,8 +420,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"formats",
@ -443,8 +456,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"formats",
@ -479,8 +493,9 @@ options {
"ForceCPP",
}
configuration { }
if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"formats",