diff options
| author | Steve M. Robbins <smr@debian.org> | 2012-07-18 03:57:02 +0200 |
|---|---|---|
| committer | Steve M. Robbins <smr@debian.org> | 2012-07-18 03:57:02 +0200 |
| commit | 40d01c7024c55ccb31bfd182016da9982ee62f7c (patch) | |
| tree | faac4bf29367189f0e4fc9762ca373a29d031ec6 /sys | |
| parent | 23b560a4986c726e1fc940b2848b54f3be8e4323 (diff) | |
use-system-liblo
===================================================================
Gbp-Pq: Name use-system-liblo.patch
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/unix/nonalsa/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/unix/nonalsa/Makefile b/sys/unix/nonalsa/Makefile index 3b94fe0..6399b42 100644 --- a/sys/unix/nonalsa/Makefile +++ b/sys/unix/nonalsa/Makefile @@ -14,8 +14,7 @@ NY = ny OPT = -O2 # OPT = -g -m32 -EVERYTHING = $(NY) runtime/system.lsp jnyqide/jNyqIDE.jar \ - bin/ser-to-osc bin/test-client +EVERYTHING = $(NY) runtime/system.lsp jnyqide/jNyqIDE.jar CURRENT = $(EVERYTHING) @@ -52,12 +51,12 @@ jnyqide/jNyqIDE.jar: $(JAVASRC) # Keeping portaudio and libsndfile sources local to nyquist INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Iffts/src \ -Inyqstk/include -Inyqstk -Iportaudio/include -Iportaudio/src/common \ - -Iportaudio/src/os/unix \ - -Iliblo + -Iportaudio/src/os/unix + # system dependent stuff for nonalsa: -AUDIOLIBS = -lsndfile +AUDIOLIBS = -lsndfile -llo CC = gcc @@ -75,7 +74,7 @@ CFLAGS = -DOSC -DCMTSTUFF $(OPT) $(INCL) \ LN = g++ AR = ar # to enable command line editing, insert -lreadline -lcurses -LFLAGS = $(LIBPA_PATH)/libportaudio.a $(LIBLO_PATH)/liblo.a $(AUDIOLIBS) -lm -lpthread -lrt +LFLAGS = $(LIBPA_PATH)/libportaudio.a $(AUDIOLIBS) -lm -lpthread -lrt TAGS: find . ( -name @@ -276,7 +275,7 @@ portaudio/Makefile: $(LIBPA_PATH)/libportaudio.a: portaudio/Makefile cd portaudio; make -$(NY): $(OBJECTS) $(LIBPA_PATH)/libportaudio.a $(LIBLO_PATH)/liblo.a +$(NY): $(OBJECTS) $(LIBPA_PATH)/libportaudio.a $(LN) $(OBJECTS) $(LFLAGS) -o $(NY) # copy appropriate system.lsp and make it read-only; |