From a7389a1405e6c160989e3d7097813b55e08e0f8d Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Sat, 16 Apr 2005 21:35:06 +0000 Subject: updated templates changed template parameter of TableMap fixes for OSX fixed problems with symbol binding svn path=/trunk/; revision=2771 --- externals/grill/flext/buildsys/bmake.mak | 3 ++- externals/grill/flext/buildsys/gnumake.mak | 4 +++- externals/grill/flext/buildsys/mac/max/config-gcc.def | 12 +++++------- externals/grill/flext/buildsys/mac/pd/config-gcc.def | 2 +- externals/grill/flext/buildsys/nmake.mak | 3 ++- 5 files changed, 13 insertions(+), 11 deletions(-) (limited to 'externals/grill/flext/buildsys') diff --git a/externals/grill/flext/buildsys/bmake.mak b/externals/grill/flext/buildsys/bmake.mak index 5b5ea10a..05628785 100644 --- a/externals/grill/flext/buildsys/bmake.mak +++ b/externals/grill/flext/buildsys/bmake.mak @@ -56,7 +56,8 @@ SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def OPTIONS=-f $(BUILDPATH)bmake-sub.mak -N \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ - BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS) + BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS) \ + NAME=$(NAME) SRCS=$(SRCS) ############################################### diff --git a/externals/grill/flext/buildsys/gnumake.mak b/externals/grill/flext/buildsys/gnumake.mak index efa0c273..8091974f 100644 --- a/externals/grill/flext/buildsys/gnumake.mak +++ b/externals/grill/flext/buildsys/gnumake.mak @@ -65,7 +65,9 @@ SYSDEFAULT=$(UBUILDPATH)$(PLATFORM)/$(RTSYS)/config-$(COMPILER).def OPTIONS=-f $(UBUILDPATH)gnumake-sub.mak \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ - BUILDPATH=$(UBUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS) + BUILDPATH=$(UBUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS) \ + NAME=$(NAME) SRCS=$(SRCS) + ############################################### diff --git a/externals/grill/flext/buildsys/mac/max/config-gcc.def b/externals/grill/flext/buildsys/mac/max/config-gcc.def index f54e38aa..5ce580af 100644 --- a/externals/grill/flext/buildsys/mac/max/config-gcc.def +++ b/externals/grill/flext/buildsys/mac/max/config-gcc.def @@ -4,14 +4,12 @@ MAXSDKPATH=/Applications/MaxMSP\ 4.5/MaxMSP-SDK/4.5\ headers/c74support ############################################################### -# where do/should the flext headers reside/be built? -FLEXTINC=/usr/local/include/flext +# prefix for flext installation +# headers are in $(FLEXTPREFIX)/include/flext +# libraries are in $(FLEXTPREFIX)/lib +# build system is in $(FLEXTPREFIX)/lib/flext -# where do/should the flext static libraries reside/be built? -FLEXTLIB=/usr/local/lib - -# where do/should the flext shared libraries reside/be built? -FLEXTSHLIB=$(FLEXTLIB) +FLEXTPREFIX=/usr/local ############################################################### diff --git a/externals/grill/flext/buildsys/mac/pd/config-gcc.def b/externals/grill/flext/buildsys/mac/pd/config-gcc.def index 2095518b..69112b92 100644 --- a/externals/grill/flext/buildsys/mac/pd/config-gcc.def +++ b/externals/grill/flext/buildsys/mac/pd/config-gcc.def @@ -1,6 +1,6 @@ # where is the PD installation including source code? # (this should point to the main folder, which has a "src" subfolder) -PDPATH=/Applications/Pd-0.38-0.app/Contents/Resources +PDPATH=/Applications/Pd-0.38-3.app/Contents/Resources # where is the PD executable? PDBIN=$(PDPATH)/bin/pd diff --git a/externals/grill/flext/buildsys/nmake.mak b/externals/grill/flext/buildsys/nmake.mak index 3e946de0..fc5dc09a 100644 --- a/externals/grill/flext/buildsys/nmake.mak +++ b/externals/grill/flext/buildsys/nmake.mak @@ -56,7 +56,8 @@ SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def OPTIONS=/NOLOGO /f $(BUILDPATH)nmake-sub.mak \ PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \ - BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS) + BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO) BUILDCLASS=$(BUILDCLASS) \ + NAME=$(NAME) SRCS=$(SRCS) ############################################### -- cgit v1.2.1