diff options
| author | wiz <wiz@pkgsrc.org> | 2015-02-05 17:33:12 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-02-05 17:33:12 +0000 |
| commit | 20d708a15750502ebc498619bb896656ca5f0b09 (patch) | |
| tree | ebf9f0a68004e75d177703d846439516fe555980 | |
| parent | f8588dd0a1ce4102d26538d2b0bd4d682d5a4d14 (diff) | |
| download | pkgsrc-20d708a15750502ebc498619bb896656ca5f0b09.tar.gz | |
Use MesaLib only on non-arm.
Support dynarec option on i386 and x86_64 too.
| -rw-r--r-- | emulators/libretro-mupen64plus/Makefile | 10 | ||||
| -rw-r--r-- | emulators/libretro-mupen64plus/options.mk | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/emulators/libretro-mupen64plus/Makefile b/emulators/libretro-mupen64plus/Makefile index 006b21a98c9..2b610022839 100644 --- a/emulators/libretro-mupen64plus/Makefile +++ b/emulators/libretro-mupen64plus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2015/02/05 17:22:26 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2015/02/05 17:33:12 wiz Exp $ DISTNAME= mupen64plus-libretro-20150204 PKGNAME= libretro-mupen64plus-20150204 @@ -29,9 +29,9 @@ INSTALLATION_DIRS+= ${PREFIX}/lib/libretro CFLAGS+= -DHAVE_POSIX_MEMALIGN=1 .endif -.if !empty(MACHINE_ARCH:M*arm*) -# only ARM-specific options for now, and options framework -#insists on having at least one option, so only pull it in for ARM +.if !empty(MACHINE_ARCH:M*arm*) || !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64) +# only ARM-, i386-, and x86_64-specific options for now, and options framework +#insists on having at least one option, so only pull it in for them .include "options.mk" .endif @@ -39,5 +39,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/mupen64plus_libretro.so \ ${DESTDIR}${PREFIX}/lib/libretro/mupen64plus_libretro.so +.if empty(MACHINE_ARCH:M*arm*) .include "../../graphics/MesaLib/buildlink3.mk" +.endif .include "../../mk/bsd.pkg.mk" diff --git a/emulators/libretro-mupen64plus/options.mk b/emulators/libretro-mupen64plus/options.mk index 88e158fc317..db6e377dcdb 100644 --- a/emulators/libretro-mupen64plus/options.mk +++ b/emulators/libretro-mupen64plus/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2015/02/05 16:57:36 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2015/02/05 17:33:12 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libretro-mupen64plus @@ -8,6 +8,14 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.libretro-mupen64plus PKG_SUPPORTED_OPTIONS+= rpi dynarec PKG_SUGGESTED_OPTIONS+= rpi dynarec MUPEN64_DYNAREC_ARCH= arm +.elif !empty(MACHINE_ARCH:Mi386) +PKG_SUPPORTED_OPTIONS+= dynarec +PKG_SUGGESTED_OPTIONS+= dynarec +MUPEN64_DYNAREC_ARCH= x86 +.elif !empty(MACHINE_ARCH:Mx86_64) +PKG_SUPPORTED_OPTIONS+= dynarec +PKG_SUGGESTED_OPTIONS+= dynarec +MUPEN64_DYNAREC_ARCH= x86_64 .endif .include "../../mk/bsd.options.mk" |