[PD-cvs] externals/grill/xsample build-max-msvc.bat,NONE,1.1 config-max-msvc.txt,NONE,1.1 makefile.max-msvc,NONE,1.1 readme.txt,1.18,1.19 xsample.cw,1.30,1.31 xsample.vcproj,1.5,1.6

Sat Apr 24 15:59:43 CEST 2004

Update of /cvsroot/pure-data/externals/grill/xsample
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9577

Modified Files:
	readme.txt xsample.cw xsample.vcproj 
Added Files:
	build-max-msvc.bat config-max-msvc.txt makefile.max-msvc 
Log Message:
 ""

--- NEW FILE: makefile.max-msvc ---
# xsample - extended sample objects for Max/MSP and pd (pure data)
# Copyright (c) 2001-2004 Thomas Grill (xovo at gmx.net)
#
# Makefile for MSVC++ 6 and .NET
#
# usage:
# to build run "make -f makefile.max-msvc"
#

!include config-max-msvc.txt

# includes
INCPATH=/I$(MAXSDKPATH)\max-includes /I$(MAXSDKPATH)\msp-includes /I$(FLEXTPATH)
LDFLAGS=/LIBPATH:$(FLEXTPATH)

!ifdef MSVCPATH
INCPATH=$(INCPATH) /I$(MSVCPATH)\include 
LDFLAGS=$(LDFLAGS) /LIBPATH:$(MSVCPATH)\lib
!endif

!ifdef _DEBUG
LIBS=flext_d-maxwin.lib 
!else
LIBS=flext-maxwin.lib 
!endif

LDFLAGS=$(LDFLAGS) /LIBPATH:$(MAXSDKPATH)\max-includes /LIBPATH:$(MAXSDKPATH)\msp-includes

LIBS=$(LIBS) maxapi.lib maxaudio.lib

# compiler definitions and flags
DEFS=/DFLEXT_SYS=1 $(UFLAGS)

CFLAGS=/ML /GR- /GD /Ox /GX /Zp2

# the rest can stay untouched
# ----------------------------------------------

# all the source files from the package
!include make-files.txt

# -----------------------------------------------

NAME=xsample
EXT=mxe
DIR=source

all: $(OUTPATH) $(OUTPATH)\$(NAME).$(EXT)

# remove build
clean:
	-del /q $(OUTPATH) > nul
	-rmdir $(OUTPATH) > nul

OBJS= $(SRCS:.c=.obj)
OBJS= $(OBJS:.objpp=.obj)

$(OUTPATH):
	-mkdir $(OUTPATH) > nul

{$(DIR)}.cpp{}.obj:
	cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)/$@

{$(DIR)}.c{}.obj:
	cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)/$@

$(OUTPATH)\$(NAME).$(EXT): $(OBJS)
	cd $(OUTPATH)
	link /DLL $(LDFLAGS) /out:$(NAME).$(EXT) /INCREMENTAL:NO $** $(LIBS) $(LIBPATH)
	@-del *.exp
	@-del *.lib
	cd ..
!ifdef INSTPATH
	@-if not exist $(INSTPATH) mkdir $(INSTPATH)
	copy $@ $(INSTPATH) > nul
!endif

--- NEW FILE: build-max-msvc.bat ---
@echo --- Building with MS Visual C++ ---

nmake -f makefile.max-msvc clean
nmake -f makefile.max-msvc

Index: readme.txt
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/readme.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** readme.txt	8 Feb 2004 03:40:47 -0000	1.18
--- readme.txt	24 Apr 2004 13:59:40 -0000	1.19
***************
*** 5,9 ****
  WARRANTIES, see the file, "license.txt," in this distribution.  

! Donations for further development of the package are highly appreciated.
  Visit https://www.paypal.com/xclick/business=t.grill%40gmx.net&item_name=xsample&no_note=1&tax=0&currency_code=EUR

--- 5,13 ----
  WARRANTIES, see the file, "license.txt," in this distribution.  

