diff options
author | 2016-04-23 11:25:03 +0200 | |
---|---|---|
committer | 2016-04-23 11:26:47 +0200 | |
commit | 1c726824f2b2cc7c6c03ff975e548b72f9b2c0a9 (patch) | |
tree | 020f20da5a8cd822065c1839bc7a53f826803a3d /scripts/src | |
parent | 01657a63c13c79c5f045ba4ecb4c2fd7f7c5a1f8 (diff) |
Split UI and frontend part from core [Miodrag Milanovic]
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/emu.lua | 121 | ||||
-rw-r--r-- | scripts/src/main.lua | 1 | ||||
-rw-r--r-- | scripts/src/mame/frontend.lua | 154 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 1 |
4 files changed, 162 insertions, 115 deletions
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 792b422785e..afedfcb1a1d 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -38,20 +38,9 @@ includedirs { ext_includedir("flac"), } -if (_OPTIONS["targetos"] == "windows" and _OPTIONS["osd"] ~= "osdmini") then - defines { - "UI_WINDOWS", - } -end - -if (_OPTIONS["osd"] == "sdl") then - defines { - "UI_SDL", - } -end - files { MAME_DIR .. "src/emu/emu.h", + MAME_DIR .. "src/emu/main.h", MAME_DIR .. "src/emu/gamedrv.h", MAME_DIR .. "src/emu/hashfile.cpp", MAME_DIR .. "src/emu/hashfile.h", @@ -59,14 +48,8 @@ files { MAME_DIR .. "src/emu/addrmap.h", MAME_DIR .. "src/emu/attotime.cpp", MAME_DIR .. "src/emu/attotime.h", - MAME_DIR .. "src/emu/audit.cpp", - MAME_DIR .. "src/emu/audit.h", MAME_DIR .. "src/emu/bookkeeping.cpp", MAME_DIR .. "src/emu/bookkeeping.h", - MAME_DIR .. "src/emu/cheat.cpp", - MAME_DIR .. "src/emu/cheat.h", - MAME_DIR .. "src/emu/clifront.cpp", - MAME_DIR .. "src/emu/clifront.h", MAME_DIR .. "src/emu/config.cpp", MAME_DIR .. "src/emu/config.h", MAME_DIR .. "src/emu/crsshair.cpp", @@ -141,21 +124,11 @@ files { MAME_DIR .. "src/emu/hash.h", MAME_DIR .. "src/emu/image.cpp", MAME_DIR .. "src/emu/image.h", - MAME_DIR .. "src/emu/info.cpp", - MAME_DIR .. "src/emu/info.h", MAME_DIR .. "src/emu/input.cpp", MAME_DIR .. "src/emu/input.h", MAME_DIR .. "src/emu/ioport.cpp", MAME_DIR .. "src/emu/ioport.h", MAME_DIR .. "src/emu/inpttype.h", - MAME_DIR .. "src/emu/luaengine.cpp", - MAME_DIR .. "src/emu/luaengine.h", - MAME_DIR .. "src/emu/language.cpp", - MAME_DIR .. "src/emu/language.h", - MAME_DIR .. "src/emu/mame.cpp", - MAME_DIR .. "src/emu/mame.h", - MAME_DIR .. "src/emu/mameopts.cpp", - MAME_DIR .. "src/emu/mameopts.h", MAME_DIR .. "src/emu/machine.cpp", MAME_DIR .. "src/emu/machine.h", MAME_DIR .. "src/emu/mconfig.cpp", @@ -166,8 +139,8 @@ files { MAME_DIR .. "src/emu/network.h", MAME_DIR .. "src/emu/parameters.cpp", MAME_DIR .. "src/emu/parameters.h", - MAME_DIR .. "src/emu/pluginopts.cpp", - MAME_DIR .. "src/emu/pluginopts.h", + MAME_DIR .. "src/emu/profiler.cpp", + MAME_DIR .. "src/emu/profiler.h", MAME_DIR .. "src/emu/output.cpp", MAME_DIR .. "src/emu/output.h", MAME_DIR .. "src/emu/render.cpp", @@ -200,92 +173,14 @@ files { MAME_DIR .. "src/emu/timer.h", MAME_DIR .. "src/emu/uiinput.cpp", MAME_DIR .. "src/emu/uiinput.h", - MAME_DIR .. "src/emu/ui/ui.cpp", - MAME_DIR .. "src/emu/ui/ui.h", - MAME_DIR .. "src/emu/ui/devctrl.h", - MAME_DIR .. "src/emu/ui/menu.cpp", - MAME_DIR .. "src/emu/ui/menu.h", - MAME_DIR .. "src/emu/ui/submenu.cpp", - MAME_DIR .. "src/emu/ui/submenu.h", - MAME_DIR .. "src/emu/ui/mainmenu.cpp", - MAME_DIR .. "src/emu/ui/mainmenu.h", - MAME_DIR .. "src/emu/ui/miscmenu.cpp", - MAME_DIR .. "src/emu/ui/miscmenu.h", - MAME_DIR .. "src/emu/ui/barcode.cpp", - MAME_DIR .. "src/emu/ui/barcode.h", - MAME_DIR .. "src/emu/ui/cheatopt.cpp", - MAME_DIR .. "src/emu/ui/cheatopt.h", - MAME_DIR .. "src/emu/ui/pluginopt.cpp", - MAME_DIR .. "src/emu/ui/pluginopt.h", - MAME_DIR .. "src/emu/ui/devopt.cpp", - MAME_DIR .. "src/emu/ui/devopt.h", - MAME_DIR .. "src/emu/ui/filemngr.cpp", - MAME_DIR .. "src/emu/ui/filemngr.h", - MAME_DIR .. "src/emu/ui/filesel.cpp", - MAME_DIR .. "src/emu/ui/filesel.h", - MAME_DIR .. "src/emu/ui/imgcntrl.cpp", - MAME_DIR .. "src/emu/ui/imgcntrl.h", - MAME_DIR .. "src/emu/ui/info.cpp", - MAME_DIR .. "src/emu/ui/info.h", - MAME_DIR .. "src/emu/ui/info_pty.cpp", - MAME_DIR .. "src/emu/ui/info_pty.h", - MAME_DIR .. "src/emu/ui/inputmap.cpp", - MAME_DIR .. "src/emu/ui/inputmap.h", - MAME_DIR .. "src/emu/ui/sliders.cpp", - MAME_DIR .. "src/emu/ui/sliders.h", - MAME_DIR .. "src/emu/ui/slotopt.cpp", - MAME_DIR .. "src/emu/ui/slotopt.h", - MAME_DIR .. "src/emu/ui/swlist.cpp", - MAME_DIR .. "src/emu/ui/swlist.h", - MAME_DIR .. "src/emu/ui/tapectrl.cpp", - MAME_DIR .. "src/emu/ui/tapectrl.h", - MAME_DIR .. "src/emu/ui/videoopt.cpp", - MAME_DIR .. "src/emu/ui/videoopt.h", - MAME_DIR .. "src/emu/ui/viewgfx.cpp", - MAME_DIR .. "src/emu/ui/viewgfx.h", - MAME_DIR .. "src/emu/ui/auditmenu.cpp", - MAME_DIR .. "src/emu/ui/auditmenu.h", - MAME_DIR .. "src/emu/ui/cmddata.h", - MAME_DIR .. "src/emu/ui/cmdrender.h", - MAME_DIR .. "src/emu/ui/custmenu.cpp", - MAME_DIR .. "src/emu/ui/custmenu.h", - MAME_DIR .. "src/emu/ui/custui.cpp", - MAME_DIR .. "src/emu/ui/custui.h", - MAME_DIR .. "src/emu/ui/datfile.cpp", - MAME_DIR .. "src/emu/ui/datfile.h", - MAME_DIR .. "src/emu/ui/datmenu.cpp", - MAME_DIR .. "src/emu/ui/datmenu.h", - MAME_DIR .. "src/emu/ui/defimg.h", - MAME_DIR .. "src/emu/ui/dirmenu.cpp", - MAME_DIR .. "src/emu/ui/dirmenu.h", - MAME_DIR .. "src/emu/ui/icorender.h", - MAME_DIR .. "src/emu/ui/inifile.cpp", - MAME_DIR .. "src/emu/ui/inifile.h", - MAME_DIR .. "src/emu/ui/miscmenu.cpp", - MAME_DIR .. "src/emu/ui/miscmenu.h", - MAME_DIR .. "src/emu/ui/moptions.cpp", - MAME_DIR .. "src/emu/ui/moptions.h", - MAME_DIR .. "src/emu/ui/optsmenu.cpp", - MAME_DIR .. "src/emu/ui/optsmenu.h", - MAME_DIR .. "src/emu/ui/selector.cpp", - MAME_DIR .. "src/emu/ui/selector.h", - MAME_DIR .. "src/emu/ui/selgame.cpp", - MAME_DIR .. "src/emu/ui/selgame.h", - MAME_DIR .. "src/emu/ui/simpleselgame.cpp", - MAME_DIR .. "src/emu/ui/simpleselgame.h", - MAME_DIR .. "src/emu/ui/selsoft.cpp", - MAME_DIR .. "src/emu/ui/selsoft.h", - MAME_DIR .. "src/emu/ui/sndmenu.cpp", - MAME_DIR .. "src/emu/ui/sndmenu.h", - MAME_DIR .. "src/emu/ui/starimg.h", - MAME_DIR .. "src/emu/ui/toolbar.h", - MAME_DIR .. "src/emu/ui/utils.cpp", - MAME_DIR .. "src/emu/ui/utils.h", MAME_DIR .. "src/emu/validity.cpp", MAME_DIR .. "src/emu/validity.h", MAME_DIR .. "src/emu/video.cpp", MAME_DIR .. "src/emu/video.h", MAME_DIR .. "src/emu/rendersw.inc", + MAME_DIR .. "src/emu/ui/uimain.h", + MAME_DIR .. "src/emu/ui/cmdrender.h", -- TODO: remove + MAME_DIR .. "src/emu/ui/cmddata.h", -- TODO: remove MAME_DIR .. "src/emu/debug/debugcmd.cpp", MAME_DIR .. "src/emu/debug/debugcmd.h", MAME_DIR .. "src/emu/debug/debugcon.cpp", @@ -312,8 +207,6 @@ files { MAME_DIR .. "src/emu/debug/express.h", MAME_DIR .. "src/emu/debug/textbuf.cpp", MAME_DIR .. "src/emu/debug/textbuf.h", - MAME_DIR .. "src/emu/profiler.cpp", - MAME_DIR .. "src/emu/profiler.h", MAME_DIR .. "src/emu/sound/filter.cpp", MAME_DIR .. "src/emu/sound/filter.h", MAME_DIR .. "src/devices/sound/flt_vol.cpp", @@ -417,7 +310,7 @@ custombuildtask { } custombuildtask { - { MAME_DIR .. "src/emu/ui/uicmd14.png" , GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 UINT8" }}, + { MAME_DIR .. "src/frontend/mame/ui/uicmd14.png" , GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 UINT8" }}, layoutbuildtask("emu/layout", "dualhovu"), layoutbuildtask("emu/layout", "dualhsxs"), diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 3b07a69211c..f8a983b297d 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -192,6 +192,7 @@ end links { "netlist", "optional", + "frontend", "emu", "formats", } diff --git a/scripts/src/mame/frontend.lua b/scripts/src/mame/frontend.lua new file mode 100644 index 00000000000..2e4a35bf8a9 --- /dev/null +++ b/scripts/src/mame/frontend.lua @@ -0,0 +1,154 @@ +-- license:BSD-3-Clause +-- copyright-holders:MAMEdev Team + +--------------------------------------------------------------------------- +-- +-- frontend.lua +-- +-- Rules for building frontend +-- +--------------------------------------------------------------------------- + +project ("frontend") +targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) +uuid ("e98e14c4-82a4-4988-ba29-01c90c817ab8") +kind (LIBTYPE) + +addprojectflags() +precompiledheaders() +options { + "ArchiveSplit", +} +includedirs { + MAME_DIR .. "src/osd", + MAME_DIR .. "src/emu", + MAME_DIR .. "src/frontend/mame", + MAME_DIR .. "src/devices", -- till deps are fixed + MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/util", + MAME_DIR .. "3rdparty/rapidjson/include", + MAME_DIR .. "3rdparty", + GEN_DIR .. "emu", + GEN_DIR .. "emu/layout", +} + +includedirs { + ext_includedir("expat"), + ext_includedir("lua"), + ext_includedir("zlib"), + ext_includedir("flac"), +} + +if (_OPTIONS["targetos"] == "windows") then + defines { + "UI_WINDOWS", + } +end + +if (_OPTIONS["osd"] == "sdl") then + defines { + "UI_SDL", + } +end + +files { + MAME_DIR .. "src/frontend/mame/audit.cpp", + MAME_DIR .. "src/frontend/mame/audit.h", + MAME_DIR .. "src/frontend/mame/cheat.cpp", + MAME_DIR .. "src/frontend/mame/cheat.h", + MAME_DIR .. "src/frontend/mame/clifront.cpp", + MAME_DIR .. "src/frontend/mame/clifront.h", + MAME_DIR .. "src/frontend/mame/info.cpp", + MAME_DIR .. "src/frontend/mame/info.h", + MAME_DIR .. "src/frontend/mame/language.cpp", + MAME_DIR .. "src/frontend/mame/language.h", + MAME_DIR .. "src/frontend/mame/luaengine.cpp", + MAME_DIR .. "src/frontend/mame/luaengine.h", + MAME_DIR .. "src/frontend/mame/mame.cpp", + MAME_DIR .. "src/frontend/mame/mame.h", + MAME_DIR .. "src/frontend/mame/mameopts.cpp", + MAME_DIR .. "src/frontend/mame/mameopts.h", + MAME_DIR .. "src/frontend/mame/pluginopts.cpp", + MAME_DIR .. "src/frontend/mame/pluginopts.h", + MAME_DIR .. "src/frontend/mame/ui/ui.cpp", + MAME_DIR .. "src/frontend/mame/ui/ui.h", + MAME_DIR .. "src/frontend/mame/ui/devctrl.h", + MAME_DIR .. "src/frontend/mame/ui/menu.cpp", + MAME_DIR .. "src/frontend/mame/ui/menu.h", + MAME_DIR .. "src/frontend/mame/ui/submenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/submenu.h", + MAME_DIR .. "src/frontend/mame/ui/mainmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/mainmenu.h", + MAME_DIR .. "src/frontend/mame/ui/miscmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/miscmenu.h", + MAME_DIR .. "src/frontend/mame/ui/barcode.cpp", + MAME_DIR .. "src/frontend/mame/ui/barcode.h", + MAME_DIR .. "src/frontend/mame/ui/cheatopt.cpp", + MAME_DIR .. "src/frontend/mame/ui/cheatopt.h", + MAME_DIR .. "src/frontend/mame/ui/pluginopt.cpp", + MAME_DIR .. "src/frontend/mame/ui/pluginopt.h", + MAME_DIR .. "src/frontend/mame/ui/devopt.cpp", + MAME_DIR .. "src/frontend/mame/ui/devopt.h", + MAME_DIR .. "src/frontend/mame/ui/filemngr.cpp", + 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/floppycntrl.cpp", + MAME_DIR .. "src/frontend/mame/ui/floppycntrl.h", + MAME_DIR .. "src/frontend/mame/ui/imgcntrl.cpp", + MAME_DIR .. "src/frontend/mame/ui/imgcntrl.h", + MAME_DIR .. "src/frontend/mame/ui/info.cpp", + MAME_DIR .. "src/frontend/mame/ui/info.h", + MAME_DIR .. "src/frontend/mame/ui/info_pty.cpp", + 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/sliders.cpp", + MAME_DIR .. "src/frontend/mame/ui/sliders.h", + MAME_DIR .. "src/frontend/mame/ui/slotopt.cpp", + MAME_DIR .. "src/frontend/mame/ui/slotopt.h", + MAME_DIR .. "src/frontend/mame/ui/swlist.cpp", + MAME_DIR .. "src/frontend/mame/ui/swlist.h", + MAME_DIR .. "src/frontend/mame/ui/tapectrl.cpp", + MAME_DIR .. "src/frontend/mame/ui/tapectrl.h", + MAME_DIR .. "src/frontend/mame/ui/videoopt.cpp", + MAME_DIR .. "src/frontend/mame/ui/videoopt.h", + MAME_DIR .. "src/frontend/mame/ui/viewgfx.cpp", + MAME_DIR .. "src/frontend/mame/ui/viewgfx.h", + MAME_DIR .. "src/frontend/mame/ui/auditmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/auditmenu.h", + MAME_DIR .. "src/frontend/mame/ui/custmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/custmenu.h", + MAME_DIR .. "src/frontend/mame/ui/custui.cpp", + MAME_DIR .. "src/frontend/mame/ui/custui.h", + MAME_DIR .. "src/frontend/mame/ui/datfile.cpp", + 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/dirmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/dirmenu.h", + MAME_DIR .. "src/frontend/mame/ui/icorender.h", + MAME_DIR .. "src/frontend/mame/ui/inifile.cpp", + MAME_DIR .. "src/frontend/mame/ui/inifile.h", + MAME_DIR .. "src/frontend/mame/ui/miscmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/miscmenu.h", + MAME_DIR .. "src/frontend/mame/ui/moptions.cpp", + MAME_DIR .. "src/frontend/mame/ui/moptions.h", + MAME_DIR .. "src/frontend/mame/ui/optsmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/optsmenu.h", + MAME_DIR .. "src/frontend/mame/ui/selector.cpp", + MAME_DIR .. "src/frontend/mame/ui/selector.h", + MAME_DIR .. "src/frontend/mame/ui/selgame.cpp", + MAME_DIR .. "src/frontend/mame/ui/selgame.h", + MAME_DIR .. "src/frontend/mame/ui/simpleselgame.cpp", + MAME_DIR .. "src/frontend/mame/ui/simpleselgame.h", + MAME_DIR .. "src/frontend/mame/ui/selsoft.cpp", + 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/utils.cpp", + MAME_DIR .. "src/frontend/mame/ui/utils.h", +} diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index d372ed9761c..a05e55ee4c6 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -57,7 +57,6 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/diagnostics/none.cpp", MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_win32.cpp", MAME_DIR .. "src/osd/modules/debugger/none.cpp", - MAME_DIR .. "src/osd/modules/debugger/debugint.cpp", MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp", MAME_DIR .. "src/osd/modules/debugger/debugimgui.cpp", MAME_DIR .. "src/osd/modules/font/font_sdl.cpp", |