Skip to content

Commit affa96d

Browse files
authored
Merge pull request #3568 from joolswills/lr-hatari_capsimg_fix
lr-hatari - fix build failing due to CapsLibAll.h include path change
2 parents ee05029 + d9a5160 commit affa96d

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

scriptmodules/emulators/hatari.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ function _build_libcapsimage_hatari() {
4343
mkdir -p "$md_build/src/includes/caps"
4444
cp -R "../LibIPF/"*.h "$md_build/src/includes/caps/"
4545
cp "../Core/CommonTypes.h" "$md_build/src/includes/caps/"
46-
# 'lr-hatari' expects a 'caps5' include path
47-
ln -sf "$md_build/src/includes/caps" "$md_build/src/includes/caps5"
4846
}
4947

5048
function build_hatari() {

scriptmodules/libretrocores/lr-hatari.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function build_lr-hatari() {
3030
_build_libcapsimage_hatari
3131

3232
cd "$md_build"
33-
CFLAGS+=" -D__cdecl='' -DHAVE_CAPSIMAGE=1 -DCAPSIMAGE_VERSION=5" CAPSIMG_LDFLAGS="-L./lib -l:libcapsimage.so.5.1" make -f Makefile.libretro
33+
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
3434
md_ret_require="$md_build/hatari_libretro.so"
3535
}
3636

0 commit comments

Comments
 (0)