diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2005-09-03 18:16:07 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2005-09-03 18:16:07 +0000 |
| commit | c88e1fdbac2970bd6b8990c8c940e78994d2f4d4 (patch) | |
| tree | 520e30a95a905e2eeb962715d419ef6208442ccb /emulators/xmame | |
| parent | afd601fd94b45240a72988a5ea10351c178b7ec2 (diff) | |
| download | pkgsrc-c88e1fdbac2970bd6b8990c8c940e78994d2f4d4.tar.gz | |
* Remove compile warnings with gcc3.
* Use PKG_OPTIONS_OPTIONAL_GROUPS for sdl and opengl options.
Diffstat (limited to 'emulators/xmame')
| -rw-r--r-- | emulators/xmame/Makefile | 9 | ||||
| -rw-r--r-- | emulators/xmame/options.mk | 13 |
2 files changed, 14 insertions, 8 deletions
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index d9e517c79c1..a8cb0a93135 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.133 2005/08/25 19:54:22 kristerw Exp $ +# $NetBSD: Makefile,v 1.134 2005/09/03 18:16:07 xtraeme Exp $ # DISTNAME= xmame-0.99 @@ -113,6 +113,13 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmame ${INSTALL_DATA} ${WRKSRC}/doc/xmame-doc.txt ${PREFIX}/share/doc/xmame +.if !empty(CC_VERSION:Mgcc-3*) +SUBST_CLASSES= pragma +SUBST_STAGE.pragma= pre-configure +SUBST_FILES.pragma= src/*.h +SUBST_SED.pragma= -e "s|\#pragma once||g" +.endif + .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/emulators/xmame/options.mk b/emulators/xmame/options.mk index 94061a9e39d..459080f46e6 100644 --- a/emulators/xmame/options.mk +++ b/emulators/xmame/options.mk @@ -1,8 +1,11 @@ -# $NetBSD: options.mk,v 1.2 2004/11/08 14:54:18 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2005/09/03 18:16:07 xtraeme Exp $ # -PKG_OPTIONS_VAR= PKG_OPTIONS.xmame -PKG_SUPPORTED_OPTIONS= sdl opengl esound +PKG_OPTIONS_VAR= PKG_OPTIONS.xmame +PKG_OPTIONS_OPTIONAL_GROUPS= video +PKG_OPTIONS_GROUP.video= sdl opengl +PKG_SUPPORTED_OPTIONS= esound + .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Msdl) @@ -15,10 +18,6 @@ MAME_DISP_METHOD?= xgl MAME_DISP_METHOD?= x11 .endif -.if !empty(PKG_OPTIONS:Msdl) && !empty(PKG_OPTIONS:Mopengl) -PKG_SKIP_REASON+= "Only one display method is allowed." -.endif - .if !empty(PKG_OPTIONS:Mesound) MAKE_FLAGS+= SOUND_ESOUND=1 .include "../../audio/esound/buildlink3.mk" |