externals/grill/flext config-pd-cygwin.txt,1.9,1.10 config-pd-mingw.txt,1.1,1.2 makefile.pd-cygwin,1.11,1.12 makefile.pd-linux,1.17,1.18 makefile.pd-mingw,1.1,1.2 - Pd-cvs

23 Feb 2004


      Update of /cvsroot/pure-data/externals/grill/flext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2122
Modified Files:
    config-pd-cygwin.txt config-pd-mingw.txt makefile.pd-cygwin 
    makefile.pd-linux makefile.pd-mingw 
Log Message:
 ""
Index: config-pd-cygwin.txt
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/config-pd-cygwin.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** config-pd-cygwin.txt	12 Dec 2003 03:32:56 -0000	1.9
--- config-pd-cygwin.txt	23 Feb 2004 03:27:45 -0000	1.10
***************
*** 1,4 ****
  # flext - C++ layer for Max/MSP and pd (pure data) externals
! # Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
  #
--- 1,4 ----
  # flext - C++ layer for Max/MSP and pd (pure data) externals
! # Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
  #
***************
*** 11,19 ****
  # where is the SndObj include directory? 
  # (leave blank or comment out to disable SndObj support)
! SNDOBJ=/cygdrive/f/prog/audio/sndobj/include
# where is the STK include directory?
  # (leave blank or comment out to disable STK support)
! STK=/cygdrive/f/prog/audio/stk/include
# where should flext libraries be built?
--- 11,19 ----
  # where is the SndObj include directory? 
  # (leave blank or comment out to disable SndObj support)
! # SNDOBJ=/cygdrive/f/prog/audio/sndobj/include
# where is the STK include directory?
  # (leave blank or comment out to disable STK support)
! # STK=/cygdrive/f/prog/audio/stk/include
# where should flext libraries be built?
Index: config-pd-mingw.txt
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/config-pd-mingw.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config-pd-mingw.txt	22 Feb 2004 03:33:59 -0000	1.1
--- config-pd-mingw.txt	23 Feb 2004 03:27:45 -0000	1.2
***************
*** 11,19 ****
  # where is the SndObj include directory? 
  # (leave blank or comment out to disable SndObj support)
! #SNDOBJ=/cygdrive/f/prog/audio/sndobj/include
# where is the STK include directory?
  # (leave blank or comment out to disable STK support)
! #STK=/cygdrive/f/prog/audio/stk/include
# where should flext libraries be built?
--- 11,19 ----
  # where is the SndObj include directory? 
  # (leave blank or comment out to disable SndObj support)
! #SNDOBJ=f:/prog/audio/sndobj/include
# where is the STK include directory?
  # (leave blank or comment out to disable STK support)
! #STK=f:/prog/audio/stk/include
# where should flext libraries be built?
Index: makefile.pd-cygwin
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-cygwin,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makefile.pd-cygwin	22 Feb 2004 03:33:59 -0000	1.11
--- makefile.pd-cygwin	23 Feb 2004 03:27:45 -0000	1.12
***************
*** 7,16 ****
  # to build run "make -f makefile.pd-cygwin"
  #
! # ---------------------------------------------
! #
! # compiling for threaded usage is not supported
! #
CONFIG=config-pd-cygwin.txt
include $(CONFIG)
--- 7,15 ----
  # to build run "make -f makefile.pd-cygwin"
  #
! # -----------------------------------------------------------
!
CONFIG=config-pd-cygwin.txt
+ MAKEFILE=makefile.pd-cygwin
include $(CONFIG)
***************
*** 18,22 ****
# compiler+linker stuff
! INCLUDES=$(PDPATH)/src # /usr/include
FLAGS=-DFLEXT_SYS=2 $(UFLAGS)
--- 17,22 ----
# compiler+linker stuff
! # /usr/include before the PD path is necessary to include the right pthread files!
! INCLUDES=/usr/include $(PDPATH)/src
FLAGS=-DFLEXT_SYS=2 $(UFLAGS)
***************
*** 24,29 ****
  CFLAGS_D=-DFLEXT_DEBUG -g
  CFLAGS_T=-DFLEXT_THREADS
