Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions scriptmodules/libretrocores/lr-hatari.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rp_module_id="lr-hatari"
rp_module_desc="Atari emulator - Hatari port for libretro"
rp_module_help="ROM Extensions: .st .stx .img .rom .raw .ipf .ctr .zip\n\nCopy your Atari ST games to $romdir/atarist"
rp_module_licence="GPL2 https://raw.githubusercontent.com/libretro/hatari/master/gpl.txt"
rp_module_repo="git https://github.com/libretro/hatari.git master"
rp_module_repo="git https://github.com/libretro/hatari.git hitari2014-mercurial"
rp_module_section="exp"

function depends_lr-hatari() {
Expand All @@ -22,15 +22,17 @@ function depends_lr-hatari() {

function sources_lr-hatari() {
gitPullOrClone
applyPatch "$md_data/01_libcapsimage.diff"
# TARGET_NAME should be overriden by user input
sed -i "s/TARGET_NAME :=/TARGET_NAME ?=/" "$md_build/Makefile.libretro"
_sources_libcapsimage_hatari
}

function build_lr-hatari() {
_build_libcapsimage_hatari

cd "$md_build"
CFLAGS+=" -D__cdecl='' -I\"$md_build/src/includes/caps\" -DHAVE_CAPSIMAGE=1 -DCAPSIMAGE_VERSION=5" CAPSIMG_LDFLAGS="-L./lib -l:libcapsimage.so.5.1" make -f Makefile.libretro
make -f Makefile.libretro clean
make -f Makefile.libretro capsimg=1 capssrc="$md_build/capsimg_source_linux_macosx" capslib="$md_build/lib" capslibname=":libcapsimage.so.5.1" TARGET_NAME="hatari" LDFLAGS="-Wl,-rpath='$md_inst'"
md_ret_require="$md_build/hatari_libretro.so"
}

Expand All @@ -52,11 +54,4 @@ function configure_lr-hatari() {

addEmulator 1 "$md_id" "atarist" "$md_inst/hatari_libretro.so"
addSystem "atarist"

[[ "$md_mode" == "remove" ]] && return

# add LD_LIBRARY_PATH='$md_inst' to start of launch command
iniConfig " = " '"' "$configdir/atarist/emulators.cfg"
iniGet "$md_id"
iniSet "$md_id" "LD_LIBRARY_PATH='$md_inst' $ini_value"
}
94 changes: 0 additions & 94 deletions scriptmodules/libretrocores/lr-hatari/01_libcapsimage.diff

This file was deleted.