From 899f23a7ec90ec6f0d87f4dd232e1ca01f7522ef Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 8 Apr 2015 14:19:43 +0200 Subject: [PATCH] Added PYTHON_EXECUTABLE to use differently named python executable(nw) --- makefile | 14 +++++++++--- scripts/genie.lua | 13 ++++++++++- scripts/src/cpu.lua | 44 ++++++++++++++++++------------------ scripts/src/emu.lua | 2 +- scripts/src/main.lua | 8 +++---- scripts/target/mess/mess.lua | 2 +- 6 files changed, 51 insertions(+), 32 deletions(-) diff --git a/makefile b/makefile index 9c10d14d02b..58dfb20b2ef 100644 --- a/makefile +++ b/makefile @@ -75,6 +75,7 @@ # FILTER_DEPS = 1 # SEPARATE_BIN = 1 +# PYTHON_EXECUTABLE = python3 -include useroptions.mak @@ -221,8 +222,11 @@ BIGENDIAN := 1 endif endif # BIGENDIAN - +ifndef PYTHON_EXECUTABLE PYTHON := $(SILENT)python +else +PYTHON := $(SILENT)$(PYTHON_EXECUTABLE) +endif CC := $(SILENT)gcc LD := $(SILENT)g++ @@ -495,6 +499,10 @@ ifdef SEPARATE_BIN PARAMS += --SEPARATE_BIN='$(SEPARATE_BIN)' endif +ifdef PYTHON_EXECUTABLE +PARAMS += --PYTHON_EXECUTABLE='$(PYTHON_EXECUTABLE)' +endif + #------------------------------------------------- # All scripts #------------------------------------------------- @@ -564,12 +572,12 @@ SRC = src ifeq ($(OS),windows) GCC_VERSION := $(shell gcc -dumpversion 2> NUL) CLANG_VERSION := $(shell %CLANG%\bin\clang --version 2> NUL| head -n 1 | sed "s/[^0-9,.]//g") -PYTHON_AVAILABLE := $(shell python --version > NUL 2>&1 && echo python) +PYTHON_AVAILABLE := $(shell $(PYTHON) --version > NUL 2>&1 && echo python) CHECK_CLANG := else GCC_VERSION := $(shell $(subst @,,$(CC)) -dumpversion 2> /dev/null) CLANG_VERSION := $(shell clang --version 2> /dev/null | grep 'LLVM [0-9]\.[0-9]' -o | grep '[0-9]\.[0-9]' -o | head -n 1) -PYTHON_AVAILABLE := $(shell python --version > /dev/null 2>&1 && echo python) +PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python) CHECK_CLANG := $(shell gcc --version 2> /dev/null | grep 'clang' | head -n 1) endif diff --git a/scripts/genie.lua b/scripts/genie.lua index 0a70ebb904f..c907c87cf13 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -41,7 +41,7 @@ function findfunction(x) end function layoutbuildtask(_folder, _name) - return { MAME_DIR .. "src/".._folder.."/".. _name ..".lay" , GEN_DIR .. _folder .. "/".._name..".lh", { MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting src/".._folder.."/".._name..".lay...", "python $(1) $(<) $(@) layout_".._name }}; + return { MAME_DIR .. "src/".._folder.."/".. _name ..".lay" , GEN_DIR .. _folder .. "/".._name..".lh", { MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting src/".._folder.."/".._name..".lay...", PYTHON .. " $(1) $(<) $(@) layout_".._name }}; end CPUS = {} @@ -272,6 +272,17 @@ newoption { } } +newoption { + trigger = "PYTHON_EXECUTABLE", + description = "Python executable.", +} + +PYTHON = "python" + +if _OPTIONS["PYTHON_EXECUTABLE"]~=nil then + PYTHON = _OPTIONS["PYTHON_EXECUTABLE"] +end + if not _OPTIONS["BIGENDIAN"] then _OPTIONS["BIGENDIAN"] = "0" end diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 3669ea334ab..8b6d0c31e00 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -82,7 +82,7 @@ if (CPUS["ARCOMPACT"]~=null) then } custombuildtask { - { MAME_DIR .. "src/emu/cpu/arcompact/arcompact_make.py" , GEN_DIR .. "emu/cpu/arcompact/arcompact.inc", { MAME_DIR .. "src/emu/cpu/arcompact/arcompact_make.py" }, {"@echo Generating arcompact source .inc files...", "python $(1) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/arcompact/arcompact_make.py" , GEN_DIR .. "emu/cpu/arcompact/arcompact.inc", { MAME_DIR .. "src/emu/cpu/arcompact/arcompact_make.py" }, {"@echo Generating arcompact source .inc files...", PYTHON .. " $(1) $(@)" }}, } end @@ -476,10 +476,10 @@ if (CPUS["H8"]~=null) then } custombuildtask { - { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8-300 source file...", "python $(1) $(<) o $(@)" }}, - { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8h.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8-300H source file...", "python $(1) $(<) h $(@)" }}, - { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2000.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8S/2000 source file...", "python $(1) $(<) s20 $(@)" }}, - { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2600.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8S/2600 source file...", "python $(1) $(<) s26 $(@)" }}, + { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8-300 source file...", PYTHON .. " $(1) $(<) o $(@)" }}, + { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8h.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8-300H source file...", PYTHON .. " $(1) $(<) h $(@)" }}, + { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2000.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8S/2000 source file...", PYTHON .. " $(1) $(<) s20 $(@)" }}, + { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2600.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8S/2600 source file...", PYTHON .. " $(1) $(<) s26 $(@)" }}, } end @@ -718,9 +718,9 @@ if (CPUS["MCS96"]~=null) then } custombuildtask { - { MAME_DIR .. "src/emu/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/mcs96.inc", { MAME_DIR .. "src/emu/cpu/mcs96/mcs96make.py" }, {"@echo Generating mcs96 source file...", "python $(1) mcs96 $(<) $(@)" }}, - { MAME_DIR .. "src/emu/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8x9x.inc", { MAME_DIR .. "src/emu/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8x9x source file...", "python $(1) i8x9x $(<) $(@)" }}, - { MAME_DIR .. "src/emu/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8xc196.inc", { MAME_DIR .. "src/emu/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8xc196 source file...", "python $(1) i8xc196 $(<) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/mcs96.inc", { MAME_DIR .. "src/emu/cpu/mcs96/mcs96make.py" }, {"@echo Generating mcs96 source file...", PYTHON .. " $(1) mcs96 $(<) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8x9x.inc", { MAME_DIR .. "src/emu/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8x9x source file...", PYTHON .. " $(1) i8x9x $(<) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8xc196.inc", { MAME_DIR .. "src/emu/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8xc196 source file...", PYTHON .. " $(1) i8xc196 $(<) $(@)" }}, } end @@ -1006,17 +1006,17 @@ if (CPUS["M6502"]~=null) then } custombuildtask { - { MAME_DIR .. "src/emu/cpu/m6502/odeco16.lst", GEN_DIR .. "emu/cpu/m6502/deco16.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/ddeco16.lst" }, {"@echo Generating deco16 source file...", "python $(1) deco16_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/emu/cpu/m6502/om4510.lst", GEN_DIR .. "emu/cpu/m6502/m4510.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm4510.lst" }, {"@echo Generating m4510 source file...", "python $(1) m4510_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/emu/cpu/m6502/om6502.lst", GEN_DIR .. "emu/cpu/m6502/m6502.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm6502.lst" }, {"@echo Generating m6502 source file...", "python $(1) m6502_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/emu/cpu/m6502/om65c02.lst", GEN_DIR .. "emu/cpu/m6502/m65c02.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm65c02.lst" }, {"@echo Generating m65c02 source file...", "python $(1) m65c02_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/emu/cpu/m6502/om65ce02.lst",GEN_DIR .. "emu/cpu/m6502/m65ce02.inc",{ MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm65ce02.lst" }, {"@echo Generating m65ce02 source file...", "python $(1) m65ce02_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/emu/cpu/m6502/om6509.lst", GEN_DIR .. "emu/cpu/m6502/m6509.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm6509.lst" }, {"@echo Generating m6509 source file...", "python $(1) m6509_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/emu/cpu/m6502/om6510.lst", GEN_DIR .. "emu/cpu/m6502/m6510.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm6510.lst" }, {"@echo Generating m6510 source file...", "python $(1) m6510_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/emu/cpu/m6502/on2a03.lst", GEN_DIR .. "emu/cpu/m6502/n2a03.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dn2a03.lst" }, {"@echo Generating n2a03 source file...", "python $(1) n2a03_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/emu/cpu/m6502/om740.lst" , GEN_DIR .. "emu/cpu/m6502/m740.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm740.lst" }, {"@echo Generating m740 source file...", "python $(1) m740_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6502/odeco16.lst", GEN_DIR .. "emu/cpu/m6502/deco16.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/ddeco16.lst" }, {"@echo Generating deco16 source file...", PYTHON .. " $(1) deco16_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6502/om4510.lst", GEN_DIR .. "emu/cpu/m6502/m4510.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm4510.lst" }, {"@echo Generating m4510 source file...", PYTHON .. " $(1) m4510_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6502/om6502.lst", GEN_DIR .. "emu/cpu/m6502/m6502.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm6502.lst" }, {"@echo Generating m6502 source file...", PYTHON .. " $(1) m6502_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6502/om65c02.lst", GEN_DIR .. "emu/cpu/m6502/m65c02.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm65c02.lst" }, {"@echo Generating m65c02 source file...", PYTHON .. " $(1) m65c02_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6502/om65ce02.lst",GEN_DIR .. "emu/cpu/m6502/m65ce02.inc",{ MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm65ce02.lst" }, {"@echo Generating m65ce02 source file...", PYTHON .. " $(1) m65ce02_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6502/om6509.lst", GEN_DIR .. "emu/cpu/m6502/m6509.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm6509.lst" }, {"@echo Generating m6509 source file...", PYTHON .. " $(1) m6509_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6502/om6510.lst", GEN_DIR .. "emu/cpu/m6502/m6510.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm6510.lst" }, {"@echo Generating m6510 source file...", PYTHON .. " $(1) m6510_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6502/on2a03.lst", GEN_DIR .. "emu/cpu/m6502/n2a03.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dn2a03.lst" }, {"@echo Generating n2a03 source file...", PYTHON .. " $(1) n2a03_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6502/om740.lst" , GEN_DIR .. "emu/cpu/m6502/m740.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm740.lst" }, {"@echo Generating m740 source file...", PYTHON .. " $(1) m740_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/emu/cpu/m6502/dr65c02.lst", GEN_DIR .. "emu/cpu/m6502/r65c02.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py" }, {"@echo Generating r65c02 source file...", "python $(1) r65c02_device - $(<) $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6502/dr65c02.lst", GEN_DIR .. "emu/cpu/m6502/r65c02.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py" }, {"@echo Generating r65c02 source file...", PYTHON .. " $(1) r65c02_device - $(<) $(@)" }}, } end @@ -1071,9 +1071,9 @@ if (CPUS["M6809"]~=null) then } custombuildtask { - { MAME_DIR .. "src/emu/cpu/m6809/m6809.ops" , GEN_DIR .. "emu/cpu/m6809/m6809.inc", { MAME_DIR .. "src/emu/cpu/m6809/m6809make.py" , MAME_DIR .. "src/emu/cpu/m6809/base6x09.ops" }, {"@echo Generating m6809 source file...", "python $(1) $(<) > $(@)" }}, - { MAME_DIR .. "src/emu/cpu/m6809/hd6309.ops" , GEN_DIR .. "emu/cpu/m6809/hd6309.inc", { MAME_DIR .. "src/emu/cpu/m6809/m6809make.py" , MAME_DIR .. "src/emu/cpu/m6809/base6x09.ops" }, {"@echo Generating hd6309 source file...", "python $(1) $(<) > $(@)" }}, - { MAME_DIR .. "src/emu/cpu/m6809/konami.ops" , GEN_DIR .. "emu/cpu/m6809/konami.inc", { MAME_DIR .. "src/emu/cpu/m6809/m6809make.py" , MAME_DIR .. "src/emu/cpu/m6809/base6x09.ops" }, {"@echo Generating konami source file...", "python $(1) $(<) > $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6809/m6809.ops" , GEN_DIR .. "emu/cpu/m6809/m6809.inc", { MAME_DIR .. "src/emu/cpu/m6809/m6809make.py" , MAME_DIR .. "src/emu/cpu/m6809/base6x09.ops" }, {"@echo Generating m6809 source file...", PYTHON .. " $(1) $(<) > $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6809/hd6309.ops" , GEN_DIR .. "emu/cpu/m6809/hd6309.inc", { MAME_DIR .. "src/emu/cpu/m6809/m6809make.py" , MAME_DIR .. "src/emu/cpu/m6809/base6x09.ops" }, {"@echo Generating hd6309 source file...", PYTHON .. " $(1) $(<) > $(@)" }}, + { MAME_DIR .. "src/emu/cpu/m6809/konami.ops" , GEN_DIR .. "emu/cpu/m6809/konami.inc", { MAME_DIR .. "src/emu/cpu/m6809/m6809make.py" , MAME_DIR .. "src/emu/cpu/m6809/base6x09.ops" }, {"@echo Generating konami source file...", PYTHON .. " $(1) $(<) > $(@)" }}, } end @@ -1608,7 +1608,7 @@ end if (CPUS["TMS57002"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/emu/cpu/tms57002/57002dsm.c") table.insert(disasm_dependency , { MAME_DIR .. "src/emu/cpu/tms57002/57002dsm.c", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" } ) - table.insert(disasm_custombuildtask , { MAME_DIR .. "src/emu/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc", { MAME_DIR .. "src/emu/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", "python $(1) $(<) $(@)" }}) + table.insert(disasm_custombuildtask , { MAME_DIR .. "src/emu/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc", { MAME_DIR .. "src/emu/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" }}) end -------------------------------------------------- diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 36ee46405bc..c81a7d0c258 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -182,7 +182,7 @@ dependency { } custombuildtask { - { MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "src/build/png2bdc.py", MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting uismall.png...", "python $(1) $(<) temp.bdc", "python $(2) temp.bdc $(@) font_uismall UINT8" }}, + { MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "src/build/png2bdc.py", MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting uismall.png...", PYTHON .. " $(1) $(<) temp.bdc", PYTHON .. " $(2) temp.bdc $(@) font_uismall UINT8" }}, layoutbuildtask("emu/layout", "dualhovu"), layoutbuildtask("emu/layout", "dualhsxs"), diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 079b46ea26e..42bfe245537 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -91,7 +91,7 @@ function mainProject(_target, _subtarget) "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _target .. "-Info.plist" } custombuildtask { - { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _target .. "-Info.plist", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _target .. "-Info.plist" .. "...", "python $(1) -p -b " .. _target .. " $(<) > $(@)" }}, + { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _target .. "-Info.plist", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _target .. "-Info.plist" .. "...", PYTHON .. " $(1) -p -b " .. _target .. " $(<) > $(@)" }}, } dependency { { "$(TARGET)" , GEN_DIR .. "/resource/" .. _target .. "-Info.plist", true }, @@ -129,19 +129,19 @@ function mainProject(_target, _subtarget) } custombuildtask { - { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c", { MAME_DIR .. "src/build/makelist.py" }, {"@echo Building driver list...", "python $(1) $(<) > $(@)" }}, + { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c", { MAME_DIR .. "src/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, } configuration { "mingw*" } custombuildtask { - { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _target .. "vers.rc" .. "...", "python $(1) -r -b " .. _target .. " $(<) > $(@)" }}, + { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _target .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. _target .. " $(<) > $(@)" }}, } configuration { "vs*" } prebuildcommands { "mkdir " .. path.translate(GEN_DIR .. "/resource/","\\") .. " 2>NUL", "@echo Emitting ".. _target .. "vers.rc...", - "python " .. path.translate(MAME_DIR .. "src/build/verinfo.py","\\") .. " -r -b " .. _target .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. _target .. "vers.rc", "\\") , + PYTHON .. " " .. path.translate(MAME_DIR .. "src/build/verinfo.py","\\") .. " -r -b " .. _target .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. _target .. "vers.rc", "\\") , } diff --git a/scripts/target/mess/mess.lua b/scripts/target/mess/mess.lua index 9dafb6ae7a8..ede81d88479 100644 --- a/scripts/target/mess/mess.lua +++ b/scripts/target/mess/mess.lua @@ -2510,7 +2510,7 @@ dependency { { MAME_DIR .. "src/mess/drivers/ymmu100.c", GEN_DIR .. "mess/drivers/ymmu100.inc" }, } custombuildtask { - { MAME_DIR .. "src/mess/drivers/ymmu100.ppm", GEN_DIR .. "mess/drivers/ymmu100.inc", { MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting src/drivers/ymmu100.ppm...", "python $(1) $(<) $(@) ymmu100_bkg UINT8" }}, + { MAME_DIR .. "src/mess/drivers/ymmu100.ppm", GEN_DIR .. "mess/drivers/ymmu100.inc", { MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting src/drivers/ymmu100.ppm...", PYTHON .. " $(1) $(<) $(@) ymmu100_bkg UINT8" }}, } createMESSProjects(_target, _subtarget, "zenith")