! ----------------------------------------------------------------------------
! 
! Maximum care has been taken to prepare a delightful experience for you electronic artists.
! Donations for further development of the package are HIGHLY APPRECIATED.
! 
  Visit https://www.paypal.com/xclick/business=t.grill%40gmx.net&item_name=xsample&no_note=1&tax=0&currency_code=EUR

***************
*** 13,32 ****

  1) 
! For OSX it is best to put the xsample file somewhere in your Max/MSP search path and drop the file 
! xsample-objectmappings.txt into the folder /Library/Application Support/Cycling '74/init .

! For Windows put the xsample file somewhere in your Max/MSP search path and drop the file
! xsample-objectmappings-win.txt in
  C:\program files\common files\Cycling '74\init (english version)
- or
- C:\Programme\Gemeinsame Dateien\Cycling '74\init (german version)

! 2) 
! Otherwise (or for OS9) it is advisable to put the xsample shared library file into the "max-startup" folder. 
! Hence it will be loaded at Max startup.

! 3) 
! If you want to load the xsample library on demand, use the "install" option of the Max file menu
! and point it to the xsample file or create a [xsample] object in Max/MSP.

  ----------------------------------------------------------------------------
--- 17,35 ----

  1) 
! For Mac OSX it is best to put the max-osx/xsample.mxd file into the folder 
! /Library/Application Support/Cycling '74/externals
! and the file maxmsp/xsample-objectmappings.txt into the folder 
! /Library/Application Support/Cycling '74/init .

! For Windows put the max-msvc\xsample.mxe file into the folder
! C:\program files\common files\Cycling '74\externals (english version)
! and the file maxmsp/xsample-objectmappings.txt in
  C:\program files\common files\Cycling '74\init (english version)

! Put the maxmsp/xsample.help file into the max-help folder.

! 2) 
! Alternatively (or for OS9) it is advisable to put the xsample.mxd or xsample.mxe file 
! into the "max-startup" folder. Hence it will be loaded at Max startup.

  ----------------------------------------------------------------------------
***************
*** 47,51 ****
  - readme.txt: this one
  - gpl.txt,license.txt: GPL license stuff
! - main.h,main.cpp,inter.cpp,inter.ci: base class definition for all the other objects
  - record.cpp: xrecord~
  - play.cpp: xplay~
--- 50,54 ----
  - readme.txt: this one
  - gpl.txt,license.txt: GPL license stuff
! - main.h,main.cpp,inter.cpp,inter.h: base class definition for all the other objects
  - record.cpp: xrecord~
  - play.cpp: xplay~
***************
*** 54,59 ****
  ----------------------------------------------------------------------------

! BUILDING XSAMPLE
! ----------------

  The package should at least compile (and is tested) with the following compilers:
--- 57,62 ----
  ----------------------------------------------------------------------------

! BUILDING XSAMPLE from source
! ----------------------------

  The package should at least compile (and is tested) with the following compilers:
***************
*** 61,68 ****
  pd - Windows:
  -------------
! o Microsoft Visual C++ 6 command line: edit "config-pd-msvc.txt" and run "build-pd-msvc.bat"
! 
! o Microsoft Visual C++ 6 IDE: edit "xsample.dsp" project file
! > due to a compiler bug the optimization using templates is not functional

  o BCC: edit "config-pd-bcc.txt" and run "build-pd-bcc.bat"
--- 64,68 ----
  pd - Windows:
  -------------
! o Microsoft Visual C++ 6 or .NET command line: edit "config-pd-msvc.txt" and run "build-pd-msvc.bat"

  o BCC: edit "config-pd-bcc.txt" and run "build-pd-bcc.bat"
***************
*** 71,74 ****
--- 71,77 ----
  > various versions of GCC die during compile with template optimization turned on 

+ o MinGW: edit "config-pd-mingw.txt" and run "build-pd-mingw.bat"
+ > MinGW binary folder must be included in the system path!
+ 
  pd - linux:
  -----------
***************
*** 83,87 ****
  Max/MSP - MacOS9:
  ----------------
! o Metrowerks CodeWarrior: edit "xsample.cw" project file functions

  o Apple MPW-PR: edit & use the "flext.mpw" makefile
