diff options
author | 2022-05-26 14:26:07 +1000 | |
---|---|---|
committer | 2022-05-26 14:26:07 +1000 | |
commit | 9e9e6581c8940e968d2a34c0cc41d585d366cdb7 (patch) | |
tree | 9def5d3c5d928879f1f9a00423cd6605633ba9d1 /scripts/src | |
parent | 320c7b742dd278d3c8dc883ce28ce43c04a3a487 (diff) | |
parent | af75340b248cad1afdc0c7547253859c31019a68 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/bus.lua | 6 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 5 | ||||
-rw-r--r-- | scripts/src/osd/windows_cfg.lua | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 4d65e662d14..9195ee60aa9 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -4722,8 +4722,10 @@ if (BUSES["MULTIBUS"]~=null) then MAME_DIR .. "src/devices/bus/multibus/cpuap.h", MAME_DIR .. "src/devices/bus/multibus/serad.cpp", MAME_DIR .. "src/devices/bus/multibus/serad.h", - MAME_DIR .. "src/devices/bus/multibus/labtam3232.cpp", - MAME_DIR .. "src/devices/bus/multibus/labtam3232.h", + MAME_DIR .. "src/devices/bus/multibus/labtam_3232.cpp", + MAME_DIR .. "src/devices/bus/multibus/labtam_3232.h", + MAME_DIR .. "src/devices/bus/multibus/labtam_z80sbc.cpp", + MAME_DIR .. "src/devices/bus/multibus/labtam_z80sbc.h", } end diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 2d5ca91cca6..2ced36718aa 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -29,12 +29,13 @@ function maintargetosdoptions(_target,_subtarget) end links { - "dinput8", "comctl32", "comdlg32", - "psapi", + "dinput8", "ole32", + "psapi", "shlwapi", + "uuid", } end diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua index 8faf636e0bc..01d441c2214 100644 --- a/scripts/src/osd/windows_cfg.lua +++ b/scripts/src/osd/windows_cfg.lua @@ -33,7 +33,8 @@ if _OPTIONS["MODERN_WIN_API"]=="1" then } else defines { - "_WIN32_WINNT=0x0501", + "_WIN32_WINNT=0x0600", + "NTDDI_VERSION=0x06000000", } end |