From 5ff784e58c1b1982233ec01a7abdb692bf989d55 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Tue, 15 Oct 2019 19:40:32 +0200 Subject: [PATCH] -x c++ should not be applied to targets like msvc --- scripts/src/3rdparty.lua | 19 +++++++++++-------- 1 file 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