--- 86,90 ----
  Max/MSP - MacOS9:
  ----------------
! o Metrowerks CodeWarrior: "xsample.cw" project file

  o Apple MPW-PR: edit & use the "flext.mpw" makefile
***************
*** 89,93 ****
  Max/MSP - MacOSX:
  ----------------
! o Metrowerks CodeWarrior: edit "xsample.cw" project file functions

--- 92,100 ----
  Max/MSP - MacOSX:
  ----------------
! o Metrowerks CodeWarrior: "xsample.cw" project file
! 
! Max/MSP - Windows:
! ----------------
! o Microsoft Visual C++ 6 or .NET command line: edit "config-max-msvc.txt" and run "build-max-msvc.bat"

***************
*** 103,107 ****
  - live update of respective buffer/array content
  - switchable 4-point or linear interpolation for xplay~/xgroove~ object
! - cross-fading loop zone (inside or outside to loop) for xgroove~

  ----------------------------------------------------------------------------
--- 110,114 ----
  - live update of respective buffer/array content
  - switchable 4-point or linear interpolation for xplay~/xgroove~ object
! - cross-fading loop zone for xgroove~

  ----------------------------------------------------------------------------

Index: xsample.cw
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/xsample.cw,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
Binary files /tmp/cvslJblNl and /tmp/cvs2wquUI differ

--- NEW FILE: config-max-msvc.txt ---
# xsample - extended sample objects for Max/MSP and pd (pure data)
# Copyright (c) 2001-2004 Thomas Grill (xovo at gmx.net)
#

# where is the Max SDK?
# you should have the latest version!
MAXSDKPATH="F:\prog\audio\MaxWinSDK\c74support"	

# where do the flext libraries reside?
FLEXTPATH="%CommonProgramFiles%\Cycling '74\flext"

# where is MS VC++?
# (need not be defined if the build is started with the compiler environment set)
# MSVCPATH="c:\programme\prog\microsoft visual studio\VC98"

# where should the external be built?
# (path for temporary files)
OUTPATH=max-msvc

# where should the external be installed?
# (leave blank to omit installation)
INSTPATH="%CommonProgramFiles%\Cycling '74\externals\flext"

# some user-definable flags
# (check if they match your system!)
UFLAGS=/G6 /arch:SSE

Index: xsample.vcproj
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/xsample.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xsample.vcproj	29 Nov 2003 03:37:15 -0000	1.5
--- xsample.vcproj	24 Apr 2004 13:59:41 -0000	1.6
***************
*** 290,298 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib "
  				OutputFile="max-msvc\d\xsample.mxe"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\debug&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\debug&quot;;..\flext\max-msvc"
  				GenerateDebugInformation="TRUE"
  				TargetMachine="1"/>
--- 290,298 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="maxapi.lib  maxaudio.lib "
  				OutputFile="max-msvc\d\xsample.mxe"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes&quot;;..\flext\max-msvc"
  				GenerateDebugInformation="TRUE"
  				TargetMachine="1"/>
***************
*** 343,347 ****
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=1"
  				StringPooling="TRUE"
! 				RuntimeLibrary="4"
  				EnableFunctionLevelLinking="TRUE"
  				UsePrecompiledHeader="2"
--- 343,347 ----
  				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=1"
  				StringPooling="TRUE"
! 				RuntimeLibrary="0"
  				EnableFunctionLevelLinking="TRUE"
  				UsePrecompiledHeader="2"
***************
*** 353,361 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib "
  				OutputFile="max-msvc\xsample.mxe"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\release&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\release&quot;;..\flext\max-msvc"
  				ImportLibrary=".\max-msvc\r/xsample.lib"
  				TargetMachine="1"/>
--- 353,361 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="maxapi.lib  maxaudio.lib "
  				OutputFile="max-msvc\xsample.mxe"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
! 				AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes&quot;;&quot;..\flext\max-msvc&quot;"
  				ImportLibrary=".\max-msvc\r/xsample.lib"
  				TargetMachine="1"/>