Attachment 32192 Details for Bug 53302 – patch-aa

patch-aa

patch-aa (text/plain), 4.60 KB, created by Michael A. Dickerson on 2003-06-14 00:40:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael A. Dickerson

Created: 2003-06-14 00:40:12 UTC

Size: 4.60 KB

patch

obsolete

>--- Makefile.orig	Sun Jun  8 22:21:55 2003
>+++ Makefile	Sun Jun  8 22:33:37 2003
>@@ -6,7 +6,7 @@
> #DEBUG = -O
> #DEBUG = -g -DHEXDUMP
> #DEBUG = -g -DHEXDUMP -DNOCRYPTO
>-DEBUG = -O3 -DHEXDUMP
>+#DEBUG = -O3 -DHEXDUMP
>   
> # Installation 
> 
>@@ -50,13 +50,13 @@
> #    of the available flags which follows these declarations.
> #
> #CCFLAGS =  -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN
>-CCFLAGS =  -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER -DHAVE_DEV_RANDOM
>-CC = gcc -Wall # for GNU's gcc compiler
>+#CCFLAGS =  -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER -DHAVE_DEV_RANDOM
>+#CC = gcc -Wall # for GNU's gcc compiler
> #   CELPFLAGS below are tweaked for GCC 2.96 on Intel Pentium.
> #   Comment out if you are using a compiler which doesn't
> #   understand these options.
>-CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops
>-LFLAGS = -lncurses -lm
>+#CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops
>+#LFLAGS = -lncurses -lm
> 
> 
> # If you want to use ALSA instead of OSS, uncomment the following
>@@ -269,8 +269,8 @@
> #    Depending on how your driver handles non-blocking I/O,
> #    you may also have to add -DAUDIO_BLOCKING to the
> #    CCFLAGS line.
>-#CCFLAGS = -DM_LITTLE_ENDIAN
>-#LFLAGS = -lcurses -ltermcap -lcompat -lm
>+CCFLAGS = -DM_LITTLE_ENDIAN -DAUDIO_BLOCKING -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER
>+LFLAGS = -lcurses -ltermcap -lcompat -lm
> 
> #			   Hewlett-Packard
> #		      (courtesy of Marc Kilian)
>@@ -318,7 +318,7 @@
> 
> #   Compiler flags
> 
>-CFLAGS = $(DEBUG) $(PKOPTS) -Iadpcm -Iaes -Icelp -Ilpc -Igsm/inc -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
>+CFLAGS = $(OPTFLAGS) $(DEBUG) $(PKOPTS) -Iadpcm -Iaes -Icelp -Ilpc -I$(LOCALBASE)/include -Igsm/inc -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN)
> 
> BINARIES = sfspeaker sfmike sflaunch sflwld sflwl sfecho sfreflect
> 
>@@ -333,12 +333,12 @@
> SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o tempfile.o ulaw.o usleep.o vatpkt.o vox.o audio_hp.o audio_sgi.o audio_alsa.o common.o
> 
> sfspeaker: $(SPKROBJS) adpcmlib.o aeslib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o xdsub.o 
>-	$(CC) $(SPKROBJS) adpcm/adpcm-u.o aes/aes.a blowfish/libblowfish.a celp/celp.o des/des.a md5/md5.o idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfspeaker
>+	$(CC) $(SPKROBJS) adpcm/adpcm-u.o aes/aes.a blowfish/libblowfish.a celp/celp.o des/des.a -lmd idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfspeaker
> 
> MIKEOBJS = mike.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o tempfile.o ulaw.o usleep.o vatpkt.o xdsub.o audio_hp.o audio_sgi.o audio_alsa.o
> 
> sfmike: $(MIKEOBJS) adpcmlib.o aeslib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o
>-	$(CC) $(MIKEOBJS) adpcm/adpcm-u.o aes/aes.a celp/celp.o des/des.a md5/md5.o idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfmike
>+	$(CC) $(MIKEOBJS) adpcm/adpcm-u.o aes/aes.a celp/celp.o des/des.a -lmd idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfmike
> 
> LAUNCHOBJS = launch.o soundbyte.o usleep.o g711.o
> 
>@@ -358,12 +358,12 @@
> ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o
> 
> sfecho: $(ECHOOBJS) md5lib.o
>-	$(CC) $(ECHOOBJS) md5/md5.o adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfecho
>+	$(CC) $(ECHOOBJS) -lmd adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfecho
> 
> REFLECTOBJS = reflect.o codecs.o html.o g711.o rtpacket.o ulaw.o xdsub.o
> 
> sfreflect: $(REFLECTOBJS) md5lib.o
>-	$(CC) $(REFLECTOBJS) md5/md5.o adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfreflect
>+	$(CC) $(REFLECTOBJS) -lmd adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfreflect
> 
> #	Configure the voice on demand server for the platform's
> #	location of Perl and network constant definitions.
>@@ -412,11 +412,11 @@
> 	echo "BLOWFISH" >libblowfish.o
> 
> libdes.o:
>-	( echo "Building LIBDES library."; cd libdes ; make -f Makefile.sf CC="$(CC) $(CCFLAGS) $(DEBUG)" )
>+	( echo "Building LIBDES library."; cd libdes ; make -f Makefile.sf CC="$(CC) $(OPTFLAGS) $(CCFLAGS) $(DEBUG)" )
> 	echo "LIBDES" >libdes.o
> 
> lpclib.o:
>-	( echo "Building LPC library."; cd lpc ; make CC="$(CC) $(CCFLAGS) $(DEBUG)" )
>+	( echo "Building LPC library."; cd lpc ; make CC="$(CC) $(OPTFLAGS) $(CCFLAGS) $(DEBUG)" )
> 	echo "LPC" >lpclib.o
> 
> lpc10lib.o:

Actions: View

Attachments on bug 53302: 32191 | 32192