Update of /cvsroot/pure-data/externals/clr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18142
Modified Files: clr.cpp makefile.darwin Log Message: some cleanups for OSX, fixed line endings
Index: makefile.darwin =================================================================== RCS file: /cvsroot/pure-data/externals/clr/makefile.darwin,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.darwin 12 Jan 2006 09:22:35 -0000 1.1 --- makefile.darwin 28 Jan 2006 10:24:28 -0000 1.2 *************** *** 1,5 **** current: pd_darwin
! clean: ; rm -f *.pd_linux *.o *.pd_darwin
--- 1,5 ---- current: pd_darwin
! clean: ; rm -f *.o *.pd_darwin
*************** *** 11,40 ****
! # 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/src/pd/src ! PDPATH=/Users/davide/Desktop/Pd-0.39-0.app/Contents/Resources/src/
! # where is the PD executable? ! #PD=/usr/local/bin/pd ! PD=/Users/davide/Desktop/Pd-0.39-0.app/Contents/Resources/bin/pd ! #PD=/Users/davidemorelli/Desktop/robaDavide/Pd-0.38-3.app/Contents/Resources/src/
! CFLAGS=`pkg-config --cflags mono` ! #LDFLAGS=`pkg-config --libs mono` ! LDFLAGS=-L/sw/lib -L/sw/lib/pkgconfig/../../lib -lmono -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv
! DARWININCLUDE = -I../../src -I$(PDPATH)
! #DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ ! # -Wno-unused -Wno-parentheses -Wno-switch
DARWINCFLAGS = -DPD -O2
! .c.pd_darwin: ! cc $(DARWINCFLAGS) $(DARWININCLUDE) $(CFLAGS) -o $*.o -c $*.c ! # cc -bundle -bundle_loader $(PD) -multiply_defined supress $(LDFLAGS) -o $*.pd_darwin *.o ! cc -bundle -bundle_loader $(PD) -flat_namespace $(LDFLAGS) -o $*.pd_darwin *.o ! # cc -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $(FANNLIB) *.o ! # rm -f $*.o --- 11,27 ----
! PDPATH=/Users/thomas/Develop/pd/devel_0_39
! MONO=/Library/Frameworks/Mono.Framework
! # where is the PD executable? ! PD=$(PDPATH)/bin/pd
! LDFLAGS=-L$(MONO)/Libraries -lmono -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 # -lintl -liconv
! DARWININCLUDE = -I$(MONO)/Headers -I$(MONO)/Headers/glib-2.0 -I$(MONO)/Libraries/glib-2.0/include -I$(PDPATH)/src
DARWINCFLAGS = -DPD -O2
! .cpp.pd_darwin: ! g++ -dynamiclib -undefined dynamic_lookup $(DARWINCFLAGS) $(DARWININCLUDE) $(CFLAGS) $(LDFLAGS) -o $*.pd_darwin $*.cpp
Index: clr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/clr/clr.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** clr.cpp 27 Jan 2006 22:53:18 -0000 1.1 --- clr.cpp 28 Jan 2006 10:24:28 -0000 1.2 *************** *** 17,22 **** #include <assert.h> #include <stdlib.h> ! #include <string.h> #include <io.h> // for _close
#include <map> --- 17,28 ---- #include <assert.h> #include <stdlib.h> ! #include <string.h> ! ! #ifdef _WIN32 #include <io.h> // for _close + #define close _close + #else + #include <unistd.h> + #endif
#include <map> *************** *** 962,966 ****
// found ! _close(fd);
clr_class = (t_clr_class *)getbytes(sizeof(t_clr_class)); --- 968,972 ----
// found ! close(fd);
clr_class = (t_clr_class *)getbytes(sizeof(t_clr_class)); *************** *** 1097,1102 **** mono_add_internal_call("PureData.Core::PostVerbose",(const void *)PD_PostVerbose);
! mono_add_internal_call("PureData.Core::GenSym", PD_GenSym); ! mono_add_internal_call("PureData.Core::EvalSym", PD_EvalSym);
--- 1103,1108 ---- mono_add_internal_call("PureData.Core::PostVerbose",(const void *)PD_PostVerbose);
! mono_add_internal_call("PureData.Core::GenSym", (const void *)PD_GenSym); ! mono_add_internal_call("PureData.Core::EvalSym", (const void *)PD_EvalSym);