diff options
Diffstat (limited to 'externals')
19 files changed, 58 insertions, 166 deletions
diff --git a/externals/grill/pool/config-pd-bcc.txt b/externals/grill/pool/config-pd-bcc.txt index bcb874f9..0aabecbb 100644 --- a/externals/grill/pool/config-pd-bcc.txt +++ b/externals/grill/pool/config-pd-bcc.txt @@ -1,5 +1,5 @@ # pool - hierarchical storage object for PD and Max/MSP -# Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2002-2004 Thomas Grill (xovo@gmx.net) # # where is PD? @@ -18,3 +18,6 @@ OUTPATH=.\pd-bcc # (leave blank to omit installation) INSTPATH=$(PDPATH)\extra + +# additional compiler flags +UFLAGS=-6 -O2 -OS -ff diff --git a/externals/grill/pool/config-pd-darwin.txt b/externals/grill/pool/config-pd-darwin.txt index 295a8a52..4e8cbb45 100644 --- a/externals/grill/pool/config-pd-darwin.txt +++ b/externals/grill/pool/config-pd-darwin.txt @@ -1,5 +1,5 @@ # pool - hierarchical storage object for PD and Max/MSP -# Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2002-2004 Thomas Grill (xovo@gmx.net) # # your c++ compiler (define only if it's different than g++) @@ -8,20 +8,20 @@ # where are the PD header files? # leave it blank if it is a system directory (like /usr/local/include), # since gcc 3.2 complains about it -PDPATH=/usr/local/pd/src +PDPATH=/usr/local/lib/pd/src # where is the PD executable? -PD=/usr/local/pd/bin/pd +PD=/usr/local/bin/pd # where do the flext libraries reside? -FLEXTPATH=/usr/local/pd/flext +FLEXTPATH=/usr/local/lib/pd/flext # where should flext libraries be built? TARGDIR=./pd-darwin # where should pool be installed? # (leave blank to omit installation) -INSTPATH=/usr/local/pd/extra +INSTPATH=/usr/local/lib/pd/extra # additional compiler flags # (check if they match your system!) diff --git a/externals/grill/pool/config-pd-linux.txt b/externals/grill/pool/config-pd-linux.txt index 48bc3703..bd617602 100644 --- a/externals/grill/pool/config-pd-linux.txt +++ b/externals/grill/pool/config-pd-linux.txt @@ -1,5 +1,5 @@ # pool - hierarchical storage object for PD and Max/MSP -# Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2002-2004 Thomas Grill (xovo@gmx.net) # # your c++ compiler (define only if it's different than g++) diff --git a/externals/grill/pool/config-pd-msvc.txt b/externals/grill/pool/config-pd-msvc.txt index 930bd9d4..6b198398 100644 --- a/externals/grill/pool/config-pd-msvc.txt +++ b/externals/grill/pool/config-pd-msvc.txt @@ -1,5 +1,5 @@ # pool - hierarchical storage object for PD and Max/MSP -# Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2002-2004 Thomas Grill (xovo@gmx.net) # # where is PD? @@ -18,3 +18,7 @@ OUTPATH=pd-msvc # where should the external be installed? # (leave blank to omit installation) INSTPATH=$(PDPATH)\extra + + +# additional compiler flags +UFLAGS=/G6 /Ox
\ No newline at end of file diff --git a/externals/grill/pool/make-files.txt b/externals/grill/pool/make-files.txt new file mode 100644 index 00000000..bbf988d5 --- /dev/null +++ b/externals/grill/pool/make-files.txt @@ -0,0 +1,7 @@ +# all the source files from the package +NAME=pool + +SRCDIR=source + +SRCS= main.cpp data.cpp pool.cpp +HDRS= pool.h diff --git a/externals/grill/pool/makefile.pd-bcc b/externals/grill/pool/makefile.pd-bcc index bb41d752..e12abde0 100644 --- a/externals/grill/pool/makefile.pd-bcc +++ b/externals/grill/pool/makefile.pd-bcc @@ -1,5 +1,5 @@ # pool - hierarchical storage object for PD and Max/MSP -# Copyright (C) 2002 Thomas Grill +# Copyright (C) 2002-2004 Thomas Grill # # Makefile for BorlandC++ # @@ -9,7 +9,9 @@ !include config-pd-bcc.txt -NAME=pool +# all the source files from the package +!include make-files.txt + SETUPFUNCTION=$(NAME)_setup # flext stuff @@ -22,16 +24,12 @@ LIBS=cw32.lib import32.lib C0D32.OBJ # compiler definitions and flags DEFS=-DFLEXT_SYS=2 -CFLAGS=-6 -O2 -OS -ff -tWD +CFLAGS=-tWD $(UFLAGS) # the rest can stay untouched # ---------------------------------------------- -# all the source files from the package -SRCS= main.cpp data.cpp pool.cpp -HDRS= pool.h - # default target all: $(OUTPATH)\$(NAME).dll @@ -53,7 +51,7 @@ OBJS= $(SRCS:.cpp=.obj) #$(SRCS): $(HDRS) # -touch $< -.cpp.obj: +{$(SRCDIR)}.cpp.obj: bcc32 -c $(CFLAGS) $(DEFS) $(INCPATH) -n$(OUTPATH) $< $(OUTPATH): diff --git a/externals/grill/pool/makefile.pd-darwin b/externals/grill/pool/makefile.pd-darwin index c71935d8..b602933a 100644 --- a/externals/grill/pool/makefile.pd-darwin +++ b/externals/grill/pool/makefile.pd-darwin @@ -1,5 +1,5 @@ # pool - hierarchical storage object for PD and Max/MSP -# Copyright (C) 2002 Thomas Grill (xovo@gmx.net) +# Copyright (C) 2002-2004 Thomas Grill (xovo@gmx.net) # # Makefile for gcc @ darwin (OSX) # @@ -28,26 +28,21 @@ FRAMEWORKS=Carbon # the rest can stay untouched # ---------------------------------------------- -NAME=pool +include make-files.txt -# all the source files from the package -SRCS=main.cpp pool.cpp data.cpp -HDRS=pool.h - -DIR=. TARGET=$(TARGDIR)/$(NAME).pd_darwin # default target all: $(TARGDIR) $(TARGET) -$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(FLEXTLIB) $(CONFIG) +$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTLIB) $(CONFIG) touch $@ $(TARGDIR): -mkdir $(TARGDIR) -$(TARGDIR)/%.o : $(DIR)/%.cpp +$(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@ $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) @@ -72,7 +67,3 @@ clean: - - - - diff --git a/externals/grill/pool/makefile.pd-linux b/externals/grill/pool/makefile.pd-linux index dd70f4e6..1d5654a6 100644 --- a/externals/grill/pool/makefile.pd-linux +++ b/externals/grill/pool/makefile.pd-linux @@ -1,5 +1,5 @@ # pool - hierarchical storage object for PD and Max/MSP -# Copyright (C) 2002 Thomas Grill (xovo@gmx.net) +# Copyright (C) 2002-2004 Thomas Grill (xovo@gmx.net) # # Makefile for gcc @ linux # @@ -42,26 +42,21 @@ endif # the rest can stay untouched # ---------------------------------------------- -NAME=pool +include make-files.txt -# all the source files from the package -SRCS=main.cpp pool.cpp data.cpp -HDRS=pool.h - -DIR=. TARGET=$(TARGDIR)/$(NAME).pd_linux # default target all: $(TARGDIR) $(TARGET) -$(patsubst %,$(DIR)/%,$(SRCS)): $(patsubst %,$(DIR)/%,$(HDRS)) $(CONFIG) +$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(CONFIG) touch $@ $(TARGDIR): mkdir $(TARGDIR) -$(TARGDIR)/%.o : $(DIR)/%.cpp +$(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@ $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) diff --git a/externals/grill/pool/makefile.pd-msvc b/externals/grill/pool/makefile.pd-msvc index cf0893bb..7430d506 100644 --- a/externals/grill/pool/makefile.pd-msvc +++ b/externals/grill/pool/makefile.pd-msvc @@ -1,5 +1,5 @@ # pool - hierarchical storage object for PD and Max/MSP -# Copyright (C) 2002 Thomas Grill (xovo@gmx.net) +# Copyright (C) 2002-2004 Thomas Grill (xovo@gmx.net) # # Makefile for MSVC++ 6 and 7 # @@ -17,19 +17,13 @@ LIBS=pd.lib flext-pdwin.lib # compiler definitions and flags DEFS=/DFLEXT_SYS=2 -CFLAGS=/G6 /Ox /ML /EHsc +CFLAGS=/ML /EHsc $(UFLAGS) -# the rest can stay untouched -# ---------------------------------------------- - -# all the source files from the package -SRCS= main.cpp data.cpp pool.cpp -HDRS= pool.h -# ----------------------------------------------- +# the rest can stay untouched +#################################### -NAME=pool -DIR=. +!include make-files.txt all: $(OUTPATH) $(OUTPATH)\$(NAME).dll @@ -43,7 +37,7 @@ OBJS= $(SRCS:.cpp=.obj) $(OUTPATH): -mkdir $(OUTPATH) > nul -{$(DIR)}.cpp{}.obj: +{$(SRCDIR)}.cpp{}.obj: cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)\$@ $(OUTPATH)\$(NAME).dll: $(OBJS) diff --git a/externals/grill/pool/pool.vcproj b/externals/grill/pool/pool.vcproj index 7e0e6999..59b8bd60 100644 --- a/externals/grill/pool/pool.vcproj +++ b/externals/grill/pool/pool.vcproj @@ -284,118 +284,16 @@ </References> <Files> <File - RelativePath="data.cpp"> - <FileConfiguration - Name="PD Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="PD Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/> - </FileConfiguration> + RelativePath=".\source\data.cpp"> </File> <File - RelativePath="main.cpp"> - <FileConfiguration - Name="PD Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="PD Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/> - </FileConfiguration> + RelativePath=".\source\main.cpp"> </File> <File - RelativePath="pool.cpp"> - <FileConfiguration - Name="PD Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="PD Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=2;$(NoInherit)" - BasicRuntimeChecks="3" - BrowseInformation="1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/> - </FileConfiguration> - <FileConfiguration - Name="Max Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FLEXT_SYS=1"/> - </FileConfiguration> + RelativePath=".\source\pool.cpp"> </File> <File - RelativePath="pool.h"> + RelativePath=".\source\pool.h"> </File> <File RelativePath="readme.txt"> diff --git a/externals/grill/pool/data.cpp b/externals/grill/pool/source/data.cpp index 9eda196b..9eda196b 100644 --- a/externals/grill/pool/data.cpp +++ b/externals/grill/pool/source/data.cpp diff --git a/externals/grill/pool/main.cpp b/externals/grill/pool/source/main.cpp index 5f75f07d..5f75f07d 100644 --- a/externals/grill/pool/main.cpp +++ b/externals/grill/pool/source/main.cpp diff --git a/externals/grill/pool/pool.cpp b/externals/grill/pool/source/pool.cpp index 4d6d100e..4d6d100e 100644 --- a/externals/grill/pool/pool.cpp +++ b/externals/grill/pool/source/pool.cpp diff --git a/externals/grill/pool/pool.h b/externals/grill/pool/source/pool.h index 99e271b3..99e271b3 100644 --- a/externals/grill/pool/pool.h +++ b/externals/grill/pool/source/pool.h diff --git a/externals/grill/py/source/main.h b/externals/grill/py/source/main.h index b293246e..f0a9aa13 100644 --- a/externals/grill/py/source/main.h +++ b/externals/grill/py/source/main.h @@ -140,7 +140,7 @@ protected: FLEXT_ATTRVAR_B(detach) FLEXT_CALLBACK_V(m_stop) FLEXT_CALLBACK(m_dir) - FLEXT_ATTRGET_V(mg_dir) + FLEXT_CALLGET_V(mg_dir) FLEXT_CALLBACK(m_doc) FLEXT_CALLBACK_T(tick) }; diff --git a/externals/grill/py/source/pyext.h b/externals/grill/py/source/pyext.h index 09a7a49e..3127b4ac 100644 --- a/externals/grill/py/source/pyext.h +++ b/externals/grill/py/source/pyext.h @@ -112,7 +112,6 @@ private: FLEXT_CALLBACK(m_dir_) FLEXT_CALLGET_V(mg_dir_) FLEXT_CALLBACK(m_doc_) - FLEXT_CALLGET_V(mg_doc_) FLEXT_ATTRGET_V(args) FLEXT_CALLSET_V(ms_args) diff --git a/externals/grill/xsample/config-pd-bcc.txt b/externals/grill/xsample/config-pd-bcc.txt index bd3972df..ddc12efc 100644 --- a/externals/grill/xsample/config-pd-bcc.txt +++ b/externals/grill/xsample/config-pd-bcc.txt @@ -1,5 +1,5 @@ # xsample - extended sample objects for Max/MSP and pd (pure data) -# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net) # # where is PD? @@ -19,3 +19,6 @@ INSTALL=yes # where should the external be installed? INSTDIR=$(PDPATH)\extra + +# additional compiler flags +UFLAGS=-6 -O2 -OS -ff diff --git a/externals/grill/xsample/make-files.txt b/externals/grill/xsample/make-files.txt index 8e71de6e..c6cc10d0 100755 --- a/externals/grill/xsample/make-files.txt +++ b/externals/grill/xsample/make-files.txt @@ -1,6 +1,7 @@ # all the source files from the package +NAME=xsample + SRCDIR=source SRCS=main.cpp play.cpp groove.cpp record.cpp inter.cpp - HDRS=main.h inter.h diff --git a/externals/grill/xsample/makefile.pd-bcc b/externals/grill/xsample/makefile.pd-bcc index 59d6efc8..67131953 100644 --- a/externals/grill/xsample/makefile.pd-bcc +++ b/externals/grill/xsample/makefile.pd-bcc @@ -1,5 +1,5 @@ # xsample - extended sample objects for Max/MSP and pd (pure data) -# Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net) # # Makefile for BorlandC++ # @@ -9,7 +9,9 @@ !include config-pd-bcc.txt -NAME=xsample +# all the source files from the package +!include make-files.txt + SETUPFUNCTION=$(NAME)_setup # flext stuff @@ -22,15 +24,12 @@ LIBS=cw32.lib import32.lib C0D32.OBJ # compiler definitions and flags DEFS=-DFLEXT_SYS=2 -CFLAGS=-6 -O2 -OS -ff -tWD +CFLAGS=-tWD $(UFLAGS) # the rest can stay untouched # ---------------------------------------------- -# all the source files from the package -!include make-files.txt - # default target all: $(OUTPATH)\$(NAME).dll |