2 files changed, 21 insertions, 12 deletions
diff --git a/externals/grill/xsample/config-pd-linux.txt b/externals/grill/xsample/config-pd-linux.txt
index da33caf7..e89b6e98 100755
--- a/externals/grill/xsample/config-pd-linux.txt
+++ b/externals/grill/xsample/config-pd-linux.txt
@@ -3,7 +3,7 @@
 #
 
 # your c++ compiler (if not g++)
-# CXX=g++
+#CXX=g++
 
 # where does the PD installation reside?
 PD=/usr/local/lib/pd
@@ -29,9 +29,9 @@ HELPDIR=${PD}/doc/5.reference
 
 # additional compiler flags
 # (check whether they fit to your system!)
-UFLAGS=-mcpu=pentiumpro  # gcc 2.95
-# UFLAGS=-mcpu=pentium3 -msse -mfpmath=sse  # gcc 3.2 
+#UFLAGS=-mcpu=pentiumpro -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions -fno-rtti -fno-exceptions # gcc 2.95
+#UFLAGS=-mcpu=pentium3 -msse -mfpmath=sse  -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions -fno-rtti -fno-exceptions # gcc 3.2 
 
 # define to link against shared flext library (flext version >= 0.5.0)
-# FLEXT_SHARED=1
+#FLEXT_SHARED=1
 
diff --git a/externals/grill/xsample/makefile.pd-linux b/externals/grill/xsample/makefile.pd-linux
index 6bc5935a..306c3512 100644
--- a/externals/grill/xsample/makefile.pd-linux
+++ b/externals/grill/xsample/makefile.pd-linux
@@ -12,22 +12,31 @@ CONFIG=config-pd-linux.txt
 
 include ${CONFIG}
 
-FLEXTLIB=$(FLEXTPATH)/flext.a
 
 # compiler stuff
 INCLUDES=$(PDINC) 
 FLAGS=-DFLEXT_SYS=2
-CFLAGS=${UFLAGS} -O6 -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions -fno-rtti -fno-exceptions
-LIBS=m
+CFLAGS=-O2 ${UFLAGS} 
+LIBS= 
 
 ifdef FLEXT_SHARED
-CFLAGS+=-DFLEXT_SHARED
-LDFLAGS+=-Bdynamic
-LINKFLEXT=-lflext
+CFLAGS+=-shared -DFLEXT_SHARED
+LDFLAGS+=-L $(FLEXTPATH)
+LIBFLEXT=-lflext
+
+ifeq ($(CXX),icc)
+LDFLAGS+=-i_dynamic
 else
-LINKFLEXT=$(FLEXTLIB)
+LDFLAGS+=-Wl,-Bdynamic
 endif
 
+else
+
+LIBFLEXT=$(FLEXTPATH)/libflext.a
+
+endif
+
+
 # ----------------------------------------------
 # the rest can stay untouched
 # ----------------------------------------------
@@ -52,7 +61,7 @@ $(TARGDIR)/%.o : $(SRCDIR)/%.cpp
 	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
 $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))  
-	$(CXX) $(LDFLAGS) -shared $^ $(patsubst %,-l%,$(LIBS)) -L$(FLEXTPATH) $(LINKFLEXT) -o $@ 
+	$(CXX) $(LDFLAGS) -shared -o $@ $^ $(LIBFLEXT) $(patsubst %,-l%,$(LIBS)) 
 	strip --strip-unneeded $@
 	chmod 755 $@