summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Patrick Mackinlay <pmackinlay@hotmail.com>2024-11-27 00:39:05 +0700
committer GitHub <noreply@github.com>2024-11-27 04:39:05 +1100
commitdc8ba812c1099cb34f419bce0c7cc5eaf5aa3dc0 (patch)
tree1fcb248af8c820c9831fa461ae7148d413a6f9d7 /scripts
parent5b1adf3db9362e205f4b242afd0f42a461a72e22 (diff)
Updated GENie and changed Visual Studio target to Visual Studio 2022. (#13000)
* Updated to GENie 1181. * Applied local fix for GENie resource include directory bug, sent upstream as bkaradzic/GENie#572. * Set MSVC flags to use conformant preprocessor, standards conformance mode, and assume UTF-8 encoding.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/genie.lua3
-rw-r--r--scripts/src/main.lua14
-rw-r--r--scripts/toolchain.lua2
3 files changed, 4 insertions, 15 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 59977826f7d..82b995deed6 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1293,6 +1293,9 @@ configuration { "vs20*" }
}
buildoptions {
+ "/Zc:preprocessor",
+ "/utf-8",
+ "/permissive-",
"/w45038", -- warning C5038: data member 'member1' will be initialized after data member 'member2'
}
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 0192d849676..d5f94bb60bd 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -220,14 +220,6 @@ end
GEN_DIR .. "resource",
}
- configuration { "vs20*"}
- -- See https://github.com/bkaradzic/GENie/issues/544
- includedirs {
- MAME_DIR .. "scripts/resources/windows/" .. _target,
- GEN_DIR .. "resource",
- }
- configuration { }
-
if (STANDALONE==true) then
standalone();
@@ -269,12 +261,6 @@ if (STANDALONE~=true) then
resincludedirs {
MAME_DIR .. "scripts/resources/windows/mame",
}
- configuration { "vs20*"}
- -- See https://github.com/bkaradzic/GENie/issues/544
- includedirs {
- MAME_DIR .. "scripts/resources/windows/mame",
- }
- configuration { }
end
local mainfile = MAME_DIR .. "src/" .. _target .. "/" .. _subtarget .. ".cpp"
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 966d55d1dbb..3181d25d67c 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -211,7 +211,7 @@ function toolchain(_buildDir, _subDir)
premake.gcc.ar = toolchainPrefix .. "ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang")
end
- elseif _ACTION == "vs2019" then
+ elseif _ACTION == "vs2022" then
if "clangcl" == _OPTIONS["vs"] then
premake.vstudio.toolset = ("ClangCL")