diff options
| author | Brian Feldman <green@FreeBSD.org> | 2003-10-21 02:36:04 +0000 |
|---|---|---|
| committer | Brian Feldman <green@FreeBSD.org> | 2003-10-21 02:36:04 +0000 |
| commit | 78e1cd3dce18f2c2b6418c58a2c3288c7db1fdb0 (patch) | |
| tree | f508a65264ffd4b3ecb7e46c43a053f9acb9e529 /emulators | |
| parent | . Sort PTHREAD_FILES. (diff) | |
Allow the user to compile Snes9X without x86 assembly optimizations, and
with OpenGL as a display, with the port flags WITHOUT_X86_ASM and
WITH_OPENGL. Instead of updating the port revision, bump the version to
"1.41.1", which more accurately reflects what Snes9X is calling itself.
Submitted by: KATO Tsuguru <tkato@prontomail.com>
PR: ports/57003
Notes
Notes:
svn path=/head/; revision=91781
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/snes9x/Makefile | 17 | ||||
| -rw-r--r-- | emulators/snes9x/files/patch-Makefile.in | 13 |
2 files changed, 23 insertions, 7 deletions
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index ad636aa2c4c5..ff4c7d8fcd25 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -6,15 +6,15 @@ # PORTNAME= snes9x -PORTVERSION= 1.41 +PORTVERSION= 1.41.1 CATEGORIES= emulators MASTER_SITES= http://www.lysator.liu.se/snes9x/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-1-src +DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}-src MAINTAINER= green@FreeBSD.org COMMENT= Super Nintendo Entertainment System(SNES) Emulator -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1-src/snes9x +WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} USE_X_PREFIX= YES GNU_CONFIGURE= YES @@ -25,7 +25,7 @@ MAKE_ARGS= CC="${CC} ${CFLAGS}" CCC="${CXX} ${CXXFLAGS}" \ .include <bsd.port.pre.mk> -.if ${ARCH} == "i386" +.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM) BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm CONFIGURE_ARGS+= --with-assembler .if defined(WITH_MMX) @@ -33,6 +33,13 @@ CONFIGURE_ARGS+= --with-mmx .endif .endif +.if defined(WITH_OPENGL) +CONFIGURE_ARGS+= --with-opengl +SNES9X_BIN= osnes9x +.else +SNES9X_BIN= snes9x +.endif + .if exists(/usr/lib/libusbhid.a) CONFIGURE_ARGS+= --with-joystick .else @@ -40,6 +47,6 @@ CONFIGURE_ARGS+= --without-joystick .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${SNES9X_BIN} ${PREFIX}/bin .include <bsd.port.post.mk> diff --git a/emulators/snes9x/files/patch-Makefile.in b/emulators/snes9x/files/patch-Makefile.in index 7bfff8547dba..6d1a80565347 100644 --- a/emulators/snes9x/files/patch-Makefile.in +++ b/emulators/snes9x/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Wed Aug 13 06:27:16 2003 -+++ Makefile.in Sun Oct 12 14:13:49 2003 +--- Makefile.in.orig Tue Aug 12 17:27:16 2003 ++++ Makefile.in Mon Oct 20 22:23:13 2003 @@ -74,8 +74,6 @@ CHEATS.O cheats2.o data.o unix/unix.o unix/config.o GLOBALS.O \ $(SPC7110OBJ) $(OBC1OBJ) $(SETAOBJ) $(KREEDOBJ) @@ -17,6 +17,15 @@ endif ifdef GLIDE +@@ -112,7 +109,7 @@ + ifdef OPENGL + OPENGLOBJS = unix/opengl.o + OPENGLDEFINES = -DUSE_OPENGL +-OPENGLLIBS = -lGL -lGLU -ldl ++OPENGLLIBS = -lGL -lGLU + OPENGLDEPENDS=use_opengl + OPENGLNO_DEPENDS=no_opengl + else @@ -132,7 +129,7 @@ CC = @CC@ NASM = @NASM@ |