diff options
| author | adam <adam> | 2006-06-15 09:45:05 +0000 |
|---|---|---|
| committer | adam <adam> | 2006-06-15 09:45:05 +0000 |
| commit | a064260f54ec0c6038e14a467b718e63f2c3de18 (patch) | |
| tree | 24bb259d481043d61f7ce4abddf94f8e53fdc7e3 /devel/SDL/Makefile | |
| parent | 57f3081cc7b79ae1fd87547f77ad6a77bf5a0cdb (diff) | |
| download | pkgsrc-a064260f54ec0c6038e14a467b718e63f2c3de18.tar.gz | |
Make aalib an option, enabled by default
Diffstat (limited to 'devel/SDL/Makefile')
| -rw-r--r-- | devel/SDL/Makefile | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 22328234cfc..493992f8cd5 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2006/06/12 16:20:44 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2006/06/15 09:45:05 adam Exp $ DISTNAME= SDL-1.2.10 CATEGORIES= devel games @@ -27,7 +27,6 @@ NASMFLAGS_a.out= -f aoutb .endif CONFIGURE_ARGS+= --enable-dlopen -CONFIGURE_ARGS+= --enable-video-aalib CONFIGURE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}" MAKE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}" @@ -46,13 +45,6 @@ COCOA_DIRS+= /System /Library /Developer BUILDLINK_PASSTHRU_DIRS+= ${dir} . endif . endfor - -# XXX: still necessary after 1.2.10 update? -SUBST_CLASSES+= links -SUBST_MESSAGE.links= Fixing linking command. -SUBST_STAGE.links= pre-configure -SUBST_FILES.links= src/Makefile.in -SUBST_SED.links= -e 's,tag=CC --mode=link,tag=CXX --mode=link,g' .endif .include "../../mk/oss.buildlink3.mk" @@ -65,13 +57,13 @@ MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:Q} .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .endif -.include "../../graphics/aalib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth" # Let SDL know that we do not have native pthreads and are using GNU pth. -CONFIGURE_ARGS+= --disable-pthreads -CONFIGURE_ARGS+= --enable-pth +CONFIGURE_ARGS+= --disable-pthreads +CONFIGURE_ARGS+= --enable-pth .endif +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |