summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-12-06 17:07:50 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-12-06 17:07:50 +0100
commit6a765a95ecbd957fc95687e5a63b546cd6ae5b97 (patch)
treeaea0fbeceeba8af92f549bdb42ee0c015abd1dec
parent3afd02d896139b07d074d9e66698779e698c87b0 (diff)
Added addprojectflags function and added -Wsuggest-override for all that are not 3rdparty projects.
It is place where all additional checks we should put
-rw-r--r--scripts/genie.lua9
-rw-r--r--scripts/src/devices.lua4
-rw-r--r--scripts/src/emu.lua2
-rw-r--r--scripts/src/lib.lua4
-rw-r--r--scripts/src/main.lua1
-rw-r--r--scripts/src/netlist.lua2
-rw-r--r--scripts/src/osd/osdmini.lua4
-rw-r--r--scripts/src/osd/sdl.lua8
-rw-r--r--scripts/src/osd/windows.lua6
-rw-r--r--scripts/target/mame/arcade.lua1
-rw-r--r--scripts/target/mame/dummy.lua1
-rw-r--r--scripts/target/mame/mess.lua1
-rw-r--r--scripts/target/mame/tiny.lua1
13 files changed, 44 insertions, 0 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index eadf2821e50..c9e2aeac3fc 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -53,6 +53,15 @@ function layoutbuildtask(_folder, _name)
{ MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting src/".._folder.."/".._name..".lay...", PYTHON .. " $(1) $(<) $(@) layout_".._name }};
end
+function addprojectflags()
+ local version = str_to_version(_OPTIONS["gcc_version"])
+ if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "gcc") and (version >= 50100) then
+ buildoptions_cpp {
+ "-Wsuggest-override",
+ }
+ end
+end
+
CPUS = {}
SOUNDS = {}
MACHINES = {}
diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua
index 70774a74ebc..05e8810f2df 100644
--- a/scripts/src/devices.lua
+++ b/scripts/src/devices.lua
@@ -23,6 +23,8 @@ function devicesProject(_target, _subtarget)
"ArchiveSplit",
}
+ addprojectflags()
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
@@ -59,6 +61,7 @@ if (_OPTIONS["SOURCES"] == nil) then
uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d")
kind (LIBTYPE)
targetsubdir(_target .."_" .. _subtarget)
+ addprojectflags()
options {
"ArchiveSplit",
}
@@ -96,6 +99,7 @@ if #disasm_files > 0 then
uuid ("f2d28b0a-6da5-4f78-b629-d834aa00429d")
kind (LIBTYPE)
targetsubdir(_target .."_" .. _subtarget)
+ addprojectflags()
includedirs {
MAME_DIR .. "src/osd",
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index d377a6ebacf..7b19e397c93 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -14,6 +14,8 @@ targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"])
uuid ("e6fa15e4-a354-4526-acef-13c8e80fcacf")
kind (LIBTYPE)
+addprojectflags()
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index a567514f9c0..8c9162ccd65 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -13,6 +13,8 @@ project "utils"
uuid "22489ad0-4cb2-4d91-ad81-24b0d80ca30a"
kind (LIBTYPE)
+ addprojectflags()
+
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -105,6 +107,8 @@ project "formats"
uuid "f69636b1-fcce-45ce-b09a-113e371a2d7a"
kind (LIBTYPE)
+ addprojectflags()
+
options {
"ArchiveSplit",
}
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 2d233eba87a..619833ccf57 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -26,6 +26,7 @@ end
uuid (os.uuid(_target .."_" .. _subtarget))
kind "ConsoleApp"
+ addprojectflags()
flags {
"NoManifest",
"Symbols", -- always include minimum symbols for executables
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 4b6b87c0eae..7b2dff521a5 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -13,6 +13,8 @@ project "netlist"
uuid "665ef8ac-2a4c-4c3e-a05f-fd1e5db11de9"
kind (LIBTYPE)
+ addprojectflags()
+
includedirs {
MAME_DIR .. "src/lib/netlist",
MAME_DIR .. "src/osd",
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index 43ff9c4c40b..6e47295de39 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -21,6 +21,8 @@ project ("osd_" .. _OPTIONS["osd"])
"SingleOutputDir",
}
+ addprojectflags()
+
dofile("osdmini_cfg.lua")
includedirs {
@@ -68,6 +70,8 @@ project ("ocore_" .. _OPTIONS["osd"])
"SingleOutputDir",
}
+ addprojectflags()
+
dofile("osdmini_cfg.lua")
includedirs {
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 4cb31f38083..2753f252e14 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -313,6 +313,8 @@ project ("osd_" .. _OPTIONS["osd"])
uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
kind (LIBTYPE)
+ addprojectflags()
+
dofile("sdl_cfg.lua")
osdmodulesbuild()
@@ -416,6 +418,8 @@ project ("ocore_" .. _OPTIONS["osd"])
"SingleOutputDir",
}
+ addprojectflags()
+
dofile("sdl_cfg.lua")
includedirs {
@@ -475,6 +479,8 @@ if _OPTIONS["with-tools"] then
flags {
"Symbols", -- always include minimum symbols for executables
}
+
+ addprojectflags()
dofile("sdl_cfg.lua")
@@ -537,6 +543,8 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then
"Symbols", -- always include minimum symbols for executables
}
+ addprojectflags()
+
dofile("sdl_cfg.lua")
if _OPTIONS["SEPARATE_BIN"]~="1" then
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 32b15ef0431..a855e6c6636 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -107,6 +107,8 @@ project ("osd_" .. _OPTIONS["osd"])
dofile("windows_cfg.lua")
osdmodulesbuild()
+ addprojectflags()
+
defines {
"DIRECT3D_VERSION=0x0900",
}
@@ -197,6 +199,8 @@ project ("ocore_" .. _OPTIONS["osd"])
"SingleOutputDir",
}
+ addprojectflags()
+
dofile("windows_cfg.lua")
includedirs {
@@ -264,6 +268,8 @@ if _OPTIONS["with-tools"] then
uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0")
kind "ConsoleApp"
+ addprojectflags()
+
flags {
"Symbols", -- always include minimum symbols for executables
}
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 0324aa32895..5d65732f54a 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -765,6 +765,7 @@ function createMAMEProjects(_target, _subtarget, _name)
targetsubdir(_target .."_" .. _subtarget)
kind (LIBTYPE)
uuid (os.uuid("drv-" .. _target .."_" .. _subtarget .. "_" .._name))
+ addprojectflags()
includedirs {
MAME_DIR .. "src/osd",
diff --git a/scripts/target/mame/dummy.lua b/scripts/target/mame/dummy.lua
index 857548f7382..9d7a986f714 100644
--- a/scripts/target/mame/dummy.lua
+++ b/scripts/target/mame/dummy.lua
@@ -17,6 +17,7 @@ function createProjects_mame_dummy(_target, _subtarget)
targetsubdir(_target .."_" .. _subtarget)
kind (LIBTYPE)
uuid (os.uuid("drv-mame_dummy"))
+ addprojectflags()
includedirs {
MAME_DIR .. "src/osd",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 5b16be78d7e..60ecf006397 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -882,6 +882,7 @@ function createMESSProjects(_target, _subtarget, _name)
targetsubdir(_target .."_" .. _subtarget)
kind (LIBTYPE)
uuid (os.uuid("drv-" .. _target .."_" .. _subtarget .. "_" .._name))
+ addprojectflags()
includedirs {
MAME_DIR .. "src/osd",
diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua
index 3faebd75261..6aba11b51e7 100644
--- a/scripts/target/mame/tiny.lua
+++ b/scripts/target/mame/tiny.lua
@@ -80,6 +80,7 @@ function createProjects_mame_tiny(_target, _subtarget)
targetsubdir(_target .."_" .. _subtarget)
kind (LIBTYPE)
uuid (os.uuid("drv-mame-tiny"))
+ addprojectflags()
includedirs {
MAME_DIR .. "src/osd",