From 13fd5a7fca5f329e852cc68c613f1421dbf7e7ea Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 23 May 2003 12:37:58 +0000 Subject: [PATCH] do it the standard way (tm) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10160 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 + libao2/Makefile | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/configure b/configure index ec657d3cf8..853bd59254 100755 --- a/configure +++ b/configure @@ -2422,6 +2422,7 @@ EOF _macosx=yes _macosx_frameworks="-framework Carbon -framework QuickTime -framework CoreAudio" _def_macosx='#define MACOSX 1' + _aosrc="$_aosrc ao_macosx.c" _aomodules="macosx $_aomodules" else _macosx=no diff --git a/libao2/Makefile b/libao2/Makefile index 33cc159465..2b1eb3f6b1 100644 --- a/libao2/Makefile +++ b/libao2/Makefile @@ -1,15 +1,9 @@ - include config.mak LIBNAME = libao2.a -# TODO: moveout ao_sdl.c so it's only used when SDL is detected SRCS=afmt.c audio_out.c ao_mpegpes.c ao_null.c ao_pcm.c ao_plugin.c pl_delay.c pl_format.c pl_surround.c remez.c pl_resample.c pl_volume.c pl_extrastereo.c pl_volnorm.c pl_eq.c $(OPTIONAL_SRCS) -ifeq ($(MACOSX),yes) -SRCS += ao_macosx.c -endif - OBJS=$(SRCS:.c=.o) CFLAGS = $(OPTFLAGS) -I. -I.. $(ARTS_INC) $(ESD_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DVB_INC) @@ -43,4 +37,3 @@ depend: ifneq ($(wildcard .depend),) include .depend endif -