! CFLAGS_S=-DFLEXT_SHARED
! LIBS=
INSTDIR=$(PDPATH)/flext
--- 24,30 ----
  CFLAGS_D=-DFLEXT_DEBUG -g
  CFLAGS_T=-DFLEXT_THREADS
! CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS
! 
! PDLIBS=$(PDPATH)/bin/pd.dll $(PDPATH)/bin/pthreadVC.dll
INSTDIR=$(PDPATH)/flext
***************
*** 51,55 ****
  endif
! MAKEFILE=makefile.pd-cygwin
  TARGET=$(TARGDIR)/$(NAME)-pdwin.lib
  TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.lib
--- 52,56 ----
  endif
! 
  TARGET=$(TARGDIR)/$(NAME)-pdwin.lib
  TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.lib
***************
*** 59,63 ****
  TARGET_SD=$(TARGDIR)/$(NAME)_d.dll
! TARGETS=$(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) # $(TARGET_S) $(TARGET_SD)
--- 60,64 ----
  TARGET_SD=$(TARGDIR)/$(NAME)_d.dll
! TARGETS=$(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD)
***************
*** 70,74 ****
    touch $@
! $(TARGDIR)/%.o : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
--- 71,75 ----
    touch $@
! $(TARGDIR)/%.ro : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
***************
*** 76,80 ****
    $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
! $(TARGDIR)/%.to : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
--- 77,81 ----
    $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
! $(TARGDIR)/%.tro : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
***************
*** 82,86 ****
    $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
! $(TARGDIR)/%.so : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
--- 83,87 ----
    $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
! $(TARGDIR)/%.sro : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
***************
*** 89,114 ****
! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 755 $@
$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 755 $@
! $(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.to,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 755 $@
$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 755 $@
! $(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.so,$(SRCS))
! 	$(CXX) -o $@ $^
    chmod 755 $@
$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS))
! 	$(CXX) -o $@ $^
    chmod 755 $@
--- 90,116 ----
! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 644 $@
$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 644 $@
! $(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 644 $@
$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 644 $@
! $(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.sro,$(SRCS))
! 	$(CXX) -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS)
! 	strip --strip-unneeded $@
    chmod 755 $@
$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS))
! 	$(CXX) -g -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS)
    chmod 755 $@
Index: makefile.pd-linux
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-linux,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** makefile.pd-linux	7 Nov 2003 03:32:53 -0000	1.17
--- makefile.pd-linux	23 Feb 2004 03:27:45 -0000	1.18
***************
*** 107,123 ****
$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS)) 
! 	ar rc $@ $^
    chmod 644 $@
$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) 
! 	ar rc $@ $^ 
    chmod 644 $@
$(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS))
! 	ar rc $@ $^
    chmod 644 $@
$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
! 	ar rc $@ $^
    chmod 644 $@
--- 107,123 ----
$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS)) 
! 	$(AR) rc $@ $^
    chmod 644 $@
$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS)) 
! 	$(AR) rc $@ $^ 
    chmod 644 $@
$(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS))
! 	$(AR) rc $@ $^
    chmod 644 $@
$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
! 	$(AR) rc $@ $^
    chmod 644 $@
Index: makefile.pd-mingw
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/makefile.pd-mingw,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makefile.pd-mingw	22 Feb 2004 03:33:59 -0000	1.1
--- makefile.pd-mingw	23 Feb 2004 03:27:45 -0000	1.2
***************
*** 8,16 ****
  #
  # ---------------------------------------------
! #
! # compiling for threaded usage is not supported
! #
CONFIG=config-pd-mingw.txt
include $(CONFIG)
--- 8,15 ----
  #
  # ---------------------------------------------
!
CONFIG=config-pd-mingw.txt
+ MAKEFILE=makefile.pd-mingw
include $(CONFIG)
***************
*** 18,22 ****
# compiler+linker stuff
! INCLUDES=$(PDPATH)/src  # /usr/include
FLAGS=-DFLEXT_SYS=2 $(UFLAGS)
--- 17,21 ----
# compiler+linker stuff
! INCLUDES=$(PDPATH)/src
FLAGS=-DFLEXT_SYS=2 $(UFLAGS)
***************
*** 24,29 ****
  CFLAGS_D=-DFLEXT_DEBUG -g
  CFLAGS_T=-DFLEXT_THREADS
