diff options
| author | Mike Heffner <mikeh@FreeBSD.org> | 2002-07-04 08:09:05 +0000 |
|---|---|---|
| committer | Mike Heffner <mikeh@FreeBSD.org> | 2002-07-04 08:09:05 +0000 |
| commit | db59d15a8ececbddd134ccfee64ce13d9cfa3919 (patch) | |
| tree | 4618426a17ffccb60420d694accab0ede2b37738 /audio/dap/files/patch-ae | |
| parent | Update to version 9.3b. (diff) | |
Prepare for xforms update.
Notes
Notes:
svn path=/head/; revision=62419
Diffstat (limited to '')
| -rw-r--r-- | audio/dap/files/patch-ae | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/audio/dap/files/patch-ae b/audio/dap/files/patch-ae index f18dd87302dc..c50786623061 100644 --- a/audio/dap/files/patch-ae +++ b/audio/dap/files/patch-ae @@ -1,5 +1,5 @@ ---- main/Makefile.linux.orig Sun Jul 1 13:42:55 2001 -+++ main/Makefile.linux Sun Jul 1 13:42:31 2001 +--- main/Makefile.linux.orig Tue Nov 7 18:16:54 2000 ++++ main/Makefile.linux Tue Jul 2 02:16:04 2002 @@ -1,5 +1,5 @@ -CC = gcc -CXX = g++ @@ -8,21 +8,23 @@ FORMS = ../../xforms/FORMS SOUND = ../sound SPKIT = ../spkit -@@ -8,13 +8,13 @@ +@@ -8,12 +8,15 @@ AUDIOF = ../libaudiofile BACKDIR = ../bak/main HOMEDIR = $(HOME) -X11DIR = /usr/X11R6 +-INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include +X11DIR = ${X11BASE} - INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include ++.if exists(${X11BASE}/include/X11/forms.h) ++XFORMSINC = -I${X11BASE}/include/X11 ++.endif ++INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include ${XFORMSINC} LIBDIR = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused +CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused DEBUG = -g3 -OPTIM = -O1 --LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm +OPTIM = ${CXXFLAGS} -+LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lxforms -lXpm -lX11 -lm + LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm PROGS = DAP - OBJS = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \ |