From e2f25a59b9c0fd379bdb7e9bb1085809d2126482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Mon, 22 Jun 2009 17:08:49 +0000 Subject: applied patch #2799414 svn path=/trunk/externals/iem/iem_ambi/; revision=11807 --- src/makefile | 52 +--------------------------------------------------- src/makefile_linux | 8 +++++--- 2 files changed, 6 insertions(+), 54 deletions(-) diff --git a/src/makefile b/src/makefile index 5008356..8795928 100644 --- a/src/makefile +++ b/src/makefile @@ -1,52 +1,2 @@ -current: all - -.SUFFIXES: .pd_linux - -INCLUDE = -I. -I/usr/local/src/pd/src - -LDFLAGS = -export-dynamic -shared -LIB = -ldl -lm -lpthread - -#select either the DBG and OPT compiler flags below: - -CFLAGS = -DPD -DUNIX -W -Wno-unused \ - -Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing \ - -DDL_OPEN -fPIC - -SYSTEM = $(shell uname -m) - -# the sources - -SRC = ambi_decode.c \ - ambi_decode2.c \ - ambi_decode3.c \ - ambi_decode_cube.c \ - ambi_encode.c \ - ambi_rot.c \ - iem_ambi.c - -TARGET = iem_ambi.pd_linux - - -OBJ = $(SRC:.c=.o) - -# -# ------------------ targets ------------------------------------ -# - -clean: - rm ..\$(TARGET) - rm *.o - -all: $(OBJ) - @echo :: $(OBJ) - $(LD) $(LDFLAGS) -o $(TARGET) *.o $(LIB) - strip --strip-unneeded $(TARGET) - mv $(TARGET) .. - -$(OBJ) : %.o : %.c - $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c - - - +include makefile_linux diff --git a/src/makefile_linux b/src/makefile_linux index 2bf5f36..f96e56d 100644 --- a/src/makefile_linux +++ b/src/makefile_linux @@ -2,15 +2,17 @@ current: all .SUFFIXES: .pd_linux -INCLUDE = -I. -I/usr/local/src/pd/src +PDSOURCE?=/usr/local/src/pd/src +INCLUDE = -I. -I$(PDSOURCE) LDFLAGS = -export-dynamic -shared LIB = -ldl -lm -lpthread #select either the DBG and OPT compiler flags below: -CFLAGS = -DPD -DUNIX -W -Werror -Wno-unused \ - -Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing \ +CFLAGS = -DPD -DUNIX \ + -W -Wno-unused -Wno-parentheses -Wno-switch \ + -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing \ -DDL_OPEN -fPIC SYSTEM = $(shell uname -m) -- cgit v1.2.1