! CFLAGS_S=-DFLEXT_SHARED
! LIBS=
INSTDIR=$(PDPATH)/flext
--- 23,29 ----
  CFLAGS_D=-DFLEXT_DEBUG -g
  CFLAGS_T=-DFLEXT_THREADS
! CFLAGS_S=-DFLEXT_SHARED -DFLEXT_EXPORTS
! 
! PDLIBS=$(PDPATH)/bin/pd.dll $(PDPATH)/bin/pthreadVC.dll
INSTDIR=$(PDPATH)/flext
***************
*** 51,72 ****
  endif
! MAKEFILE=makefile.pd-mingw
  TARGET=$(TARGDIR)/$(NAME)-pdwin.lib
  TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.lib
  TARGET_T=$(TARGDIR)/$(NAME)_t-pdwin.lib
  TARGET_TD=$(TARGDIR)/$(NAME)_td-pdwin.lib
! TARGETS=$(TARGET) $(TARGET_D) # $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD)
all: $(TARGDIR) $(TARGETS)
  $(TARGDIR):
    -mkdir $(TARGDIR)
$(SRCS): $(HDRS) $(IHDRS) $(MAKEFILE) $(CONFIG)
! 	touch $@
!
! $(TARGDIR)/%.o : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
--- 51,74 ----
  endif
! 
  TARGET=$(TARGDIR)/$(NAME)-pdwin.lib
  TARGET_D=$(TARGDIR)/$(NAME)_d-pdwin.lib
  TARGET_T=$(TARGDIR)/$(NAME)_t-pdwin.lib
  TARGET_TD=$(TARGDIR)/$(NAME)_td-pdwin.lib
+ TARGET_S=$(TARGDIR)/$(NAME).dll
+ TARGET_SD=$(TARGDIR)/$(NAME)_d.dll
! TARGETS=$(TARGET) $(TARGET_D) $(TARGET_T) $(TARGET_TD) $(TARGET_S) $(TARGET_SD)
all: $(TARGDIR) $(TARGETS)
+ 
  $(TARGDIR):
    -mkdir $(TARGDIR)
$(SRCS): $(HDRS) $(IHDRS) $(MAKEFILE) $(CONFIG)
! #	echo touch $@  # minGW has no touch
! $(TARGDIR)/%.ro : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
***************
*** 74,78 ****
    $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
! $(TARGDIR)/%.to : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
--- 76,80 ----
    $(CXX) -c $(CFLAGS_D) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
! $(TARGDIR)/%.tro : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
***************
*** 80,84 ****
    $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
! $(TARGDIR)/%.so : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
--- 82,86 ----
    $(CXX) -c $(CFLAGS_D) $(CFLAGS_T) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
! $(TARGDIR)/%.sro : $(SRCDIR)/%.cpp
    $(CXX) -c $(CFLAGS) $(CFLAGS_S) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(SRCDIR)) $< -o $@
***************
*** 87,112 ****
! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 755 $@
$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 755 $@
! $(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.to,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 755 $@
$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 755 $@
! $(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.so,$(SRCS))
! 	$(CXX) -o $@ $^
    chmod 755 $@
$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS))
! 	$(CXX) -o $@ $^
    chmod 755 $@
--- 89,115 ----
! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.ro,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 644 $@
$(TARGET_D) : $(patsubst %.cpp,$(TARGDIR)/%.do,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 644 $@
! $(TARGET_T) : $(patsubst %.cpp,$(TARGDIR)/%.tro,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 644 $@
$(TARGET_TD) : $(patsubst %.cpp,$(TARGDIR)/%.tdo,$(SRCS))
    $(AR) rc $@ $^
! 	chmod 644 $@
! $(TARGET_S) : $(patsubst %.cpp,$(TARGDIR)/%.sro,$(SRCS))
! 	$(CXX) -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS)
! 	strip --strip-unneeded $@
    chmod 755 $@
$(TARGET_SD) : $(patsubst %.cpp,$(TARGDIR)/%.sdo,$(SRCS))
! 	$(CXX) -g -shared $(patsubst %,-L%,$(LIBPATH)) -o $@ $^ $(PDLIBS)
    chmod 755 $@