""

svn path=/trunk/; revision=1826

9 files changed, 31 insertions, 29 deletions

diff --git a/externals/grill/pool/config-pd-darwin.txt b/externals/grill/pool/config-pd-darwin.txt
index 4e8cbb45..62f4a9e8 100644
--- a/externals/grill/pool/config-pd-darwin.txt
+++ b/externals/grill/pool/config-pd-darwin.txt
@@ -27,4 +27,7 @@ INSTPATH=/usr/local/lib/pd/extra
 # (check if they match your system!)
 UFLAGS=-malign-power -maltivec
 
+# use shared flext library
+FLEXT_SHARED=1
+
 
diff --git a/externals/grill/pool/config-pd-mingw.txt b/externals/grill/pool/config-pd-mingw.txt
index b15de586..18d6800e 100755
--- a/externals/grill/pool/config-pd-mingw.txt
+++ b/externals/grill/pool/config-pd-mingw.txt
@@ -22,4 +22,3 @@ UFLAGS=
 
 # define for shared build
 FLEXT_SHARED=1
-
diff --git a/externals/grill/pool/makefile.pd-darwin b/externals/grill/pool/makefile.pd-darwin
index b602933a..248e4bf8 100644
--- a/externals/grill/pool/makefile.pd-darwin
+++ b/externals/grill/pool/makefile.pd-darwin
@@ -12,16 +12,25 @@ CONFIG=config-pd-darwin.txt
 
 include $(CONFIG)
 
-FLEXTLIB=$(FLEXTPATH)/flext.a
-
 # compiler+linker stuff	
 INCLUDES=$(PDPATH) 
 LIBPATH=
 FLAGS=-DFLEXT_SYS=2 
-CFLAGS=-O6 ${UFLAGS} -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes
+CFLAGS=-O2 ${UFLAGS} -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes
 LIBS=m
-LDFLAGS=-bundle -bundle_loader $(PD)
 FRAMEWORKS=Carbon
+LDFLAGS+=-bundle -bundle_loader $(PD)
+
+ifdef FLEXT_SHARED
+CFLAGS+=-dynamic -DFLEXT_SHARED
+LDFLAGS+=-dynamic -L$(FLEXTPATH)
+FLEXTLIB=-lflext
+
+else
+
+FLEXTLIB=$(FLEXTPATH)/libflext.a
+
+endif
 
 
 # ---------------------------------------------
@@ -36,7 +45,7 @@ TARGET=$(TARGDIR)/$(NAME).pd_darwin
 # default target
 all: $(TARGDIR) $(TARGET)
 
-$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTLIB) $(CONFIG)
+$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(CONFIG)
 	touch $@
 
 $(TARGDIR):
@@ -45,8 +54,8 @@ $(TARGDIR):
 $(TARGDIR)/%.o : $(SRCDIR)/%.cpp
 	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
 
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) 
-	$(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@ 
+$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) 
+	$(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) $(FLEXTLIB) -o $@ 
 	chmod 755 $@
 
 $(INSTPATH):
@@ -56,8 +65,8 @@ install:: $(INSTPATH)
 
 install:: $(TARGET)
 	cp $^ $(INSTPATH)
-#	chown root.root  $(patsubst %,$(INSTPATH)/%,$(notdir $^))
-#	chmod 755 $(patsubst %,$(INSTPATH)/%,$(notdir $^))
+	chmod 755 $(patsubst %,$(INSTPATH)/%,$(notdir $^))
+	chown root $(patsubst %,$(INSTPATH)/%,$(notdir $^))
 
 .PHONY: clean
 clean:
