Update of /cvsroot/pure-data/externals/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19538

Modified Files: SConstruct Log Message: runtime OS check

Index: SConstruct =================================================================== RCS file: /cvsroot/pure-data/externals/build/SConstruct,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SConstruct 12 Apr 2005 15:48:55 -0000 1.6 --- SConstruct 13 Apr 2005 01:44:42 -0000 1.7 *************** *** 4,12 **** prefix = "/usr/local/lib/pd"

! env = Environment(CPPPATH = Split(prefix + '/src /usr/local/include . src'), CPPDEFINES=['PD', 'UNIX'], SHLIBPREFIX = '', SHLIBSUFFIX = '.pd_linux', CCFLAGS = '-pipe -O2')

########### delete when namespace conflict issue is finally resolved delete = """ ! test -f src/prepend.c && rm src/urn.* && rm src/match.* && rm src/prepend.* && rm src/sinh.c && rm src/delta~.c && rm src/reson~.c && rm src/abs~.c &&rm src/svf~.c &&rm src/matrix~.c &&rm src/atan2~.c && rm src/avg~.c && echo "poof...no more conflicting externals..!!" """ print os.popen(delete).read() --- 4,25 ---- prefix = "/usr/local/lib/pd"

! platform = os.uname()[0] ! ! if re.match("Linux", platform) != None: ! OSdefine = 'UNIX' ! extSuffix = '.pd_linux' ! elif re.match("MINGW", platform) != None: ! OSdefine = 'NT' ! extSuffix = '.dll' ! elif re.match("Darwin", platform) != None: ! OSdefine = 'UNIX' ! extSuffix = '.pd_darwin' ! ! env = Environment(CPPPATH = Split(prefix + '/src /usr/include /usr/local/include . ../../pd/src ../../src src'), CPPDEFINES=['PD', OSdefine], SHLIBPREFIX = '', SHLIBSUFFIX = extSuffix, CCFLAGS = '-pipe -O2')

########### delete when namespace conflict issue is finally resolved + ##(cyclone has all of these, the other versions are from all over the place) delete = """ ! cd src && test -f prepend.c && rm urn.* match.* prepend.* sinh.c delta~.c reson~.c abs~.c svf~.c matrix~.c atan2~.c avg~.c pmpd.c && echo "poof...no more conflicting externals..!!" """ print os.popen(delete).read()