aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/flext
diff options
context:
space:
mode:
Diffstat (limited to 'externals/grill/flext')
-rw-r--r--externals/grill/flext/config-pd-cygwin.txt3
-rw-r--r--externals/grill/flext/config-pd-darwin.txt4
-rw-r--r--externals/grill/flext/config-pd-linux.txt1
-rw-r--r--externals/grill/flext/flext.cwbin205457 -> 205457 bytes
-rwxr-xr-xexternals/grill/flext/flext.pbproj/project.pbxproj406
-rw-r--r--externals/grill/flext/makefile.pd-cygwin25
-rw-r--r--externals/grill/flext/makefile.pd-darwin53
-rw-r--r--externals/grill/flext/makefile.pd-linux33
-rw-r--r--externals/grill/flext/readme.txt5
-rw-r--r--externals/grill/flext/source/flattr.cpp4
-rw-r--r--externals/grill/flext/source/flext.cpp5
-rwxr-xr-xexternals/grill/flext/source/flitem.cpp2
-rwxr-xr-xexternals/grill/flext/source/flprefix.h5
-rw-r--r--externals/grill/flext/source/flsupport.cpp6
-rw-r--r--externals/grill/flext/source/flsupport.h2
15 files changed, 494 insertions, 60 deletions
diff --git a/externals/grill/flext/config-pd-cygwin.txt b/externals/grill/flext/config-pd-cygwin.txt
index ede2a3d9..491c7ffc 100644
--- a/externals/grill/flext/config-pd-cygwin.txt
+++ b/externals/grill/flext/config-pd-cygwin.txt
@@ -20,3 +20,6 @@ TARGDIR=./pd-cygwin
# (leave blank to omit installation)
INSTDIR=${PDPATH}/flext
+# additional compiler flags
+# (check if they fit for your system!)
+# UFLAGS=-mcpu=pentium3 -msse \ No newline at end of file
diff --git a/externals/grill/flext/config-pd-darwin.txt b/externals/grill/flext/config-pd-darwin.txt
index 71d746a1..a07cf62f 100644
--- a/externals/grill/flext/config-pd-darwin.txt
+++ b/externals/grill/flext/config-pd-darwin.txt
@@ -20,4 +20,6 @@ TARGDIR=./pd-darwin
# (leave blank to omit installation)
INSTDIR=/usr/local/pd/flext
-
+# additional compiler flags
+# (check if they fit for your system!)
+# UFLAGS=-maltivec \ No newline at end of file
diff --git a/externals/grill/flext/config-pd-linux.txt b/externals/grill/flext/config-pd-linux.txt
index d5060e1b..ad27fc35 100644
--- a/externals/grill/flext/config-pd-linux.txt
+++ b/externals/grill/flext/config-pd-linux.txt
@@ -26,5 +26,6 @@ TARGDIR=./pd-linux
INSTDIR=/usr/local/lib/pd/flext
# additional compiler flags
+# (check if they fit for your system!)
UFLAGS= -mcpu=pentiumpro # gcc 2.95
# UFLAGS= -mcpu=pentium3 -msse # gcc 3.2
diff --git a/externals/grill/flext/flext.cw b/externals/grill/flext/flext.cw
index 50331cb0..982353fe 100644
--- a/externals/grill/flext/flext.cw
+++ b/externals/grill/flext/flext.cw
Binary files differ
diff --git a/externals/grill/flext/flext.pbproj/project.pbxproj b/externals/grill/flext/flext.pbproj/project.pbxproj
index 6665b953..2f232c50 100755
--- a/externals/grill/flext/flext.pbproj/project.pbxproj
+++ b/externals/grill/flext/flext.pbproj/project.pbxproj
@@ -112,6 +112,14 @@
F55CED950383E50201A80AC9,
F55CED960383E50201A80AC9,
F55CED970383E50201A80AC9,
+ F504A66B03CE39F501A80AC9,
+ F504A66C03CE39F501A80AC9,
+ F504A66D03CE39F501A80AC9,
+ F504A66E03CE39F501A80AC9,
+ F504A66F03CE39F501A80AC9,
+ F504A67103CE39F501A80AC9,
+ F504A67203CE39F501A80AC9,
+ F504A67303CE39F501A80AC9,
);
isa = PBXGroup;
name = Source;
@@ -128,6 +136,354 @@
//F52
//F53
//F54
+ F504A66B03CE39F501A80AC9 = {
+ isa = PBXFileReference;
+ name = flatom_app.cpp;
+ path = source/flatom_app.cpp;
+ refType = 4;
+ };
+ F504A66C03CE39F501A80AC9 = {
+ isa = PBXFileReference;
+ name = flatom_part.cpp;
+ path = source/flatom_part.cpp;
+ refType = 4;
+ };
+ F504A66D03CE39F501A80AC9 = {
+ isa = PBXFileReference;
+ name = flitem.cpp;
+ path = source/flitem.cpp;
+ refType = 4;
+ };
+ F504A66E03CE39F501A80AC9 = {
+ isa = PBXFileReference;
+ name = flmeth.cpp;
+ path = source/flmeth.cpp;
+ refType = 4;
+ };
+ F504A66F03CE39F501A80AC9 = {
+ isa = PBXFileReference;
+ name = flmsg.cpp;
+ path = source/flmsg.cpp;
+ refType = 4;
+ };
+ F504A67003CE39F501A80AC9 = {
+ isa = PBXFileReference;
+ name = flprefix.h;
+ path = source/flprefix.h;
+ refType = 4;
+ };
+ F504A67103CE39F501A80AC9 = {
+ isa = PBXFileReference;
+ name = flproxy.cpp;
+ path = source/flproxy.cpp;
+ refType = 4;
+ };
+ F504A67203CE39F501A80AC9 = {
+ isa = PBXFileReference;
+ name = flqueue.cpp;
+ path = source/flqueue.cpp;
+ refType = 4;
+ };
+ F504A67303CE39F501A80AC9 = {
+ isa = PBXFileReference;
+ name = flstk.cpp;
+ path = source/flstk.cpp;
+ refType = 4;
+ };
+ F504A67403CE39F501A80AC9 = {
+ isa = PBXFileReference;
+ name = flstk.h;
+ path = source/flstk.h;
+ refType = 4;
+ };
+ F504A67503CE3BDE01A80AC9 = {
+ fileRef = F504A66B03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A67603CE3BDF01A80AC9 = {
+ fileRef = F504A66C03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A67703CE3BDF01A80AC9 = {
+ fileRef = F504A66D03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A67803CE3BE101A80AC9 = {
+ fileRef = F504A66E03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A67903CE3BE101A80AC9 = {
+ fileRef = F504A66F03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A67A03CE3BE201A80AC9 = {
+ fileRef = F504A67103CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A67B03CE3BE301A80AC9 = {
+ fileRef = F504A67203CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A67C03CE3BE801A80AC9 = {
+ fileRef = F504A66B03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A67D03CE3BE901A80AC9 = {
+ fileRef = F504A66C03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A67E03CE3BE901A80AC9 = {
+ fileRef = F504A66D03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A67F03CE3BEA01A80AC9 = {
+ fileRef = F504A66E03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68003CE3BEA01A80AC9 = {
+ fileRef = F504A66F03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68103CE3BEB01A80AC9 = {
+ fileRef = F504A67103CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68203CE3BEB01A80AC9 = {
+ fileRef = F504A67203CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68303CE3BF001A80AC9 = {
+ fileRef = F504A66B03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68403CE3BF001A80AC9 = {
+ fileRef = F504A66C03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68503CE3BF101A80AC9 = {
+ fileRef = F504A66D03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68603CE3BF101A80AC9 = {
+ fileRef = F504A66E03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68703CE3BF201A80AC9 = {
+ fileRef = F504A66F03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68803CE3BF201A80AC9 = {
+ fileRef = F504A67103CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68903CE3BF301A80AC9 = {
+ fileRef = F504A67203CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68A03CE3BF801A80AC9 = {
+ fileRef = F504A67003CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68B03CE3BFF01A80AC9 = {
+ fileRef = F504A67003CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68C03CE3C0601A80AC9 = {
+ fileRef = F504A67003CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68D03CE3C1101A80AC9 = {
+ fileRef = F504A67003CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68E03CE3C1301A80AC9 = {
+ fileRef = F504A66B03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A68F03CE3C1301A80AC9 = {
+ fileRef = F504A66C03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69003CE3C1401A80AC9 = {
+ fileRef = F504A66D03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69103CE3C1501A80AC9 = {
+ fileRef = F504A66E03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69203CE3C1501A80AC9 = {
+ fileRef = F504A66F03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69303CE3C1601A80AC9 = {
+ fileRef = F504A67103CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69403CE3C1701A80AC9 = {
+ fileRef = F504A67203CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69503CE3C1A01A80AC9 = {
+ fileRef = F504A67003CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69603CE3C1C01A80AC9 = {
+ fileRef = F504A66B03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69703CE3C1D01A80AC9 = {
+ fileRef = F504A66C03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69803CE3C1D01A80AC9 = {
+ fileRef = F504A66D03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69903CE3C1E01A80AC9 = {
+ fileRef = F504A66E03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69A03CE3C1E01A80AC9 = {
+ fileRef = F504A66F03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69B03CE3C1F01A80AC9 = {
+ fileRef = F504A67103CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69C03CE3C2001A80AC9 = {
+ fileRef = F504A67203CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69D03CE3C2301A80AC9 = {
+ fileRef = F504A67003CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69E03CE3C2501A80AC9 = {
+ fileRef = F504A66B03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A69F03CE3C2501A80AC9 = {
+ fileRef = F504A66C03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A6A003CE3C2701A80AC9 = {
+ fileRef = F504A66D03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A6A103CE3C2701A80AC9 = {
+ fileRef = F504A66E03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A6A203CE3C2801A80AC9 = {
+ fileRef = F504A66F03CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A6A303CE3C2901A80AC9 = {
+ fileRef = F504A67103CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F504A6A403CE3C2901A80AC9 = {
+ fileRef = F504A67203CE39F501A80AC9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F5128F2503864E5501A80AC9 = {
buildRules = (
);
@@ -298,6 +654,7 @@
};
F55CEDB50383E50D01A80AC9 = {
children = (
+ F504A67003CE39F501A80AC9,
F55CED7F0383E50201A80AC9,
F55CED810383E50201A80AC9,
F55CED860383E50201A80AC9,
@@ -309,6 +666,7 @@
F55CED910383E50201A80AC9,
F55CED920383E50201A80AC9,
F55CED940383E50201A80AC9,
+ F504A67403CE39F501A80AC9,
);
isa = PBXGroup;
name = Headers;
@@ -328,6 +686,7 @@
F55CEDD90383E79901A80AC9,
F55CEDDB0383E79B01A80AC9,
F55CEDDC0383E79B01A80AC9,
+ F504A68B03CE3BFF01A80AC9,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -348,6 +707,13 @@
F55CEDCF0383E79001A80AC9,
F55CEDD00383E79101A80AC9,
F55CEDD10383E79101A80AC9,
+ F504A67503CE3BDE01A80AC9,
+ F504A67603CE3BDF01A80AC9,
+ F504A67703CE3BDF01A80AC9,
+ F504A67803CE3BE101A80AC9,
+ F504A67903CE3BE101A80AC9,
+ F504A67A03CE3BE201A80AC9,
+ F504A67B03CE3BE301A80AC9,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -590,6 +956,7 @@
F55CEDFF0383F55201A80AC9,
F55CEE000383F55201A80AC9,
F55CEE010383F55201A80AC9,
+ F504A68C03CE3C0601A80AC9,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -670,6 +1037,13 @@
F55CEE0D0383F55201A80AC9,
F55CEE0E0383F55201A80AC9,
F55CEE0F0383F55201A80AC9,
+ F504A67C03CE3BE801A80AC9,
+ F504A67D03CE3BE901A80AC9,
+ F504A67E03CE3BE901A80AC9,
+ F504A67F03CE3BEA01A80AC9,
+ F504A68003CE3BEA01A80AC9,
+ F504A68103CE3BEB01A80AC9,
+ F504A68203CE3BEB01A80AC9,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -817,6 +1191,7 @@
F55CEE1C0383F57A01A80AC9,
F55CEE1D0383F57A01A80AC9,
F55CEE1E0383F57A01A80AC9,
+ F504A68A03CE3BF801A80AC9,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -897,6 +1272,13 @@
F55CEE2A0383F57A01A80AC9,
F55CEE2B0383F57A01A80AC9,
F55CEE2C0383F57A01A80AC9,
+ F504A68303CE3BF001A80AC9,
+ F504A68403CE3BF001A80AC9,
+ F504A68503CE3BF101A80AC9,
+ F504A68603CE3BF101A80AC9,
+ F504A68703CE3BF201A80AC9,
+ F504A68803CE3BF201A80AC9,
+ F504A68903CE3BF301A80AC9,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1044,6 +1426,7 @@
F55CEE390383F59B01A80AC9,
F55CEE3A0383F59B01A80AC9,
F55CEE3B0383F59B01A80AC9,
+ F504A68D03CE3C1101A80AC9,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1124,6 +1507,13 @@
F55CEE470383F59B01A80AC9,
F55CEE480383F59B01A80AC9,
F55CEE490383F59B01A80AC9,
+ F504A68E03CE3C1301A80AC9,
+ F504A68F03CE3C1301A80AC9,
+ F504A69003CE3C1401A80AC9,
+ F504A69103CE3C1501A80AC9,
+ F504A69203CE3C1501A80AC9,
+ F504A69303CE3C1601A80AC9,
+ F504A69403CE3C1701A80AC9,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1308,6 +1698,7 @@
F59A5F9A0386DF3201A80AC9,
F59A5F9B0386DF3201A80AC9,
F59A5F9C0386DF3201A80AC9,
+ F504A69D03CE3C2301A80AC9,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1388,6 +1779,13 @@
F59A5FA80386DF3201A80AC9,
F59A5FA90386DF3201A80AC9,
F59A5FAA0386DF3201A80AC9,
+ F504A69E03CE3C2501A80AC9,
+ F504A69F03CE3C2501A80AC9,
+ F504A6A003CE3C2701A80AC9,
+ F504A6A103CE3C2701A80AC9,
+ F504A6A203CE3C2801A80AC9,
+ F504A6A303CE3C2901A80AC9,
+ F504A6A403CE3C2901A80AC9,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1534,6 +1932,7 @@
F5AAF61F038683E801A80AC9,
F5AAF620038683E801A80AC9,
F5AAF621038683E801A80AC9,
+ F504A69503CE3C1A01A80AC9,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1614,6 +2013,13 @@
F5AAF62D038683E801A80AC9,
F5AAF62E038683E801A80AC9,
F5AAF62F038683E801A80AC9,
+ F504A69603CE3C1C01A80AC9,
+ F504A69703CE3C1D01A80AC9,
+ F504A69803CE3C1D01A80AC9,
+ F504A69903CE3C1E01A80AC9,
+ F504A69A03CE3C1E01A80AC9,
+ F504A69B03CE3C1F01A80AC9,
+ F504A69C03CE3C2001A80AC9,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
diff --git a/externals/grill/flext/makefile.pd-cygwin b/externals/grill/flext/makefile.pd-cygwin
index 42763c20..60cfa4f5 100644
--- a/externals/grill/flext/makefile.pd-cygwin
+++ b/externals/grill/flext/makefile.pd-cygwin
@@ -18,9 +18,9 @@ include $(CONFIG)
# compiler+linker stuff
INCLUDES=$(PDPATH)/src
-FLAGS=-DFLEXT_SYS=2
-CFLAGS=-O6 -fno-exceptions
-CFLAGS+=-mcpu=pentium3 -msse # cygwin gcc 3.2
+
+FLAGS=-DFLEXT_SYS=2 -fno-exceptions $(UFLAGS)
+CFLAGS=-O6
CFLAGS_D=-g
CFLAGS_T=-DFLEXT_THREADS
LIBS=
@@ -32,6 +32,7 @@ INSTDIR=$(PDPATH)/flext
# ----------------------------------------------
NAME=flext
+SRCDIR=source
# all the source files from the package
include make-files.txt
@@ -62,17 +63,17 @@ $(TARGDIR):
$(SRCS): $(HDRS) $(IHDRS) $(MAKEFILE) $(CONFIG)
touch $@
-$(TARGDIR)/%.o : source/%.cpp
- $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.o : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-$(TARGDIR)/%.do : source/%.cpp
- $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.do : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-$(TARGDIR)/%.to : source/%.cpp
- $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.to : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-$(TARGDIR)/%.tdo : source/%.cpp
- $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.tdo : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))
ar rc $@ $^
@@ -101,7 +102,7 @@ $(INSTDIR):
install:: $(INSTDIR)
endif
-install:: $(TARGET) $(TARGET_D) $(patsubst %,source/%,$(HDRS)) # $(TARGET_T) $(TARGET_TD)
+install:: $(TARGET) $(TARGET_D) $(patsubst %,$(SRCDIR)/%,$(HDRS)) # $(TARGET_T) $(TARGET_TD)
cp $^ $(INSTDIR)
diff --git a/externals/grill/flext/makefile.pd-darwin b/externals/grill/flext/makefile.pd-darwin
index a776cdfe..62ac9864 100644
--- a/externals/grill/flext/makefile.pd-darwin
+++ b/externals/grill/flext/makefile.pd-darwin
@@ -10,13 +10,13 @@
CONFIG=config-pd-darwin.txt
-include $(CONFIG)
+include ${CONFIG}
# compiler+linker stuff
-INCLUDES=$(PDPATH) $(SNDOBJ)
-FLAGS=-DFLEXT_SYS=2 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes # -maltivec
-CFLAGS=-O6 -fno-exceptions
-CFLAGS_D=-g -Wshadow
+INCLUDES=${PDPATH}
+FLAGS=-DFLEXT_SYS=2 -Wno-unused -Wno-parentheses -Wshadow -Wno-switch -Wstrict-prototypes -fno-exceptions ${UFLAGS}
+CFLAGS=-O6
+CFLAGS_D=-g
CFLAGS_T=-DFLEXT_THREADS
LIBS=
@@ -26,16 +26,21 @@ LIBS=
# ----------------------------------------------
NAME=flext
+SRCDIR=source
# all the source files from the package
include make-files.txt
ifdef SNDOBJ
-_SRCS=$(SRCS) $(SRCS_SNDOBJ)
-_HDRS=$(HDRS) $(HDRS_SNDOBJ)
-else
-_SRCS=$(SRCS)
-_HDRS=$(HDRS)
+INCLUDES+=$(SNDOBJ)
+SRCS+=$(SRCS_SNDOBJ)
+HDRS+=$(HDRS_SNDOBJ)
+endif
+
+ifdef STK
+INCLUDES+=$(STK)
+SRCS+=$(SRCS_STK)
+HDRS+=$(HDRS_STK)
endif
MAKEFILE=makefile.pd-darwin
@@ -49,31 +54,31 @@ all: $(TARGDIR) $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD)
$(TARGDIR):
mkdir $(TARGDIR)
-$(patsubst %,source/%,$(_SRCS)): $(patsubst %,source/%,$(HDRS)) $(patsubst %,source/%,$(IHDRS)) $(MAKEFILE) $(CONFIG)
+$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(patsubst %,$(SRCDIR)/%,$(IHDRS)) $(MAKEFILE) $(CONFIG)
touch $@
-$(TARGDIR)/%.o : source/%.cpp
- $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.o : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-$(TARGDIR)/%.do : source/%.cpp
- $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.do : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-$(TARGDIR)/%.to : source/%.cpp
- $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.to : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-$(TARGDIR)/%.tdo : source/%.cpp
- $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.tdo : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(_SRCS))
+$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))
libtool -static -o $@ $^
-$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(_SRCS))
+$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS))
libtool -static -o $@ $^
-$(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.to,$(_SRCS))
+$(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.to,$(SRCS))
libtool -static -o $@ $^
-$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(_SRCS))
+$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
libtool -static -o $@ $^
.PHONY: clean install
@@ -88,7 +93,7 @@ $(INSTDIR):
install:: $(INSTDIR)
endif
-install:: $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(patsubst %,source/%,$(_HDRS))
+install:: $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(patsubst %,$(SRCDIR)/%,$(HDRS))
cp $^ $(INSTDIR)
ranlib $(INSTDIR)/*.a # have to rerun ranlib at install dir ?!
# chmod 755 $(patsubst %,$(INSTDIR)/%,$(notdir $^))
diff --git a/externals/grill/flext/makefile.pd-linux b/externals/grill/flext/makefile.pd-linux
index 6e1901bf..d1af3dc8 100644
--- a/externals/grill/flext/makefile.pd-linux
+++ b/externals/grill/flext/makefile.pd-linux
@@ -13,14 +13,16 @@ CONFIG=config-pd-linux.txt
include $(CONFIG)
# compiler+linker stuff
-INCLUDES=$(PDPATH) $(SNDOBJ) $(STK)
-FLAGS=-DFLEXT_SYS=2
+INCLUDES=$(PDPATH)
+
+# general compiler flags
+FLAGS=-DFLEXT_SYS=2 -fno-exceptions $(UFLAGS)
# compiler flags for optimized build
-CFLAGS=$(UFLAGS) -O6 -fno-exceptions
+CFLAGS= -O6
# compiler flags for debug build
-CFLAGS_D=$(UFLAGS) -g -fno-exceptions
+CFLAGS_D=-g
# additional flags for threading
CFLAGS_T=-DFLEXT_THREADS
@@ -33,16 +35,19 @@ LIBS=
# ----------------------------------------------
NAME=flext
+SRCDIR=source
# all the source files from the package
include make-files.txt
ifdef SNDOBJ
+INCLUDES+=$(SNDOBJ)
SRCS+=$(SRCS_SNDOBJ)
HDRS+=$(HDRS_SNDOBJ)
endif
ifdef STK
+INCLUDES+=$(STK)
SRCS+=$(SRCS_STK)
HDRS+=$(HDRS_STK)
endif
@@ -58,20 +63,20 @@ all: $(TARGDIR) $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD)
$(TARGDIR):
mkdir $(TARGDIR)
-$(patsubst %,source/%,$(SRCS)): $(patsubst %,source/%,$(HDRS)) $(patsubst %,source/%,$(IHDRS)) $(MAKEFILE) $(CONFIG)
+$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(patsubst %,$(SRCDIR)/%,$(IHDRS)) $(MAKEFILE) $(CONFIG)
touch $@
-$(TARGDIR)/%.o : source/%.cpp
- $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.o : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-$(TARGDIR)/%.do : source/%.cpp
- $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.do : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-$(TARGDIR)/%.to : source/%.cpp
- $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.to : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
-$(TARGDIR)/%.tdo : source/%.cpp
- $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) source) $< -o $@
+$(TARGDIR)/%.tdo : $(SRCDIR)/%.cpp
+ $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))
ar rc $@ $^
@@ -101,7 +106,7 @@ $(INSTDIR):
install:: $(INSTDIR)
endif
-install:: $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(patsubst %,source/%,$(HDRS))
+install:: $(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(patsubst %,$(SRCDIR)/%,$(HDRS))
cp $^ $(INSTDIR)
chmod 755 $(patsubst %,$(INSTDIR)/%,$(notdir $^))
chown root.users $(patsubst %,$(INSTDIR)/%,$(notdir $^))
diff --git a/externals/grill/flext/readme.txt b/externals/grill/flext/readme.txt
index e95e51f7..9bf15a4a 100644
--- a/externals/grill/flext/readme.txt
+++ b/externals/grill/flext/readme.txt
@@ -110,6 +110,8 @@ Version history:
- moved CLASS_MAINSIGNALIN to class scope (fixed "float method overwritten" warning)
- unix makefiles: CXX should be commented out if standard (to enable environmental settings)
- introduced default returns for the different flext::GetA* functions
+- pragma for Metrowerks compilers: enumsalwaysint on, bool on
+- MaxMSP: added assist string for attribute outlets
0.4.1:
- full port for Max@OSX
@@ -297,9 +299,10 @@ Restrictions in compatibility mode:
- Max allows only 9 float/int inlets
Porting to new compilers/platforms:
-- enums must be int-sized
+- enums must be int-sized!!!
- compiler must support bool type
- no need of C++ exceptions or RTTI (RTTI only for GUI objects)
+ BUT: some libraries could use RTTI and then need run-time type information from the library! (this is known for gcc compiles)
----------------------------------------------------------------------------
diff --git a/externals/grill/flext/source/flattr.cpp b/externals/grill/flext/source/flattr.cpp
index 014ffdcb..ffb6b6fd 100644
--- a/externals/grill/flext/source/flattr.cpp
+++ b/externals/grill/flext/source/flattr.cpp
@@ -22,8 +22,8 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#endif
flext_base::attritem::attritem(const t_symbol *t,metharg tp,methfun f,int fl):
- item(t,0,NULL),argtp(tp),
- fun(f),flags(fl)
+ item(t,0,NULL),
+ flags(fl),argtp(tp),fun(f)
{}
flext_base::attritem::~attritem()
diff --git a/externals/grill/flext/source/flext.cpp b/externals/grill/flext/source/flext.cpp
index e54ad339..baf33c42 100644
--- a/externals/grill/flext/source/flext.cpp
+++ b/externals/grill/flext/source/flext.cpp
@@ -180,7 +180,10 @@ void flext_base::m_assist(long msg,long arg,char *s)
strcpy(s,arg < incnt && indesc[arg]?indesc[arg]:"");
break;
case 2: //ASSIST_OUTLET:
- strcpy(s,arg < outcnt && outdesc[arg]?outdesc[arg]:"");
+ if(arg < outcnt)
+ strcpy(s,outdesc[arg]?outdesc[arg]:"");
+ else
+ strcpy(s,arg == outcnt && procattr?"Attributes":"");
break;
}
#endif
diff --git a/externals/grill/flext/source/flitem.cpp b/externals/grill/flext/source/flitem.cpp
index ddcf570b..1e5a26a6 100755
--- a/externals/grill/flext/source/flitem.cpp
+++ b/externals/grill/flext/source/flitem.cpp
@@ -17,7 +17,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
flext_base::item::item(const t_symbol *t,int inl,attritem *a):
- inlet(inl),tag(t),attr(a),nxt(NULL)
+ tag(t),inlet(inl),attr(a),nxt(NULL)
{}
flext_base::item::~item()
diff --git a/externals/grill/flext/source/flprefix.h b/externals/grill/flext/source/flprefix.h
index c6e0a267..f12d1320 100755
--- a/externals/grill/flext/source/flprefix.h
+++ b/externals/grill/flext/source/flprefix.h
@@ -153,6 +153,11 @@ WARRANTIES, see the file, "license.txt," in this distribution.
#define FLEXT_OS FLEXT_OS_UNKNOWN
#endif
#endif
+
+ // This is important for method and attribute callbacks
+ #pragma enumsalwaysint on
+ // This is important for everything
+ #pragma bool on
#elif defined(__GNUG__)
// GNU C++
diff --git a/externals/grill/flext/source/flsupport.cpp b/externals/grill/flext/source/flsupport.cpp
index f8717d02..ecc39153 100644
--- a/externals/grill/flext/source/flsupport.cpp
+++ b/externals/grill/flext/source/flsupport.cpp
@@ -119,12 +119,12 @@ void flext::GetAString(const t_atom &a,char *buf,int szbuf)
#endif
}
-int flext::FoldBits(unsigned long h,int bits)
+unsigned int flext::FoldBits(unsigned long h,int bits)
{
if(!bits) return 0;
const int hmax = (1<<bits)-1;
- int ret = 0;
- for(int i = 0; i < sizeof(h)*8; i += bits)
+ unsigned int ret = 0;
+ for(unsigned int i = 0; i < sizeof(h)*8; i += bits)
ret = ret^((h>>i)&hmax);
return ret;
}
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h
index 14140c99..56c43bc6 100644
--- a/externals/grill/flext/source/flsupport.h
+++ b/externals/grill/flext/source/flsupport.h
@@ -173,7 +173,7 @@ public:
/*! \brief Fold value to a number of bits
\remark Good for hash generation
*/
- static int FoldBits(unsigned long h,int bits);
+ static unsigned int FoldBits(unsigned long h,int bits);
//! \brief How many bits are necessary to represent n
static int Int2Bits(unsigned long n);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 06:33:45 +0000