From a5f318cbee05c698256bba3430ce0e81f8b1bedb Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Wed, 24 Sep 2003 02:53:28 +0000
Subject:  ""

svn path=/trunk/; revision=1023
---
 externals/grill/flext/config-pd-linux.txt |  1 +
 externals/grill/pool/makefile.pd-linux    | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'externals')

diff --git a/externals/grill/flext/config-pd-linux.txt b/externals/grill/flext/config-pd-linux.txt
index 6962affc..2a07f2eb 100644
--- a/externals/grill/flext/config-pd-linux.txt
+++ b/externals/grill/flext/config-pd-linux.txt
@@ -4,6 +4,7 @@
 
 # your c++ compiler (define only if it's different than g++)
 # CXX=g++
+CXX=icc
 
 # where are the PD header files? (m_pd.h, m_imp.h, g_canvas.h)
 # if it is a system include path (like /usr/local/include) 
diff --git a/externals/grill/pool/makefile.pd-linux b/externals/grill/pool/makefile.pd-linux
index ac028d7a..0e4937c4 100644
--- a/externals/grill/pool/makefile.pd-linux
+++ b/externals/grill/pool/makefile.pd-linux
@@ -16,11 +16,11 @@ include $(CONFIG)
 INCLUDES=$(PDPATH) 
 FLAGS=-DFLEXT_SYS=2 
 CFLAGS=-O2 $(UFLAGS)
-LIBPATH=$(FLEXTPATH)
-LIBS=flext 
+LIBS= 
 
 ifdef FLEXT_SHARED
 CFLAGS+=-shared -DFLEXT_SHARED
+LDFLAGS+=-L $(FLEXTPATH)
 
 ifeq ($(CXX),icc)
 LDFLAGS+=-i_dynamic
@@ -28,6 +28,12 @@ else
 LDFLAGS+=-Wl,-Bdynamic
 endif
 
+FLEXTLIB=-lflext
+
+else
+
+FLEXTLIB=$(FLEXTPATH)/libflext.a
+
 endif
 
 
@@ -48,7 +54,7 @@ TARGET=$(TARGDIR)/$(NAME).pd_linux
 # default target
 all: $(TARGDIR) $(TARGET)
 
-$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(FLEXTLIB) $(CONFIG)
+$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(CONFIG)
 	touch $@
 
 $(TARGDIR):
@@ -58,7 +64,7 @@ $(TARGDIR)/%.o : $(DIR)/%.cpp
 	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
 $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) 
-	$(CXX) -shared $(LDFLAGS) -o $@ $^ $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS))  
+	$(CXX) -shared $(LDFLAGS) -o $@ $^ $(FLEXTLIB)  $(patsubst %,-l%,$(LIBS))  
 	strip --strip-unneeded $@
 	chmod 755 $@
 
-- 
cgit v1.2.1