summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2019-10-15 19:40:32 +0200
committer Julian Sikorski <belegdol+github@gmail.com>2019-10-15 19:40:32 +0200
commit5ff784e58c1b1982233ec01a7abdb692bf989d55 (patch)
tree1d7e803691ab6bc02f0e155e5af666e8f94008da /scripts/src
parent58608c7401a7b60138c5988c72b13c6666bc8caf (diff)
-x c++ should not be applied to targets like msvc
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua19
1 files changed, 11 insertions, 8 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index cb213c2e679..970afc7d45b 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -154,13 +154,15 @@ project "softfloat"
"ForceCPP",
}
- buildoptions_cpp {
- "-x c++",
- }
-
includedirs {
MAME_DIR .. "src/osd",
}
+
+ configuration { "gmake or ninja" }
+ buildoptions_cpp {
+ "-x c++",
+ }
+
configuration { "vs*" }
buildoptions {
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
@@ -192,10 +194,6 @@ options {
"ForceCPP",
}
-buildoptions_cpp {
- "-x c++",
-}
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "3rdparty/softfloat3/build/MAME",
@@ -204,6 +202,11 @@ includedirs {
MAME_DIR .. "3rdparty/softfloat3/source/8086",
}
+configuration { "gmake or ninja" }
+buildoptions_cpp {
+ "-x c++",
+}
+
configuration { "vs*" }
buildoptions {
"/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used