diff --git a/externals/grill/pool/makefile.pd-mingw b/externals/grill/pool/makefile.pd-mingw
index ff2d2e55..c8d3a784 100755
--- a/externals/grill/pool/makefile.pd-mingw
+++ b/externals/grill/pool/makefile.pd-mingw
@@ -57,12 +57,3 @@ install:: $(TARGET)
 .PHONY: clean
 clean:
 	rm -f $(TARGDIR)/*.o $(TARGET)
-	
-
-
-
-
-
-
-
-
diff --git a/externals/grill/pool/pool.cw b/externals/grill/pool/pool.cw
index 8f88ff0c..57c4c1a1 100755
--- a/externals/grill/pool/pool.cw
+++ b/externals/grill/pool/pool.cw
diff --git a/externals/grill/pool/pool.help b/externals/grill/pool/pool.help
index 9ec9715f..21dd9838 100755
--- a/externals/grill/pool/pool.help
+++ b/externals/grill/pool/pool.help
diff --git a/externals/grill/pool/pool.vcproj b/externals/grill/pool/pool.vcproj
index 45d0b3d1..606e39e4 100644
--- a/externals/grill/pool/pool.vcproj
+++ b/externals/grill/pool/pool.vcproj
@@ -176,11 +176,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib"
+				AdditionalDependencies="maxapi.lib  maxaudio.lib"
 				OutputFile="max-msvc/pool.mxe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\release&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\release&quot;,f:\prog\max\flext\max-msvc"
+				AdditionalLibraryDirectories="&quot;F:\prog\audio\maxwinsdk\c74support\max-includes&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes&quot;;&quot;f:\prog\max\flext\max-msvc&quot;"
 				ProgramDatabaseFile=".\pd-msvc/r/pool.pdb"
 				ImportLibrary=".\max-msvc/r/pool.lib"
 				TargetMachine="1"/>
diff --git a/externals/grill/pool/source/pool.cpp b/externals/grill/pool/source/pool.cpp
index bda4407a..fd4b4a83 100644
--- a/externals/grill/pool/source/pool.cpp
+++ b/externals/grill/pool/source/pool.cpp
@@ -623,7 +623,7 @@ static bool gettag(istream &is,xmltag &tag)
                 if(c == '>') {
                     // if third character is > then check also the former two
                     int i;
-                    for(i = 0; i < 2 && cmp[(ic+i)%2] == commend[i]; ++i);
+                    for(i = 0; i < 2 && cmp[(ic+i)%2] == commend[i]; ++i) {}
                     if(i == 2) break; // match: comment end found!
                 }
                 else
@@ -647,17 +647,17 @@ static bool gettag(istream &is,xmltag &tag)
 
             char *tb = tmp,*te = t-1,*tf;
 
-            for(; isspace(*tb); ++tb);
+            for(; isspace(*tb); ++tb) {}
             if(*tb == '/') { 
                 // slash at the beginning -> end tag
                 tag.type = xmltag::t_end;
-                for(++tb; isspace(*tb); ++tb);
+                for(++tb; isspace(*tb); ++tb) {}
             }
             else {
-                for(; isspace(*te); --te);
+                for(; isspace(*te); --te) {}
                 if(*te == '/') { 
                     // slash at the end -> empty tag
-                    for(--te; isspace(*te); --te);
+                    for(--te; isspace(*te); --te) {}
                     tag.type = xmltag::t_empty;
                 }
                 else 
@@ -666,7 +666,7 @@ static bool gettag(istream &is,xmltag &tag)
             }
 
             // copy tag text without slashes
-            for(tf = tb; tf <= te && *tf && !isspace(*tf); ++tf);
+            for(tf = tb; tf <= te && *tf && !isspace(*tf); ++tf) {}
             tag.tag.assign(tb,tf-tb);
             while(isspace(*tf)) ++tf;
             tag.attr.assign(tf,te-tf+1);
diff --git a/externals/grill/pool/source/pool.h b/externals/grill/pool/source/pool.h
index 64445c06..fb1c290e 100644
--- a/externals/grill/pool/source/pool.h
+++ b/externals/grill/pool/source/pool.h
@@ -15,8 +15,8 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 
 #include <flext.h>
 
-#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 405)
-#error You need at least flext version 0.4.5
+#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406)
+#error You need at least flext version 0.4.6
 #endif
 
 #include <iostream>