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/src | |
parent | 437eeecc020c81384491dc193bf85a8ed5994b56 (diff) |
0.176 Release Fileshbmame176
Diffstat (limited to 'docs/release/scripts/src')
-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 |
11 files changed, 140 insertions, 31 deletions
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", } |