Skip to content

Commit

Permalink
Merge pull request #3251 from cmitu/lr-mame-build-update
Browse files Browse the repository at this point in the history
lr-mame, mame: use python3 to build recent mame versions
  • Loading branch information
joolswills authored Nov 2, 2020
2 parents 2fd5e22 + 44f00eb commit 803711a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 1 addition & 4 deletions scriptmodules/emulators/mame.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ function build_mame() {
fi

# Compile MAME
local params=(NOWERROR=1 ARCHOPTS=-U_FORTIFY_SOURCE)
# Prefer python3 for building, when available
command -v python3 >/dev/null 2>&1 && params+=(PYTHON_EXECUTABLE=python3)

local params=(NOWERROR=1 ARCHOPTS=-U_FORTIFY_SOURCE PYTHON_EXECUTABLE=python3)
make "${params[@]}"

local binary_name="$(_get_binary_name_${md_id})"
Expand Down
2 changes: 1 addition & 1 deletion scriptmodules/libretrocores/lr-mame.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rp_module_section="exp"
rp_module_flags=""

function _get_params_lr-mame() {
local params=(OSD=retro RETRO=1 NOWERROR=1 OS=linux TARGETOS=linux CONFIG=libretro NO_USE_MIDI=1 TARGET=mame)
local params=(OSD=retro RETRO=1 NOWERROR=1 OS=linux TARGETOS=linux CONFIG=libretro NO_USE_MIDI=1 TARGET=mame PYTHON_EXECUTABLE=python3)
isPlatform "64bit" && params+=(PTR64=1)
echo "${params[@]}"
}
Expand Down

0 comments on commit 803711a

Please sign in to comment.