diff options
author | 2016-07-27 19:22:36 +1000 | |
---|---|---|
committer | 2016-07-27 19:22:36 +1000 | |
commit | 1c2ea023367ddbd15adeecefa7f425eb1eb5ef4a (patch) | |
tree | 546d084fbaf1c21457ba408706a5b74d886f766c /docs/release/scripts | |
parent | 437eeecc020c81384491dc193bf85a8ed5994b56 (diff) |
0.176 Release Fileshbmame176
Diffstat (limited to 'docs/release/scripts')
-rw-r--r-- | docs/release/scripts/genie.lua | 12 | ||||
-rw-r--r-- | docs/release/scripts/src/3rdparty.lua | 3 | ||||
-rw-r--r-- | docs/release/scripts/src/bus.lua | 72 | ||||
-rw-r--r-- | docs/release/scripts/src/cpu.lua | 2 | ||||
-rw-r--r-- | docs/release/scripts/src/emu.lua | 2 | ||||
-rw-r--r-- | docs/release/scripts/src/lib.lua | 2 | ||||
-rw-r--r-- | docs/release/scripts/src/machine.lua | 23 | ||||
-rw-r--r-- | docs/release/scripts/src/mame/frontend.lua | 12 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/modules.lua | 33 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/sdl.lua | 6 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/sdl_cfg.lua | 8 | ||||
-rw-r--r-- | docs/release/scripts/src/sound.lua | 8 | ||||
-rw-r--r-- | docs/release/scripts/target/mame/arcade.lua | 10 | ||||
-rw-r--r-- | docs/release/scripts/target/mame/mess.lua | 22 | ||||
-rw-r--r-- | docs/release/scripts/toolchain.lua | 17 |
15 files changed, 190 insertions, 42 deletions
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index 903d77ce3ed..d07ff394ce2 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -982,6 +982,12 @@ end end end +if (_OPTIONS["PLATFORM"]=="alpha") then + defines { + "PTR64=1", + } +end + if (_OPTIONS["PLATFORM"]=="arm") then buildoptions { "-Wno-cast-align", @@ -997,6 +1003,12 @@ if (_OPTIONS["PLATFORM"]=="arm64") then } end +if (_OPTIONS["PLATFORM"]=="mips64") then + defines { + "PTR64=1", + } +end + local subdir if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then subdir = _OPTIONS["osd"] .. "/" .. _OPTIONS["target"] diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index d8e6c9e2fff..e3c29933220 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -722,6 +722,7 @@ end "-Wno-uninitialized", "-Wno-unused-function", "-Wno-unused-but-set-variable", + "-Wno-format-extra-args", -- temp for mingw 6.1 till update bgfx code } configuration { "rpi" } buildoptions { @@ -1209,6 +1210,8 @@ if _OPTIONS["targetos"]=="android" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64") end end + + strip() else kind "StaticLib" end diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index 5fdd355a955..fa5f6dabd15 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -204,6 +204,58 @@ end --------------------------------------------------- -- +--@src/devices/bus/bbc/analogue/analogue.h,BUSES["BBC_ANALOGUE"] = true +--------------------------------------------------- + +if (BUSES["BBC_ANALOGUE"]~=null) then + files { + MAME_DIR .. "src/devices/bus/bbc/analogue/analogue.cpp", + MAME_DIR .. "src/devices/bus/bbc/analogue/analogue.h", + } +end + + +--------------------------------------------------- +-- +--@src/devices/bus/bbc/1mhzbus/1mhzbus.h,BUSES["BBC_1MHZBUS"] = true +--------------------------------------------------- + +if (BUSES["BBC_1MHZBUS"]~=null) then + files { + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/1mhzbus.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/1mhzbus.h", + } +end + + +--------------------------------------------------- +-- +--@src/devices/bus/bbc/tube/tube.h,BUSES["BBC_TUBE"] = true +--------------------------------------------------- + +if (BUSES["BBC_TUBE"]~=null) then + files { + MAME_DIR .. "src/devices/bus/bbc/tube/tube.cpp", + MAME_DIR .. "src/devices/bus/bbc/tube/tube.h", + } +end + + +--------------------------------------------------- +-- +--@src/devices/bus/bbc/userport/userport.h,BUSES["BBC_USERPORT"] = true +--------------------------------------------------- + +if (BUSES["BBC_USERPORT"]~=null) then + files { + MAME_DIR .. "src/devices/bus/bbc/userport/userport.cpp", + MAME_DIR .. "src/devices/bus/bbc/userport/userport.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/bw2/exp.h,BUSES["BW2"] = true --------------------------------------------------- @@ -583,6 +635,8 @@ if (BUSES["ELECTRON"]~=null) then files { MAME_DIR .. "src/devices/bus/electron/exp.cpp", MAME_DIR .. "src/devices/bus/electron/exp.h", + MAME_DIR .. "src/devices/bus/electron/m2105.cpp", + MAME_DIR .. "src/devices/bus/electron/m2105.h", } end @@ -831,6 +885,8 @@ if (BUSES["ISA"]~=null) then MAME_DIR .. "src/devices/bus/isa/p1_hdc.h", MAME_DIR .. "src/devices/bus/isa/p1_rom.cpp", MAME_DIR .. "src/devices/bus/isa/p1_rom.h", + MAME_DIR .. "src/devices/bus/isa/p1_sound.cpp", + MAME_DIR .. "src/devices/bus/isa/p1_sound.h", MAME_DIR .. "src/devices/bus/isa/mc1502_fdc.cpp", MAME_DIR .. "src/devices/bus/isa/mc1502_fdc.h", MAME_DIR .. "src/devices/bus/isa/mc1502_rom.cpp", @@ -1606,6 +1662,8 @@ if (BUSES["RS232"]~=null) then MAME_DIR .. "src/devices/bus/rs232/pty.h", MAME_DIR .. "src/devices/bus/rs232/ser_mouse.cpp", MAME_DIR .. "src/devices/bus/rs232/ser_mouse.h", + MAME_DIR .. "src/devices/bus/rs232/sun_kbd.cpp", + MAME_DIR .. "src/devices/bus/rs232/sun_kbd.h", MAME_DIR .. "src/devices/bus/rs232/terminal.cpp", MAME_DIR .. "src/devices/bus/rs232/terminal.h", MAME_DIR .. "src/devices/bus/rs232/xvd701.cpp", @@ -2519,6 +2577,20 @@ end --------------------------------------------------- -- +--@src/devices/bus/sunkbd/sunkbd.h,BUSES["SUNKBD"] = true +--------------------------------------------------- + +if (BUSES["SUNKBD"]~=null) then + files { + MAME_DIR .. "src/devices/bus/sunkbd/hlekbd.cpp", + MAME_DIR .. "src/devices/bus/sunkbd/hlekbd.h", + MAME_DIR .. "src/devices/bus/sunkbd/sunkbd.cpp", + MAME_DIR .. "src/devices/bus/sunkbd/sunkbd.h", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/ql/exp.h,BUSES["QL"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index ef9263c6485..a9dfe0ecd70 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -13,7 +13,7 @@ -- Dynamic recompiler objects -------------------------------------------------- -if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null) then +if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null or CPUS["ADSP21062"]~=null) then files { MAME_DIR .. "src/devices/cpu/drcbec.cpp", MAME_DIR .. "src/devices/cpu/drcbec.h", diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua index a446a6ccaae..1f96f3b4e22 100644 --- a/docs/release/scripts/src/emu.lua +++ b/docs/release/scripts/src/emu.lua @@ -118,8 +118,6 @@ files { MAME_DIR .. "src/emu/emupal.h", MAME_DIR .. "src/emu/fileio.cpp", MAME_DIR .. "src/emu/fileio.h", - MAME_DIR .. "src/emu/hash.cpp", - MAME_DIR .. "src/emu/hash.h", MAME_DIR .. "src/emu/image.cpp", MAME_DIR .. "src/emu/image.h", MAME_DIR .. "src/emu/input.cpp", diff --git a/docs/release/scripts/src/lib.lua b/docs/release/scripts/src/lib.lua index 8c3536b144d..f554d56ab7c 100644 --- a/docs/release/scripts/src/lib.lua +++ b/docs/release/scripts/src/lib.lua @@ -56,6 +56,8 @@ project "utils" MAME_DIR .. "src/lib/util/flac.h", MAME_DIR .. "src/lib/util/harddisk.cpp", MAME_DIR .. "src/lib/util/harddisk.h", + MAME_DIR .. "src/lib/util/hash.cpp", + MAME_DIR .. "src/lib/util/hash.h", MAME_DIR .. "src/lib/util/hashing.cpp", MAME_DIR .. "src/lib/util/hashing.h", MAME_DIR .. "src/lib/util/huffman.cpp", diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index aab2cb0b8e3..2afe2638ae6 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -796,6 +796,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/fga002.h,MACHINES["FGA002"] = true +--------------------------------------------------- + +if (MACHINES["FGA002"]~=null) then + files { + MAME_DIR .. "src/devices/machine/fga002.cpp", + MAME_DIR .. "src/devices/machine/fga002.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/hd63450.h,MACHINES["HD63450"] = true --------------------------------------------------- @@ -2902,3 +2914,14 @@ if (MACHINES["SCNXX562"]~=null) then MAME_DIR .. "src/devices/machine/scnxx562.h", } end + +--------------------------------------------------- +-- +--@src/devices/machine/input_merger.h,MACHINES["INPUT_MERGER"] = true +--------------------------------------------------- +if (MACHINES["INPUT_MERGER"]~=null) then + files { + MAME_DIR .. "src/devices/machine/input_merger.cpp", + MAME_DIR .. "src/devices/machine/input_merger.h", + } +end diff --git a/docs/release/scripts/src/mame/frontend.lua b/docs/release/scripts/src/mame/frontend.lua index e35bed2da07..d1660dc0f22 100644 --- a/docs/release/scripts/src/mame/frontend.lua +++ b/docs/release/scripts/src/mame/frontend.lua @@ -98,6 +98,8 @@ files { MAME_DIR .. "src/frontend/mame/ui/filemngr.h", MAME_DIR .. "src/frontend/mame/ui/filesel.cpp", MAME_DIR .. "src/frontend/mame/ui/filesel.h", + MAME_DIR .. "src/frontend/mame/ui/filecreate.cpp", + MAME_DIR .. "src/frontend/mame/ui/filecreate.h", MAME_DIR .. "src/frontend/mame/ui/floppycntrl.cpp", MAME_DIR .. "src/frontend/mame/ui/floppycntrl.h", MAME_DIR .. "src/frontend/mame/ui/imgcntrl.cpp", @@ -108,6 +110,8 @@ files { MAME_DIR .. "src/frontend/mame/ui/info_pty.h", MAME_DIR .. "src/frontend/mame/ui/inputmap.cpp", MAME_DIR .. "src/frontend/mame/ui/inputmap.h", + MAME_DIR .. "src/frontend/mame/ui/selmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/selmenu.h", MAME_DIR .. "src/frontend/mame/ui/sliders.cpp", MAME_DIR .. "src/frontend/mame/ui/sliders.h", MAME_DIR .. "src/frontend/mame/ui/slotopt.cpp", @@ -130,7 +134,7 @@ files { MAME_DIR .. "src/frontend/mame/ui/datfile.h", MAME_DIR .. "src/frontend/mame/ui/datmenu.cpp", MAME_DIR .. "src/frontend/mame/ui/datmenu.h", - MAME_DIR .. "src/frontend/mame/ui/defimg.h", + MAME_DIR .. "src/frontend/mame/ui/defimg.ipp", MAME_DIR .. "src/frontend/mame/ui/dirmenu.cpp", MAME_DIR .. "src/frontend/mame/ui/dirmenu.h", MAME_DIR .. "src/frontend/mame/ui/icorender.h", @@ -152,8 +156,10 @@ files { MAME_DIR .. "src/frontend/mame/ui/selsoft.h", MAME_DIR .. "src/frontend/mame/ui/sndmenu.cpp", MAME_DIR .. "src/frontend/mame/ui/sndmenu.h", - MAME_DIR .. "src/frontend/mame/ui/starimg.h", - MAME_DIR .. "src/frontend/mame/ui/toolbar.h", + MAME_DIR .. "src/frontend/mame/ui/starimg.ipp", + MAME_DIR .. "src/frontend/mame/ui/toolbar.ipp", MAME_DIR .. "src/frontend/mame/ui/utils.cpp", MAME_DIR .. "src/frontend/mame/ui/utils.h", + MAME_DIR .. "src/frontend/mame/ui/widgets.cpp", + MAME_DIR .. "src/frontend/mame/ui/widgets.h", } diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index b8e5bb61b83..25a7aca2c0e 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -35,6 +35,14 @@ function addoptionsfromstring(str) end end +function pkgconfigcmd() + local pkgconfig = os.getenv("PKG_CONFIG") + if pkgconfig == nil then + return "pkg-config" + end + return pkgconfig +end + function osdmodulesbuild() removeflags { @@ -121,11 +129,9 @@ function osdmodulesbuild() MAME_DIR .. "3rdparty/compat/mingw", } - if _OPTIONS["MODERN_WIN_API"]~="1" then - includedirs { - MAME_DIR .. "3rdparty/compat/winsdk-override", - } - end + includedirs { + MAME_DIR .. "3rdparty/compat/winsdk-override", + } end if _OPTIONS["NO_OPENGL"]=="1" then @@ -245,11 +251,12 @@ function qtdebuggerbuild() local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then configuration { "gmake or ninja" } - if (version >= 30600) then - buildoptions { - "-Wno-inconsistent-missing-override", - } - end + if (version >= 30600) then + buildoptions { + "-Wno-inconsistent-missing-override", + } + end + configuration { } end files { @@ -345,7 +352,7 @@ function qtdebuggerbuild() } else buildoptions { - backtick("pkg-config --cflags Qt5Widgets"), + backtick(pkgconfigcmd() .. " --cflags Qt5Widgets"), } end end @@ -380,7 +387,7 @@ function osdmodulestargetconf() if _OPTIONS["NO_USE_MIDI"]~="1" then if _OPTIONS["targetos"]=="linux" then - local str = backtick("pkg-config --libs alsa") + local str = backtick(pkgconfigcmd() .. " --libs alsa") addlibfromstring(str) addoptionsfromstring(str) elseif _OPTIONS["targetos"]=="macosx" then @@ -421,7 +428,7 @@ function osdmodulestargetconf() "Qt5Widgets", } else - local str = backtick("pkg-config --libs Qt5Widgets") + local str = backtick(pkgconfigcmd() .. " --libs Qt5Widgets") addlibfromstring(str) addoptionsfromstring(str) end diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua index 4094e48c6be..44b957d8dde 100644 --- a/docs/release/scripts/src/osd/sdl.lua +++ b/docs/release/scripts/src/osd/sdl.lua @@ -42,7 +42,7 @@ function maintargetosdoptions(_target,_subtarget) links { "SDL2_ttf", } - local str = backtick("pkg-config --libs fontconfig") + local str = backtick(pkgconfigcmd() .. " --libs fontconfig") addlibfromstring(str) addoptionsfromstring(str) end @@ -132,7 +132,7 @@ function sdlconfigcmd() if _OPTIONS["targetos"]=="asmjs" then return "sdl2-config" elseif not _OPTIONS["SDL_INSTALL_ROOT"] then - return _OPTIONS['TOOLCHAIN'] .. "pkg-config sdl2" + return pkgconfigcmd() .. " sdl2" else return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin","sdl2") .. "-config" end @@ -340,7 +340,7 @@ project ("qtdbg_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", } - configuration { "linux-*" } + configuration { "linux-* or freebsd" } buildoptions { "-fPIC", } diff --git a/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua index 0fd15e5ca27..b73c9253819 100644 --- a/docs/release/scripts/src/osd/sdl_cfg.lua +++ b/docs/release/scripts/src/osd/sdl_cfg.lua @@ -1,6 +1,8 @@ -- license:BSD-3-Clause -- copyright-holders:MAMEdev Team +dofile('modules.lua') + forcedincludes { MAME_DIR .. "src/osd/sdl/sdlprefix.h" } @@ -52,7 +54,7 @@ end if _OPTIONS["NO_USE_MIDI"]~="1" and _OPTIONS["targetos"]=="linux" then buildoptions { - backtick("pkg-config --cflags alsa"), + backtick(pkgconfigcmd() .. " --cflags alsa"), } end @@ -94,7 +96,7 @@ if BASE_TARGETOS=="unix" then } if _OPTIONS["targetos"]~="asmjs" then buildoptions { - backtick("pkg-config --cflags fontconfig"), + backtick(pkgconfigcmd() .. " --cflags fontconfig"), } end end @@ -121,7 +123,7 @@ elseif _OPTIONS["targetos"]=="linux" then } else buildoptions { - backtick("pkg-config --cflags Qt5Widgets"), + backtick(pkgconfigcmd() .. " --cflags Qt5Widgets"), } end elseif _OPTIONS["targetos"]=="macosx" then diff --git a/docs/release/scripts/src/sound.lua b/docs/release/scripts/src/sound.lua index 2c54bf7f0f6..bf1e87ebc7e 100644 --- a/docs/release/scripts/src/sound.lua +++ b/docs/release/scripts/src/sound.lua @@ -1130,9 +1130,9 @@ end --------------------------------------------------- -- Yamaha FM synthesizers ---@src/devices/sound/2151intf.h,SOUNDS["YM2151"] = true +--@src/devices/sound/ym2151.h,SOUNDS["YM2151"] = true --@src/devices/sound/2203intf.h,SOUNDS["YM2203"] = true ---@src/devices/sound/2413intf.h,SOUNDS["YM2413"] = true +--@src/devices/sound/ym2413.h,SOUNDS["YM2413"] = true --@src/devices/sound/2608intf.h,SOUNDS["YM2608"] = true --@src/devices/sound/2610intf.h,SOUNDS["YM2610"] = true --@src/devices/sound/2612intf.h,SOUNDS["YM2612"] = true @@ -1147,8 +1147,6 @@ end if (SOUNDS["YM2151"]~=null) then files { - MAME_DIR .. "src/devices/sound/2151intf.cpp", - MAME_DIR .. "src/devices/sound/2151intf.h", MAME_DIR .. "src/devices/sound/ym2151.cpp", MAME_DIR .. "src/devices/sound/ym2151.h", } @@ -1156,8 +1154,6 @@ end if (SOUNDS["YM2413"]~=null) then files { - MAME_DIR .. "src/devices/sound/2413intf.cpp", - MAME_DIR .. "src/devices/sound/2413intf.h", MAME_DIR .. "src/devices/sound/ym2413.cpp", MAME_DIR .. "src/devices/sound/ym2413.h", } diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua index df58452777d..27a224055b2 100644 --- a/docs/release/scripts/target/mame/arcade.lua +++ b/docs/release/scripts/target/mame/arcade.lua @@ -572,6 +572,7 @@ MACHINES["PCI9050"] = true MACHINES["GENPC"] = true MACHINES["GEN_LATCH"] = true MACHINES["WATCHDOG"] = true +MACHINES["INPUT_MERGER"] = true -------------------------------------------------- -- specify available bus cores @@ -647,6 +648,7 @@ BUSES["SMS_CTRL"] = true BUSES["SMS_EXP"] = true --BUSES["SNES"] = true --BUSES["SPC1000"] = true +BUSES["SUNKBD"] = true --BUSES["TI99PEB"] = true --BUSES["TVC"] = true --BUSES["VBOY"] = true @@ -3227,6 +3229,7 @@ files { MAME_DIR .. "src/mame/machine/gdrom.cpp", MAME_DIR .. "src/mame/machine/gdrom.h", MAME_DIR .. "src/mame/machine/xbox.cpp", + MAME_DIR .. "src/mame/machine/xbox_usb.cpp", } createMAMEProjects(_target, _subtarget, "seibu") @@ -3258,6 +3261,7 @@ files { MAME_DIR .. "src/mame/drivers/legionna.cpp", MAME_DIR .. "src/mame/includes/legionna.h", MAME_DIR .. "src/mame/video/legionna.cpp", + MAME_DIR .. "src/mame/drivers/seicupbl.cpp", MAME_DIR .. "src/mame/drivers/metlfrzr.cpp", MAME_DIR .. "src/mame/drivers/mustache.cpp", MAME_DIR .. "src/mame/includes/mustache.h", @@ -3277,8 +3281,6 @@ files { MAME_DIR .. "src/mame/drivers/r2dx_v33.cpp", MAME_DIR .. "src/mame/drivers/seibuspi.cpp", MAME_DIR .. "src/mame/includes/seibuspi.h", - MAME_DIR .. "src/mame/machine/seibuspi.cpp", - MAME_DIR .. "src/mame/machine/seibuspi.h", MAME_DIR .. "src/mame/video/seibuspi.cpp", MAME_DIR .. "src/mame/drivers/sengokmj.cpp", MAME_DIR .. "src/mame/drivers/stfight.cpp", @@ -3293,8 +3295,8 @@ files { MAME_DIR .. "src/mame/video/wiz.cpp", MAME_DIR .. "src/mame/machine/seicop.cpp", MAME_DIR .. "src/mame/machine/seicop.h", - MAME_DIR .. "src/mame/machine/spisprit.cpp", - MAME_DIR .. "src/mame/machine/spisprit.h", + MAME_DIR .. "src/mame/machine/seibuspi.cpp", + MAME_DIR .. "src/mame/machine/seibuspi.h", MAME_DIR .. "src/mame/audio/seibu.cpp", MAME_DIR .. "src/mame/audio/seibu.h", MAME_DIR .. "src/mame/video/seibu_crtc.cpp", diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua index 1063bd71a93..2695224e692 100644 --- a/docs/release/scripts/target/mame/mess.lua +++ b/docs/release/scripts/target/mame/mess.lua @@ -585,6 +585,8 @@ MACHINES["APPLE_DRIVE"] = true MACHINES["APPLE_FDC"] = true MACHINES["SONY_DRIVE"] = true MACHINES["SCNXX562"] = true +MACHINES["FGA002"] = true +MACHINES["INPUT_MERGER"] = true -------------------------------------------------- -- specify available bus cores @@ -602,6 +604,10 @@ BUSES["APF"] = true BUSES["APRICOT_EXPANSION"] = true BUSES["ARCADIA"] = true BUSES["ASTROCADE"] = true +BUSES["BBC_ANALOGUE"] = true +BUSES["BBC_1MHZBUS"] = true +BUSES["BBC_TUBE"] = true +BUSES["BBC_USERPORT"] = true BUSES["BML3"] = true BUSES["BW2"] = true BUSES["C64"] = true @@ -672,6 +678,7 @@ BUSES["SMS_EXP"] = true BUSES["SNES"] = true BUSES["SNES_CTRL"] = true BUSES["SPC1000"] = true +BUSES["SUNKBD"] = true BUSES["SVI_EXPANDER"] = true BUSES["SVI_SLOT"] = true BUSES["TI99PEB"] = true @@ -883,6 +890,7 @@ function linkProjects_mame_mess(_target, _subtarget) "trs", "ultimachine", "ultratec", + "unicard", "unisonic", "unisys", "usp", @@ -1070,6 +1078,7 @@ files { MAME_DIR .. "src/mame/video/cps1.cpp", MAME_DIR .. "src/mame/video/chihiro.cpp", MAME_DIR .. "src/mame/machine/xbox.cpp", + MAME_DIR .. "src/mame/machine/xbox_usb.cpp", MAME_DIR .. "src/mame/includes/saturn.h", MAME_DIR .. "src/mame/drivers/saturn.cpp", MAME_DIR .. "src/mame/machine/saturn.cpp", @@ -1105,7 +1114,6 @@ files { MAME_DIR .. "src/mame/includes/bbc.h", MAME_DIR .. "src/mame/machine/bbc.cpp", MAME_DIR .. "src/mame/video/bbc.cpp", - MAME_DIR .. "src/mame/drivers/bbcbc.cpp", MAME_DIR .. "src/mame/drivers/electron.cpp", MAME_DIR .. "src/mame/includes/electron.h", MAME_DIR .. "src/mame/machine/electron.cpp", @@ -1446,6 +1454,9 @@ files { MAME_DIR .. "src/mame/video/pk8020.cpp", MAME_DIR .. "src/mame/drivers/pyl601.cpp", MAME_DIR .. "src/mame/drivers/sm1800.cpp", + MAME_DIR .. "src/mame/drivers/sm7238.cpp", + MAME_DIR .. "src/mame/machine/km035.cpp", + MAME_DIR .. "src/mame/machine/km035.h", MAME_DIR .. "src/mame/drivers/uknc.cpp", MAME_DIR .. "src/mame/drivers/unior.cpp", MAME_DIR .. "src/mame/drivers/ut88.cpp", @@ -2018,6 +2029,7 @@ createMESSProjects(_target, _subtarget, "microsoft") files { MAME_DIR .. "src/mame/drivers/xbox.cpp", MAME_DIR .. "src/mame/includes/xbox.h", + MAME_DIR .. "src/mame/includes/xbox_usb.h", } createMESSProjects(_target, _subtarget, "mit") @@ -2716,6 +2728,7 @@ files { MAME_DIR .. "src/mame/drivers/ts803.cpp", MAME_DIR .. "src/mame/drivers/ts816.cpp", MAME_DIR .. "src/mame/drivers/tv950.cpp", + MAME_DIR .. "src/mame/drivers/tv990.cpp", } createMESSProjects(_target, _subtarget, "tem") @@ -2885,6 +2898,11 @@ files { MAME_DIR .. "src/mame/drivers/minicom.cpp", } +createMESSProjects(_target, _subtarget, "unicard") +files { + MAME_DIR .. "src/mame/drivers/bbcbc.cpp", +} + createMESSProjects(_target, _subtarget, "unisonic") files { MAME_DIR .. "src/mame/drivers/unichamp.cpp", @@ -3083,6 +3101,7 @@ files { MAME_DIR .. "src/mame/drivers/dim68k.cpp", MAME_DIR .. "src/mame/drivers/dm7000.cpp", MAME_DIR .. "src/mame/includes/dm7000.h", + MAME_DIR .. "src/mame/drivers/dmax8000.cpp", MAME_DIR .. "src/mame/drivers/dmv.cpp", MAME_DIR .. "src/mame/machine/dmv_keyb.cpp", MAME_DIR .. "src/mame/machine/dmv_keyb.h", @@ -3097,6 +3116,7 @@ files { MAME_DIR .. "src/mame/drivers/fanucs15.cpp", MAME_DIR .. "src/mame/drivers/fanucspmg.cpp", MAME_DIR .. "src/mame/drivers/fc100.cpp", + MAME_DIR .. "src/mame/drivers/fcisio.cpp", MAME_DIR .. "src/mame/drivers/fcscsi.cpp", MAME_DIR .. "src/mame/drivers/fk1.cpp", MAME_DIR .. "src/mame/drivers/ft68m.cpp", diff --git a/docs/release/scripts/toolchain.lua b/docs/release/scripts/toolchain.lua index 6046b4d97d8..ff2f10ebbc2 100644 --- a/docs/release/scripts/toolchain.lua +++ b/docs/release/scripts/toolchain.lua @@ -246,7 +246,7 @@ function toolchain(_buildDir, _subDir) if not os.getenv("MINGW32") then print("Set MINGW32 envrionment variable.") end - if not toolchainPrefix then + if toolchainPrefix == nil or toolchainPrefix == "" then toolchainPrefix = "$(MINGW32)/bin/i686-w64-mingw32-" end premake.gcc.cc = toolchainPrefix .. "gcc" @@ -266,7 +266,7 @@ function toolchain(_buildDir, _subDir) if not os.getenv("MINGW64") then print("Set MINGW64 envrionment variable.") end - if not toolchainPrefix then + if toolchainPrefix == nil or toolchainPrefix == "" then toolchainPrefix = "$(MINGW64)/bin/x86_64-w64-mingw32-" end premake.gcc.cc = toolchainPrefix .. "gcc" @@ -772,9 +772,14 @@ function toolchain(_buildDir, _subDir) configuration { "openbsd", "x64", "Debug" } targetdir (_buildDir .. "openbsd" .. "/bin/x64/Debug") + configuration { "android-*", "Release" } + targetdir (_buildDir .. "android/bin/" .. _OPTIONS["PLATFORM"] .. "/Release") + + configuration { "android-*", "Debug" } + targetdir (_buildDir .. "android/bin/" .. _OPTIONS["PLATFORM"] .. "/Debug") + configuration { "android-*" } - targetdir (_buildDir .. "android-" .. _OPTIONS["PLATFORM"] .. "/bin") - objdir (_buildDir .. "android-" .. _OPTIONS["PLATFORM"] .. "/obj") + objdir (_buildDir .. "android/obj/" .. _OPTIONS["PLATFORM"]) includedirs { MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include", @@ -1063,12 +1068,12 @@ function strip() configuration { "mingw*", "x64", "Release" } postbuildcommands { "$(SILENT) echo Stripping symbols.", - "$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] and toolchainPrefix or "$(MINGW64)/bin/") .. "strip -s \"$(TARGET)\"", + "$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] or "$(MINGW64)/bin/") .. "strip -s \"$(TARGET)\"", } configuration { "mingw*", "x32", "Release" } postbuildcommands { "$(SILENT) echo Stripping symbols.", - "$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] and toolchainPrefix or "$(MINGW32)/bin/") .. "strip -s \"$(TARGET)\"", + "$(SILENT) " .. (_OPTIONS['TOOLCHAIN'] or "$(MINGW32)/bin/") .. "strip -s \"$(TARGET)\"", } configuration { "pnacl" } |