Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-02 00:29:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5743 from belegdol/unbreak-msvc-build

Browse Source 
-x c++ should not be applied to targets like msvc
This commit is contained in:
ajrhacker 2019-10-15 15:26:18 -04:00 committed by GitHub
commit c8c57fc0da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/src/3rdparty.lua
View File

@ -154,13 +154,15 @@ project "softfloat"
"ForceCPP", "ForceCPP",
} }
includedirs {
MAME_DIR .. "src/osd",
}
configuration { "gmake or ninja" }
buildoptions_cpp { buildoptions_cpp {
"-x c++", "-x c++",
} }
includedirs {
MAME_DIR .. "src/osd",
}
configuration { "vs*" } configuration { "vs*" }
buildoptions { buildoptions {
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
@ -192,10 +194,6 @@ options {
"ForceCPP", "ForceCPP",
} }
buildoptions_cpp {
"-x c++",
}
includedirs { includedirs {
MAME_DIR .. "src/osd", MAME_DIR .. "src/osd",
MAME_DIR .. "3rdparty/softfloat3/build/MAME", MAME_DIR .. "3rdparty/softfloat3/build/MAME",
@ -204,6 +202,11 @@ includedirs {
MAME_DIR .. "3rdparty/softfloat3/source/8086", MAME_DIR .. "3rdparty/softfloat3/source/8086",
} }
configuration { "gmake or ninja" }
buildoptions_cpp {
"-x c++",
}
configuration { "vs*" } configuration { "vs*" }
buildoptions { buildoptions {
"/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used