You can subscribe to this list here.
2003 |
Jan
|
Feb
(8) |
Mar
(7) |
Apr
(14) |
May
(6) |
Jun
(3) |
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(12) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
|
Feb
|
Mar
(13) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
(14) |
Dec
|
2005 |
Jan
(2) |
Feb
(9) |
Mar
(5) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(6) |
Dec
|
2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <tom...@us...> - 2003-06-14 12:44:26
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv26691 Added Files: CMakeLists.txt Log Message: First commit; only for Linux so far. Assumes that all needed libraries are installed - i.e. no tests are made... --- NEW FILE: CMakeLists.txt --- PROJECT(OPENALPP) IF(UNIX) SET(INCLUDEDIRS /usr/include /usr/local/include) ELSE(UNIX) SET(INCLUDEDIRS C:\) ENDIF(UNIX) FIND_PATH(PORTAUDIO_INCLUDE portaudio.h ${INCLUDEDIRS}) FIND_PATH(VORBIS_INCLUDE vorbis/vorbisfile.h ${INCLUDEDIRS}) IF(UNIX) SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-I`ccgnu2-config --includes`") ELSE(UNIX) #SET() ENDIF(UNIX) INCLUDE_DIRECTORIES(${PORTAUDIO_INCLUDE} ${VORBIS_INCLUDE} ../include) IF(UNIX) SET(LIBDIRS /usr/lib /usr/local/lib) ELSE(UNIX) SET(LIBDIRS C:\) ENDIF(UNIX) LINK_DIRECTORIES(${LIBDIRS}) SUBDIRS(src tests) |
From: <tom...@us...> - 2003-05-23 22:41:52
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1:/tmp/cvs-serv29267 Modified Files: nofilestream.cpp Log Message: Added support for looping file streams. Index: nofilestream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/nofilestream.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** nofilestream.cpp 16 Apr 2003 11:15:05 -0000 1.3 --- nofilestream.cpp 23 May 2003 22:13:20 -0000 1.4 *************** *** 43,45 **** --- 43,48 ---- } + void FileStream::SetLooping(bool loop) { + } + } |
From: <tom...@us...> - 2003-05-23 15:08:06
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1:/tmp/cvs-serv27441 Modified Files: filestream.cpp filestreamupdater.cpp Log Message: Added support for looping file streams. Index: filestream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/filestream.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** filestream.cpp 16 Apr 2003 11:15:04 -0000 1.4 --- filestream.cpp 23 May 2003 14:47:10 -0000 1.5 *************** *** 82,84 **** --- 82,88 ---- } + void FileStream::SetLooping(bool loop) { + ((FileStreamUpdater *)updater_)->SetLooping(loop); + } + } Index: filestreamupdater.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/filestreamupdater.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** filestreamupdater.cpp 15 Feb 2003 02:32:31 -0000 1.1 --- filestreamupdater.cpp 23 May 2003 14:47:10 -0000 1.2 *************** *** 51,57 **** int stream; while(count<buffersize_) { ! unsigned int amt=ov_read(oggfile_,&((char *)buffer)[count], ! buffersize_-count, ! 0,2,1,&stream); if(amt<=0) break; --- 51,70 ---- int stream; while(count<buffersize_) { ! unsigned int amt; ! do { ! amt=ov_read(oggfile_,&((char *)buffer)[count], ! buffersize_-count, ! 0,2,1,&stream); ! if(looping_ && amt==0) { ! if(!ov_seekable(oggfile_)) ! break; ! if(!ov_time_seek(oggfile_,0.0)) ! break; ! } ! } while(looping_ && amt==0); ! // We must break if: ! // * An error occurred ! // * We hit EOF and the file was not looping ! // * We hit EOF and the file was looping, but we couldn't loop... if(amt<=0) break; *************** *** 67,70 **** --- 80,87 ---- runmutex_.leaveMutex(); delete []buffer; + } + + void FileStreamUpdater::SetLooping(bool loop) { + looping_=loop; } |
From: <tom...@us...> - 2003-05-23 14:51:50
|
Update of /cvsroot/alpp/openalpp/tests In directory sc8-pr-cvs1:/tmp/cvs-serv29427 Modified Files: testfstream.cpp Log Message: Made stream looping Index: testfstream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/testfstream.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** testfstream.cpp 16 Apr 2003 11:15:10 -0000 1.4 --- testfstream.cpp 23 May 2003 14:51:43 -0000 1.5 *************** *** 42,45 **** --- 42,46 ---- try { FileStream stream(argv[1]); + stream.SetLooping(); // Remove this to play file once only. Source source(stream); |
From: <tom...@us...> - 2003-05-23 14:49:10
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1:/tmp/cvs-serv28218 Modified Files: filestreamupdater.cpp Log Message: Forgot to initialize a variable... Index: filestreamupdater.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/filestreamupdater.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** filestreamupdater.cpp 23 May 2003 14:47:10 -0000 1.2 --- filestreamupdater.cpp 23 May 2003 14:49:07 -0000 1.3 *************** *** 31,35 **** ALenum format,unsigned int frequency, unsigned int buffersize) ! : StreamUpdater(buffer1,buffer2,format,frequency),buffersize_(buffersize) { oggfile_=new OggVorbis_File(oggfile); } --- 31,36 ---- ALenum format,unsigned int frequency, unsigned int buffersize) ! : StreamUpdater(buffer1,buffer2,format,frequency),buffersize_(buffersize), ! looping_(false) { oggfile_=new OggVorbis_File(oggfile); } |
From: <tom...@us...> - 2003-05-23 14:46:46
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv27260 Modified Files: filestream.h filestreamupdater.h Log Message: Added support for looping file streams. Index: filestream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestream.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** filestream.h 16 Apr 2003 11:15:01 -0000 1.4 --- filestream.h 23 May 2003 14:46:43 -0000 1.5 *************** *** 58,61 **** --- 58,67 ---- FileStream &operator=(const FileStream &stream); + + /** + * Turn on/off looping. + * @param loop is true if the stream should loop, false otherwise. + */ + void SetLooping(bool loop = true); }; Index: filestreamupdater.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestreamupdater.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** filestreamupdater.h 16 Apr 2003 12:16:43 -0000 1.3 --- filestreamupdater.h 23 May 2003 14:46:43 -0000 1.4 *************** *** 41,44 **** --- 41,45 ---- OggVorbis_File *oggfile_; // The file structure unsigned int buffersize_; // Size of the buffer in bytes + bool looping_; // Are we looping or not? public: /** *************** *** 66,69 **** --- 67,76 ---- */ OPENALPP_API void run(); + + /** + * Turn on/off looping. + * @param loop is true if the stream should loop, false otherwise. + */ + void SetLooping(bool loop = true); }; |
From: <tom...@us...> - 2003-05-23 14:20:38
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1:/tmp/cvs-serv15380 Modified Files: sourcebase.cpp Log Message: Added explicit initialization of PositionedObject in SourceBase copy constructor. Index: sourcebase.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/sourcebase.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sourcebase.cpp 18 Oct 2002 07:50:14 -0000 1.6 --- sourcebase.cpp 23 May 2003 14:20:33 -0000 1.7 *************** *** 64,68 **** } ! SourceBase::SourceBase(const SourceBase &sourcebase) { float a,b,c; sourcebase.GetPosition(a,b,c); --- 64,69 ---- } ! SourceBase::SourceBase(const SourceBase &sourcebase) ! : PositionedObject(sourcebase) { float a,b,c; sourcebase.GetPosition(a,b,c); |
From: <vr-...@us...> - 2003-04-16 12:16:46
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv4430/include/openalpp Modified Files: filestreamupdater.h Log Message: Index: filestreamupdater.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestreamupdater.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** filestreamupdater.h 16 Apr 2003 11:15:01 -0000 1.2 --- filestreamupdater.h 16 Apr 2003 12:16:43 -0000 1.3 *************** *** 38,42 **** * Updater for streams from files. */ ! class OPENALPP_API FileStreamUpdater : public StreamUpdater { OggVorbis_File *oggfile_; // The file structure unsigned int buffersize_; // Size of the buffer in bytes --- 38,42 ---- * Updater for streams from files. */ ! class FileStreamUpdater : public StreamUpdater { OggVorbis_File *oggfile_; // The file structure unsigned int buffersize_; // Size of the buffer in bytes *************** *** 51,55 **** * @param buffersize is the size of the buffer (in bytes) */ ! FileStreamUpdater(const OggVorbis_File &oggfile, const ALuint buffer1,ALuint buffer2, ALenum format,unsigned int frequency, --- 51,55 ---- * @param buffersize is the size of the buffer (in bytes) */ ! OPENALPP_API FileStreamUpdater(const OggVorbis_File &oggfile, const ALuint buffer1,ALuint buffer2, ALenum format,unsigned int frequency, *************** *** 59,63 **** * Destructor. */ ! ~FileStreamUpdater(); /** --- 59,63 ---- * Destructor. */ ! OPENALPP_API ~FileStreamUpdater(); /** *************** *** 65,69 **** * This will be called when the updater is Start():ed.. */ ! void run(); }; --- 65,69 ---- * This will be called when the updater is Start():ed.. */ ! OPENALPP_API void run(); }; |
From: <vr-...@us...> - 2003-04-16 12:16:46
|
Update of /cvsroot/alpp/openalpp/VisualStudio In directory sc8-pr-cvs1:/tmp/cvs-serv4430/VisualStudio Modified Files: openalpp.vcproj Log Message: Index: openalpp.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** openalpp.vcproj 16 Apr 2003 11:15:00 -0000 1.2 --- openalpp.vcproj 16 Apr 2003 12:16:42 -0000 1.3 *************** *** 45,49 **** AdditionalOptions="/MACHINE:I386" AdditionalDependencies="ccgnu2d.lib alut.lib openal32.lib vorbisfile_d.lib ogg_d.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib" ! OutputFile="../bin/openalppd.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" --- 45,49 ---- AdditionalOptions="/MACHINE:I386" AdditionalDependencies="ccgnu2d.lib alut.lib openal32.lib vorbisfile_d.lib ogg_d.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib" ! OutputFile="$(OutDir)/$(ProjectName)d.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" *************** *** 76,80 **** <Configuration Name="Release|Win32" ! OutputDirectory=".\../lib" IntermediateDirectory=".\Release" ConfigurationType="2" --- 76,80 ---- <Configuration Name="Release|Win32" ! OutputDirectory="../lib" IntermediateDirectory=".\Release" ConfigurationType="2" |
From: <vr-...@us...> - 2003-04-16 11:39:49
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv20665 Modified Files: Makefile.am groupsource.h Log Message: Index: Makefile.am =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 24 Feb 2003 13:04:45 -0000 1.2 --- Makefile.am 16 Apr 2003 11:39:42 -0000 1.3 *************** *** 21,23 **** --- 21,24 ---- filestream.h \ filestreamupdater.h \ + export.h \ windowsstuff.h Index: groupsource.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/groupsource.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** groupsource.h 16 Apr 2003 11:33:55 -0000 1.4 --- groupsource.h 16 Apr 2003 11:39:43 -0000 1.5 *************** *** 1,158 **** ! /** ! * OpenAL++ - an object oriented toolkit for spatial sound ! * Copyright (C) 2002 VRlab, Umeå University ! * ! * OpenAL++ was created using the libraries: ! * OpenAL (http://www.openal.org), ! * PortAudio (http://www.portaudio.com/), and ! * CommonC++ (http://cplusplus.sourceforge.net/) ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ! */ ! ! #ifndef GROUPSOURCE_H_INCLUDED_C427B440 ! #define GROUPSOURCE_H_INCLUDED_C427B440 ! ! #include "openalpp/export.h" ! ! #include "openalpp/source.h" ! #include "openalpp/audioconvert.h" ! #include <vector> ! #include <math.h> ! #include <stdlib.h> ! ! namespace openalpp { ! ! /** ! * Class for group sources. ! * Used for mixing together several sources _before_ they are played. This can ! * be used to play more sounds with less processing power. Of course the ! * problem is that the sources cannot be moved separately. ! */ ! class GroupSource : public SourceBase { ! /** ! * Flag for whether the sources have been mixed yet. ! */ ! bool mixed_; ! ! /** ! * Vector containing the sources in the group. ! */ ! std::vector<Source *> sources_; ! ! /** ! * OpenAL buffer for the group source. ! */ ! ALuint buffer_; ! ! typedef enum Speaker {Left,Right}; ! ! /** ! * Handles distance attenuation and directional sources. ! * @param source is the source to filter. ! * @return the gain. ! */ ! OPENALPP_API ALfloat GroupSource::FilterDistance(ALuint source,Speaker speaker); ! ! /** ! * Reverb filter. ! * @param source is (a pointer to) the source. ! * @param buffer is (a pointer to) the buffer (=memory area). ! * @param size is the size of the buffer. ! * @param frequency is the freguency of the sound. ! * @return new pointer to buffer. ! */ ! OPENALPP_API ALshort *GroupSource::FilterReverb(Source *source,ALshort *buffer, ! ALsizei &size,unsigned int frequency); ! ! /** ! * Apply filters. ! * @param source is (a pointer to) the source. ! * @param buffer is the buffer containing the sound. ! * @param size is the size of the buffer. ! * @param frequency is the frequency of the sound. ! * @return (new) pointer to buffer. ! */ ! OPENALPP_API ALshort *ApplyFilters(Source *source,ALshort *buffer,ALsizei &size, ! unsigned int frequency); ! public: ! /** ! * Constructor. ! * Creates the group source at the specified position. ! * @param x x coordinate. ! * @param y y coordinate. ! * @param z z coordinate. ! */ ! OPENALPP_API GroupSource(float x = 0.0, float y = 0.0, float z = 0.0) throw (NameError); ! ! /** ! * Same as SourceBase::Play, except that this mixes the sources in the ! * group if it haven't been done yet. ! */ ! OPENALPP_API void Play() throw (InitError,FileError); ! ! /** ! * Mix all added sources into one. This function will be called by ! * Play(), if sources have been included since the last time MixSamples() ! * was called, so if you want the source to start playing as fast as ! * possible after the Play()-call, MixSources() should be called ! * separately ! * @param frequency is the frequency that will be used when mixing. ! */ ! OPENALPP_API void MixSources(unsigned int frequency=22050) ! throw (InitError,FileError,FatalError,MemoryError,ValueError); ! ! /** ! * Includes a source in the group. ! * Returns an identifier that can be used as an argument to ExcludeSource(). ! * This identifier is also the OpenAL name for the included source. ! * @param source is (a pointer to) the source to include. ! * @return identifier for the source. ! */ ! OPENALPP_API ALuint IncludeSource(Source *source) throw (ValueError); ! ! /** ! * Removes a source from the group. ! * This will of course require the remaining sources to be mixed again. ! * @param source is the source to exclude. ! */ ! OPENALPP_API void ExcludeSource(const Source &source) throw (NameError); ! ! /** ! * Removes a source from the group. ! * This will of course require the remaining sources to be mixed again. ! * @param source is the identifier of the source to exclude. ! */ ! OPENALPP_API void ExcludeSource(ALuint source) throw (NameError); ! ! /** ! * Copy constructor. ! */ ! OPENALPP_API GroupSource(const GroupSource &groupsource); ! ! /** ! * Destructor. ! */ ! OPENALPP_API ~GroupSource(); ! ! /** ! * Assignment operator. ! */ ! OPENALPP_API GroupSource &operator=(const GroupSource &groupsource); ! }; ! ! } ! ! #endif /* GROUPSOURCE_H_INCLUDED_C427B440 */ --- 1,157 ---- ! /** ! * OpenAL++ - an object oriented toolkit for spatial sound ! * Copyright (C) 2002 VRlab, Umeå University ! * ! * OpenAL++ was created using the libraries: ! * OpenAL (http://www.openal.org), ! * PortAudio (http://www.portaudio.com/), and ! * CommonC++ (http://cplusplus.sourceforge.net/) ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ! */ ! ! #ifndef GROUPSOURCE_H_INCLUDED_C427B440 ! #define GROUPSOURCE_H_INCLUDED_C427B440 ! ! #include "openalpp/source.h" ! #include "openalpp/audioconvert.h" ! #include <vector> ! #include <math.h> ! #include <stdlib.h> ! #include "openalpp/export.h" ! ! namespace openalpp { ! ! /** ! * Class for group sources. ! * Used for mixing together several sources _before_ they are played. This can ! * be used to play more sounds with less processing power. Of course the ! * problem is that the sources cannot be moved separately. ! */ ! class GroupSource : public SourceBase { ! /** ! * Flag for whether the sources have been mixed yet. ! */ ! bool mixed_; ! ! /** ! * Vector containing the sources in the group. ! */ ! std::vector<Source *> sources_; ! ! /** ! * OpenAL buffer for the group source. ! */ ! ALuint buffer_; ! ! typedef enum Speaker {Left,Right}; ! ! /** ! * Handles distance attenuation and directional sources. ! * @param source is the source to filter. ! * @return the gain. ! */ ! OPENALPP_API ALfloat GroupSource::FilterDistance(ALuint source,Speaker speaker); ! ! /** ! * Reverb filter. ! * @param source is (a pointer to) the source. ! * @param buffer is (a pointer to) the buffer (=memory area). ! * @param size is the size of the buffer. ! * @param frequency is the freguency of the sound. ! * @return new pointer to buffer. ! */ ! OPENALPP_API ALshort *GroupSource::FilterReverb(Source *source,ALshort *buffer, ! ALsizei &size,unsigned int frequency); ! ! /** ! * Apply filters. ! * @param source is (a pointer to) the source. ! * @param buffer is the buffer containing the sound. ! * @param size is the size of the buffer. ! * @param frequency is the frequency of the sound. ! * @return (new) pointer to buffer. ! */ ! OPENALPP_API ALshort *ApplyFilters(Source *source,ALshort *buffer,ALsizei &size, ! unsigned int frequency); ! public: ! /** ! * Constructor. ! * Creates the group source at the specified position. ! * @param x x coordinate. ! * @param y y coordinate. ! * @param z z coordinate. ! */ ! OPENALPP_API GroupSource(float x = 0.0, float y = 0.0, float z = 0.0) throw (NameError); ! ! /** ! * Same as SourceBase::Play, except that this mixes the sources in the ! * group if it haven't been done yet. ! */ ! OPENALPP_API void Play() throw (InitError,FileError); ! ! /** ! * Mix all added sources into one. This function will be called by ! * Play(), if sources have been included since the last time MixSamples() ! * was called, so if you want the source to start playing as fast as ! * possible after the Play()-call, MixSources() should be called ! * separately ! * @param frequency is the frequency that will be used when mixing. ! */ ! OPENALPP_API void MixSources(unsigned int frequency=22050) ! throw (InitError,FileError,FatalError,MemoryError,ValueError); ! ! /** ! * Includes a source in the group. ! * Returns an identifier that can be used as an argument to ExcludeSource(). ! * This identifier is also the OpenAL name for the included source. ! * @param source is (a pointer to) the source to include. ! * @return identifier for the source. ! */ ! OPENALPP_API ALuint IncludeSource(Source *source) throw (ValueError); ! ! /** ! * Removes a source from the group. ! * This will of course require the remaining sources to be mixed again. ! * @param source is the source to exclude. ! */ ! OPENALPP_API void ExcludeSource(const Source &source) throw (NameError); ! ! /** ! * Removes a source from the group. ! * This will of course require the remaining sources to be mixed again. ! * @param source is the identifier of the source to exclude. ! */ ! OPENALPP_API void ExcludeSource(ALuint source) throw (NameError); ! ! /** ! * Copy constructor. ! */ ! OPENALPP_API GroupSource(const GroupSource &groupsource); ! ! /** ! * Destructor. ! */ ! OPENALPP_API ~GroupSource(); ! ! /** ! * Assignment operator. ! */ ! OPENALPP_API GroupSource &operator=(const GroupSource &groupsource); ! }; ! ! } ! ! #endif /* GROUPSOURCE_H_INCLUDED_C427B440 */ |
From: <vr-...@us...> - 2003-04-16 11:34:00
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv17529 Modified Files: groupsource.h Log Message: Index: groupsource.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/groupsource.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** groupsource.h 16 Apr 2003 11:15:01 -0000 1.3 --- groupsource.h 16 Apr 2003 11:33:55 -0000 1.4 *************** *** 1,158 **** ! /** ! * OpenAL++ - an object oriented toolkit for spatial sound ! * Copyright (C) 2002 VRlab, Umeå University ! * ! * OpenAL++ was created using the libraries: ! * OpenAL (http://www.openal.org), ! * PortAudio (http://www.portaudio.com/), and ! * CommonC++ (http://cplusplus.sourceforge.net/) ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ! */ ! ! #ifndef GROUPSOURCE_H_INCLUDED_C427B440 ! #define GROUPSOURCE_H_INCLUDED_C427B440 ! ! #include "openalpp/export.h" ! ! #include "openalpp/source.h" ! #include "openalpp/audioconvert.h" ! #include <vector> ! #include <math.h> ! #include <stdlib.h> ! ! namespace openalpp { ! ! /** ! * Class for group sources. ! * Used for mixing together several sources _before_ they are played. This can ! * be used to play more sounds with less processing power. Of course the ! * problem is that the sources cannot be moved separately. ! */ ! class OPENALPP_API GroupSource : public SourceBase { ! /** ! * Flag for whether the sources have been mixed yet. ! */ ! bool mixed_; ! ! /** ! * Vector containing the sources in the group. ! */ ! std::vector<Source *> sources_; ! ! /** ! * OpenAL buffer for the group source. ! */ ! ALuint buffer_; ! ! typedef enum Speaker {Left,Right}; ! ! /** ! * Handles distance attenuation and directional sources. ! * @param source is the source to filter. ! * @return the gain. ! */ ! ALfloat GroupSource::FilterDistance(ALuint source,Speaker speaker); ! ! /** ! * Reverb filter. ! * @param source is (a pointer to) the source. ! * @param buffer is (a pointer to) the buffer (=memory area). ! * @param size is the size of the buffer. ! * @param frequency is the freguency of the sound. ! * @return new pointer to buffer. ! */ ! ALshort *GroupSource::FilterReverb(Source *source,ALshort *buffer, ! ALsizei &size,unsigned int frequency); ! ! /** ! * Apply filters. ! * @param source is (a pointer to) the source. ! * @param buffer is the buffer containing the sound. ! * @param size is the size of the buffer. ! * @param frequency is the frequency of the sound. ! * @return (new) pointer to buffer. ! */ ! ALshort *ApplyFilters(Source *source,ALshort *buffer,ALsizei &size, ! unsigned int frequency); ! public: ! /** ! * Constructor. ! * Creates the group source at the specified position. ! * @param x x coordinate. ! * @param y y coordinate. ! * @param z z coordinate. ! */ ! GroupSource(float x = 0.0, float y = 0.0, float z = 0.0) throw (NameError); ! ! /** ! * Same as SourceBase::Play, except that this mixes the sources in the ! * group if it haven't been done yet. ! */ ! void Play() throw (InitError,FileError); ! ! /** ! * Mix all added sources into one. This function will be called by ! * Play(), if sources have been included since the last time MixSamples() ! * was called, so if you want the source to start playing as fast as ! * possible after the Play()-call, MixSources() should be called ! * separately ! * @param frequency is the frequency that will be used when mixing. ! */ ! void MixSources(unsigned int frequency=22050) ! throw (InitError,FileError,FatalError,MemoryError,ValueError); ! ! /** ! * Includes a source in the group. ! * Returns an identifier that can be used as an argument to ExcludeSource(). ! * This identifier is also the OpenAL name for the included source. ! * @param source is (a pointer to) the source to include. ! * @return identifier for the source. ! */ ! ALuint IncludeSource(Source *source) throw (ValueError); ! ! /** ! * Removes a source from the group. ! * This will of course require the remaining sources to be mixed again. ! * @param source is the source to exclude. ! */ ! void ExcludeSource(const Source &source) throw (NameError); ! ! /** ! * Removes a source from the group. ! * This will of course require the remaining sources to be mixed again. ! * @param source is the identifier of the source to exclude. ! */ ! void ExcludeSource(ALuint source) throw (NameError); ! ! /** ! * Copy constructor. ! */ ! GroupSource(const GroupSource &groupsource); ! ! /** ! * Destructor. ! */ ! ~GroupSource(); ! ! /** ! * Assignment operator. ! */ ! GroupSource &operator=(const GroupSource &groupsource); ! }; ! ! } ! ! #endif /* GROUPSOURCE_H_INCLUDED_C427B440 */ --- 1,158 ---- ! /** ! * OpenAL++ - an object oriented toolkit for spatial sound ! * Copyright (C) 2002 VRlab, Umeå University ! * ! * OpenAL++ was created using the libraries: ! * OpenAL (http://www.openal.org), ! * PortAudio (http://www.portaudio.com/), and ! * CommonC++ (http://cplusplus.sourceforge.net/) ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ! */ ! ! #ifndef GROUPSOURCE_H_INCLUDED_C427B440 ! #define GROUPSOURCE_H_INCLUDED_C427B440 ! ! #include "openalpp/export.h" ! ! #include "openalpp/source.h" ! #include "openalpp/audioconvert.h" ! #include <vector> ! #include <math.h> ! #include <stdlib.h> ! ! namespace openalpp { ! ! /** ! * Class for group sources. ! * Used for mixing together several sources _before_ they are played. This can ! * be used to play more sounds with less processing power. Of course the ! * problem is that the sources cannot be moved separately. ! */ ! class GroupSource : public SourceBase { ! /** ! * Flag for whether the sources have been mixed yet. ! */ ! bool mixed_; ! ! /** ! * Vector containing the sources in the group. ! */ ! std::vector<Source *> sources_; ! ! /** ! * OpenAL buffer for the group source. ! */ ! ALuint buffer_; ! ! typedef enum Speaker {Left,Right}; ! ! /** ! * Handles distance attenuation and directional sources. ! * @param source is the source to filter. ! * @return the gain. ! */ ! OPENALPP_API ALfloat GroupSource::FilterDistance(ALuint source,Speaker speaker); ! ! /** ! * Reverb filter. ! * @param source is (a pointer to) the source. ! * @param buffer is (a pointer to) the buffer (=memory area). ! * @param size is the size of the buffer. ! * @param frequency is the freguency of the sound. ! * @return new pointer to buffer. ! */ ! OPENALPP_API ALshort *GroupSource::FilterReverb(Source *source,ALshort *buffer, ! ALsizei &size,unsigned int frequency); ! ! /** ! * Apply filters. ! * @param source is (a pointer to) the source. ! * @param buffer is the buffer containing the sound. ! * @param size is the size of the buffer. ! * @param frequency is the frequency of the sound. ! * @return (new) pointer to buffer. ! */ ! OPENALPP_API ALshort *ApplyFilters(Source *source,ALshort *buffer,ALsizei &size, ! unsigned int frequency); ! public: ! /** ! * Constructor. ! * Creates the group source at the specified position. ! * @param x x coordinate. ! * @param y y coordinate. ! * @param z z coordinate. ! */ ! OPENALPP_API GroupSource(float x = 0.0, float y = 0.0, float z = 0.0) throw (NameError); ! ! /** ! * Same as SourceBase::Play, except that this mixes the sources in the ! * group if it haven't been done yet. ! */ ! OPENALPP_API void Play() throw (InitError,FileError); ! ! /** ! * Mix all added sources into one. This function will be called by ! * Play(), if sources have been included since the last time MixSamples() ! * was called, so if you want the source to start playing as fast as ! * possible after the Play()-call, MixSources() should be called ! * separately ! * @param frequency is the frequency that will be used when mixing. ! */ ! OPENALPP_API void MixSources(unsigned int frequency=22050) ! throw (InitError,FileError,FatalError,MemoryError,ValueError); ! ! /** ! * Includes a source in the group. ! * Returns an identifier that can be used as an argument to ExcludeSource(). ! * This identifier is also the OpenAL name for the included source. ! * @param source is (a pointer to) the source to include. ! * @return identifier for the source. ! */ ! OPENALPP_API ALuint IncludeSource(Source *source) throw (ValueError); ! ! /** ! * Removes a source from the group. ! * This will of course require the remaining sources to be mixed again. ! * @param source is the source to exclude. ! */ ! OPENALPP_API void ExcludeSource(const Source &source) throw (NameError); ! ! /** ! * Removes a source from the group. ! * This will of course require the remaining sources to be mixed again. ! * @param source is the identifier of the source to exclude. ! */ ! OPENALPP_API void ExcludeSource(ALuint source) throw (NameError); ! ! /** ! * Copy constructor. ! */ ! OPENALPP_API GroupSource(const GroupSource &groupsource); ! ! /** ! * Destructor. ! */ ! OPENALPP_API ~GroupSource(); ! ! /** ! * Assignment operator. ! */ ! OPENALPP_API GroupSource &operator=(const GroupSource &groupsource); ! }; ! ! } ! ! #endif /* GROUPSOURCE_H_INCLUDED_C427B440 */ |
From: <vr-...@us...> - 2003-04-16 11:32:10
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1:/tmp/cvs-serv16535 Added Files: openalpp.cpp Log Message: --- NEW FILE: openalpp.cpp --- #include "openalpp/export.h" #ifdef _WIN32 BOOL APIENTRY DllMain( HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) { switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: case DLL_THREAD_ATTACH: case DLL_THREAD_DETACH: case DLL_PROCESS_DETACH: break; } return TRUE; } #endif |
From: <vr-...@us...> - 2003-04-16 11:15:47
|
Update of /cvsroot/alpp/openalpp/tests In directory sc8-pr-cvs1:/tmp/cvs-serv8710/tests Modified Files: Makefile.in simple.cpp testfstream.cpp Added Files: thx.ogg Log Message: Changed windows version to dynamic library style. (Only under .NET) Fixed filestream.cpp so it works under windows. --- NEW FILE: thx.ogg --- (This appears to be a binary file; contents omitted.) Index: Makefile.in =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.in 2 Apr 2003 14:11:26 -0000 1.8 --- Makefile.in 16 Apr 2003 11:15:07 -0000 1.9 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,5 ---- ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 12,16 **** # PARTICULAR PURPOSE. - @SET_MAKE@ SHELL = @SHELL@ --- 11,14 ---- *************** *** 34,40 **** --- 32,42 ---- includedir = @includedir@ oldincludedir = /usr/include + + DESTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. *************** *** 45,53 **** INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : --- 47,55 ---- INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ + NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 58,64 **** host_alias = @host_alias@ host_triplet = @host@ - AMTAR = @AMTAR@ AS = @AS@ - AWK = @AWK@ CC = @CC@ CCGNUCFLAGS = @CCGNUCFLAGS@ --- 60,64 ---- *************** *** 66,76 **** CXX = @CXX@ CXXCPP = @CXXCPP@ - DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 66,75 ---- CXX = @CXX@ CXXCPP = @CXXCPP@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ *************** *** 79,85 **** STRIP = @STRIP@ VERSION = @VERSION@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ INCLUDES = -I$(top_builddir)/include --- 78,81 ---- *************** *** 104,274 **** @WITH_CCGNU_TRUE@testfstream_SOURCES = testfstream.cpp - subdir = tests mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = ! @WITH_CCGNU_TRUE@bin_PROGRAMS = teststream$(EXEEXT) testsend$(EXEEXT) \ ! @WITH_CCGNU_TRUE@ testfstream$(EXEEXT) testmic$(EXEEXT) \ ! @WITH_CCGNU_TRUE@ simple$(EXEEXT) moving$(EXEEXT) ! @WITH_CCGNU_FALSE@bin_PROGRAMS = ! PROGRAMS = $(bin_PROGRAMS) - @WITH_CCGNU_TRUE@am_moving_OBJECTS = moving.$(OBJEXT) - @WITH_CCGNU_FALSE@am_moving_OBJECTS = - moving_OBJECTS = $(am_moving_OBJECTS) - moving_LDADD = $(LDADD) - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@moving_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@moving_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@moving_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@moving_DEPENDENCIES = - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@moving_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@moving_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@moving_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@moving_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - moving_LDFLAGS = - @WITH_CCGNU_TRUE@am_simple_OBJECTS = simple.$(OBJEXT) - @WITH_CCGNU_FALSE@am_simple_OBJECTS = - simple_OBJECTS = $(am_simple_OBJECTS) - simple_LDADD = $(LDADD) - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - simple_LDFLAGS = - @WITH_CCGNU_TRUE@am_testfstream_OBJECTS = testfstream.$(OBJEXT) - @WITH_CCGNU_FALSE@am_testfstream_OBJECTS = - testfstream_OBJECTS = $(am_testfstream_OBJECTS) - testfstream_LDADD = $(LDADD) - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testfstream_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testfstream_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testfstream_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testfstream_DEPENDENCIES = - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testfstream_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testfstream_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testfstream_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testfstream_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - testfstream_LDFLAGS = - @WITH_CCGNU_TRUE@am_testmic_OBJECTS = testmic.$(OBJEXT) - @WITH_CCGNU_FALSE@am_testmic_OBJECTS = - testmic_OBJECTS = $(am_testmic_OBJECTS) - testmic_LDADD = $(LDADD) - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - testmic_LDFLAGS = - @WITH_CCGNU_TRUE@am_testsend_OBJECTS = testsend.$(OBJEXT) - @WITH_CCGNU_FALSE@am_testsend_OBJECTS = - testsend_OBJECTS = $(am_testsend_OBJECTS) - testsend_LDADD = $(LDADD) - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - testsend_LDFLAGS = - @WITH_CCGNU_TRUE@am_teststream_OBJECTS = teststream.$(OBJEXT) - @WITH_CCGNU_FALSE@am_teststream_OBJECTS = - teststream_OBJECTS = $(am_teststream_OBJECTS) - teststream_LDADD = $(LDADD) - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la - teststream_LDFLAGS = ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/config/depcomp ! @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/moving.Po $(DEPDIR)/simple.Po \ ! @AMDEP_TRUE@ $(DEPDIR)/testfstream.Po $(DEPDIR)/testmic.Po \ ! @AMDEP_TRUE@ $(DEPDIR)/testsend.Po $(DEPDIR)/teststream.Po ! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ! $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ! $(AM_CXXFLAGS) $(CXXFLAGS) ! CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ! $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ ! DIST_SOURCES = $(moving_SOURCES) $(simple_SOURCES) \ ! $(testfstream_SOURCES) $(testmic_SOURCES) $(testsend_SOURCES) \ ! $(teststream_SOURCES) ! DIST_COMMON = README Makefile.am Makefile.in ! SOURCES = $(moving_SOURCES) $(simple_SOURCES) $(testfstream_SOURCES) $(testmic_SOURCES) $(testsend_SOURCES) $(teststream_SOURCES) - all: all-am .SUFFIXES: ! .SUFFIXES: .cpp .lo .o .obj ! mostlyclean-libtool: ! -rm -f *.lo - clean-libtool: - -rm -rf .libs _libs ! distclean-libtool: ! -rm -f libtool ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --foreign tests/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && \ ! CONFIG_HEADERS= CONFIG_LINKS= \ ! CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! if test -f $$p \ ! || test -f $$p1 \ ! ; then \ ! f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done --- 100,231 ---- @WITH_CCGNU_TRUE@testfstream_SOURCES = testfstream.cpp mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = ! @WITH_CCGNU_TRUE@bin_PROGRAMS = teststream$(EXEEXT) testsend$(EXEEXT) \ ! @WITH_CCGNU_TRUE@testfstream$(EXEEXT) testmic$(EXEEXT) simple$(EXEEXT) \ ! @WITH_CCGNU_TRUE@moving$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) ! DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! @WITH_CCGNU_TRUE@teststream_OBJECTS = teststream.$(OBJEXT) ! teststream_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@teststream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@teststream_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@teststream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! teststream_LDFLAGS = ! @WITH_CCGNU_TRUE@testsend_OBJECTS = testsend.$(OBJEXT) ! testsend_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@testsend_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@testsend_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@testsend_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! testsend_LDFLAGS = ! @WITH_CCGNU_TRUE@testfstream_OBJECTS = testfstream.$(OBJEXT) ! testfstream_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@testfstream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@testfstream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@testfstream_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@testfstream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@testfstream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! testfstream_LDFLAGS = ! @WITH_CCGNU_TRUE@testmic_OBJECTS = testmic.$(OBJEXT) ! testmic_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@testmic_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@testmic_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@testmic_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! testmic_LDFLAGS = ! @WITH_CCGNU_TRUE@simple_OBJECTS = simple.$(OBJEXT) ! simple_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@simple_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@simple_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@simple_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! simple_LDFLAGS = ! @WITH_CCGNU_TRUE@moving_OBJECTS = moving.$(OBJEXT) ! moving_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@moving_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@moving_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@moving_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@moving_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@moving_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! moving_LDFLAGS = CXXFLAGS = @CXXFLAGS@ ! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = README Makefile.am Makefile.in + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar + GZIP_ENV = --best + DEP_FILES = .deps/moving.P .deps/simple.P .deps/testfstream.P \ + .deps/testmic.P .deps/testsend.P .deps/teststream.P + SOURCES = $(teststream_SOURCES) $(testsend_SOURCES) $(testfstream_SOURCES) $(testmic_SOURCES) $(simple_SOURCES) $(moving_SOURCES) + OBJECTS = $(teststream_OBJECTS) $(testsend_OBJECTS) $(testfstream_OBJECTS) $(testmic_OBJECTS) $(simple_OBJECTS) $(moving_OBJECTS) + + all: all-redirect .SUFFIXES: ! .SUFFIXES: .S .c .cpp .lo .o .obj .s ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! mostlyclean-binPROGRAMS: ! ! clean-binPROGRAMS: ! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ! ! distclean-binPROGRAMS: ! ! maintainer-clean-binPROGRAMS: ! install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ! $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done *************** *** 276,474 **** uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ! rm -f $(DESTDIR)$(bindir)/$$f; \ done ! clean-binPROGRAMS: ! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ! moving$(EXEEXT): $(moving_OBJECTS) $(moving_DEPENDENCIES) ! @rm -f moving$(EXEEXT) ! $(CXXLINK) $(moving_LDFLAGS) $(moving_OBJECTS) $(moving_LDADD) $(LIBS) ! simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES) ! @rm -f simple$(EXEEXT) ! $(CXXLINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS) ! testfstream$(EXEEXT): $(testfstream_OBJECTS) $(testfstream_DEPENDENCIES) ! @rm -f testfstream$(EXEEXT) ! $(CXXLINK) $(testfstream_LDFLAGS) $(testfstream_OBJECTS) $(testfstream_LDADD) $(LIBS) ! testmic$(EXEEXT): $(testmic_OBJECTS) $(testmic_DEPENDENCIES) ! @rm -f testmic$(EXEEXT) ! $(CXXLINK) $(testmic_LDFLAGS) $(testmic_OBJECTS) $(testmic_LDADD) $(LIBS) ! testsend$(EXEEXT): $(testsend_OBJECTS) $(testsend_DEPENDENCIES) ! @rm -f testsend$(EXEEXT) ! $(CXXLINK) $(testsend_LDFLAGS) $(testsend_OBJECTS) $(testsend_LDADD) $(LIBS) ! teststream$(EXEEXT): $(teststream_OBJECTS) $(teststream_DEPENDENCIES) ! @rm -f teststream$(EXEEXT) ! $(CXXLINK) $(teststream_LDFLAGS) $(teststream_OBJECTS) $(teststream_LDADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/moving.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/simple.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testfstream.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testmic.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testsend.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/teststream.Po@am__quote@ ! distclean-depend: ! -rm -rf $(DEPDIR) ! .cpp.o: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! .cpp.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `cygpath -w $<` .cpp.lo: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! CXXDEPMODE = @CXXDEPMODE@ ! uninstall-info-am: tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done - check-am: all-am - check: check-am - all-am: Makefile $(PROGRAMS) - - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) ! install: install-am ! install-exec: install-exec-am ! install-data: install-data-am ! uninstall: uninstall-am ! install-am: all-am ! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! installcheck: installcheck-am ! install-strip: ! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! `test -z '$(STRIP)' || \ ! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ! mostlyclean-generic: ! clean-generic: ! distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* ! maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am ! dvi-am: ! info: info-am - info-am: ! install-data-am: ! install-exec-am: install-binPROGRAMS ! install-info: install-info-am ! install-man: ! installcheck-am: ! maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! mostlyclean: mostlyclean-am ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! uninstall-am: uninstall-binPROGRAMS uninstall-info-am - .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool distclean distclean-compile \ - distclean-depend distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-binPROGRAMS install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 233,485 ---- uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! list='$(bin_PROGRAMS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done ! # FIXME: We should only use cygpath when building on Windows, ! # and only if it is available. ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` ! ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! ! maintainer-clean-libtool: ! ! teststream$(EXEEXT): $(teststream_OBJECTS) $(teststream_DEPENDENCIES) ! @rm -f teststream$(EXEEXT) ! $(CXXLINK) $(teststream_LDFLAGS) $(teststream_OBJECTS) $(teststream_LDADD) $(LIBS) ! ! testsend$(EXEEXT): $(testsend_OBJECTS) $(testsend_DEPENDENCIES) ! @rm -f testsend$(EXEEXT) ! $(CXXLINK) $(testsend_LDFLAGS) $(testsend_OBJECTS) $(testsend_LDADD) $(LIBS) ! ! testfstream$(EXEEXT): $(testfstream_OBJECTS) $(testfstream_DEPENDENCIES) ! @rm -f testfstream$(EXEEXT) ! $(CXXLINK) $(testfstream_LDFLAGS) $(testfstream_OBJECTS) $(testfstream_LDADD) $(LIBS) + testmic$(EXEEXT): $(testmic_OBJECTS) $(testmic_DEPENDENCIES) + @rm -f testmic$(EXEEXT) + $(CXXLINK) $(testmic_LDFLAGS) $(testmic_OBJECTS) $(testmic_LDADD) $(LIBS) + + simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES) + @rm -f simple$(EXEEXT) + $(CXXLINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS) + + moving$(EXEEXT): $(moving_OBJECTS) $(moving_DEPENDENCIES) + @rm -f moving$(EXEEXT) + $(CXXLINK) $(moving_LDFLAGS) $(moving_OBJECTS) $(moving_LDADD) $(LIBS) + .cpp.o: + $(CXXCOMPILE) -c $< + .cpp.obj: + $(CXXCOMPILE) -c `cygpath -w $<` .cpp.lo: ! $(LTCXXCOMPILE) -c $< tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! ! subdir = tests distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign tests/Makefile @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done ! DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) ! -include $(DEP_FILES) ! mostlyclean-depend: ! clean-depend: ! distclean-depend: ! -rm -rf .deps ! maintainer-clean-depend: ! %.o: %.c ! @echo '$(COMPILE) -c $<'; \ ! $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ! @-cp .deps/$(*F).pp .deps/$(*F).P; \ ! tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ ! rm .deps/$(*F).pp ! %.lo: %.c ! @echo '$(LTCOMPILE) -c $<'; \ ! $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ! @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ! < .deps/$(*F).pp > .deps/$(*F).P; \ ! tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ ! rm -f .deps/$(*F).pp ! %.o: %.cpp ! @echo '$(CXXCOMPILE) -c $<'; \ ! $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ! @-cp .deps/$(*F).pp .deps/$(*F).P; \ ! tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ ! rm .deps/$(*F).pp + %.lo: %.cpp + @echo '$(LTCXXCOMPILE) -c $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp + info-am: + info: info-am + dvi-am: dvi: dvi-am + check-am: all-am + check: check-am + installcheck-am: + installcheck: installcheck-am + install-exec-am: install-binPROGRAMS + install-exec: install-exec-am ! install-data-am: ! install-data: install-data-am ! install-am: all-am ! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! install: install-am ! uninstall-am: uninstall-binPROGRAMS ! uninstall: uninstall-am ! all-am: Makefile $(PROGRAMS) ! all-redirect: all-am ! install-strip: ! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) ! mostlyclean-generic: ! clean-generic: ! distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* ! maintainer-clean-generic: ! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ ! clean-depend clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ ! distclean-tags distclean-depend distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-binPROGRAMS \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-depend \ ! maintainer-clean-generic distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." ! ! maintainer-clean: maintainer-clean-am ! ! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ ! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir \ ! mostlyclean-depend distclean-depend clean-depend \ ! maintainer-clean-depend info-am info dvi-am dvi check check-am \ ! installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: simple.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/simple.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** simple.cpp 21 Feb 2003 14:48:24 -0000 1.8 --- simple.cpp 16 Apr 2003 11:15:09 -0000 1.9 *************** *** 34,38 **** try { Source bgsound("bee.wav"); // Create source and load sound ! bgsound.SetGain(0.6); // Lower gain (volume) bgsound.SetLooping(); bgsound.SetAmbient(); // Make sound ambient (i.e. not attenuated) --- 34,38 ---- try { Source bgsound("bee.wav"); // Create source and load sound ! bgsound.SetGain(0.6f); // Lower gain (volume) bgsound.SetLooping(); bgsound.SetAmbient(); // Make sound ambient (i.e. not attenuated) Index: testfstream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/testfstream.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** testfstream.cpp 7 Mar 2003 20:26:24 -0000 1.3 --- testfstream.cpp 16 Apr 2003 11:15:10 -0000 1.4 *************** *** 52,57 **** } catch(openalpp::Error e) { std::cerr << e << "\n"; ! } catch(...) { ! std::cerr << "Unknown error!\n"; } return 0; --- 52,57 ---- } catch(openalpp::Error e) { std::cerr << e << "\n"; ! //} catch(...) { ! // std::cerr << "Unknown error!\n"; } return 0; |
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv8710/include/openalpp Modified Files: alpp.h audiobase.h audioconvert.h audioenvironment.h deviceupdater.h error.h filestream.h filestreamupdater.h groupsource.h inputdevice.h listener.h netstream.h netupdater.h positionedobject.h sample.h sounddata.h source.h sourcebase.h stream.h streamupdater.h windowsstuff.h Added Files: export.h Log Message: Changed windows version to dynamic library style. (Only under .NET) Fixed filestream.cpp so it works under windows. --- NEW FILE: export.h --- // The following ifdef block is the standard way of creating macros which make exporting // from a DLL simpler. All files within this DLL are compiled with the OPENALPP_EXPORTS // symbol defined on the command line. this symbol should not be defined on any project // that uses this DLL. This way any other project whose source files include this file see // OPENALPP_API functions as being imported from a DLL, whereas this DLL sees symbols // defined with this macro as being exported. #ifndef __openalpp_export_h__ #define __openalpp_export_h__ #ifdef _WIN32 #pragma once #include <windows.h> #ifdef OPENALPP_EXPORTS #define OPENALPP_API __declspec(dllexport) #else #define OPENALPP_API __declspec(dllimport) #endif #else #define OPENALPP_API #endif // This class is exported from the openalpp.dll //class OPENALPP_API Copenalpp { //public: // Copenalpp(void); // // TODO: add your methods here. //}; //extern OPENALPP_API int nopenalpp; //OPENALPP_API int fnopenalpp(void); #endif Index: alpp.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/alpp.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** alpp.h 21 Feb 2003 14:37:10 -0000 1.6 --- alpp.h 16 Apr 2003 11:15:00 -0000 1.7 *************** *** 32,35 **** --- 32,36 ---- */ + #include "openalpp/export.h" #include "openalpp/source.h" #include "openalpp/audioenvironment.h" Index: audiobase.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audiobase.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** audiobase.h 21 Feb 2003 14:37:10 -0000 1.4 --- audiobase.h 16 Apr 2003 11:15:00 -0000 1.5 *************** *** 26,29 **** --- 26,30 ---- #define AUDIOBASE_H_INCLUDED_C41996D8 + #include "openalpp/export.h" #include <cstdlib> extern "C" { *************** *** 66,70 **** * Takes care of initialisation/shutdown of anything necessary (e.g. ALut) */ ! class AudioBase { /** * Counter for #instances for enviroment, listener and source classes. --- 67,71 ---- * Takes care of initialisation/shutdown of anything necessary (e.g. ALut) */ ! class OPENALPP_API AudioBase { /** * Counter for #instances for enviroment, listener and source classes. *************** *** 94,98 **** * default should be used. */ ! AudioBase(int frequency=-1,int refresh=-1,int synchronous=-1) throw (InitError); --- 95,99 ---- * default should be used. */ ! AudioBase(int frequency=-1,int refresh=-1,int synchronous=-1) throw (InitError); *************** *** 100,104 **** * Destructor. */ ! virtual ~AudioBase(); /** --- 101,105 ---- * Destructor. */ ! virtual ~AudioBase(); /** Index: audioconvert.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audioconvert.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** audioconvert.h 18 Oct 2002 07:50:10 -0000 1.1 --- audioconvert.h 16 Apr 2003 11:15:00 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- #define AUDIOCONVERT_H_INCLUDED + #include "openalpp/export.h" #include <AL/al.h> #include <stdlib.h> *************** *** 40,44 **** * Class for converting audio. */ ! class AudioConvert { unsigned short channels_,bits_; unsigned int frequency_; --- 41,45 ---- * Class for converting audio. */ ! class OPENALPP_API AudioConvert { unsigned short channels_,bits_; unsigned int frequency_; Index: audioenvironment.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audioenvironment.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** audioenvironment.h 2 Apr 2003 14:11:25 -0000 1.2 --- audioenvironment.h 16 Apr 2003 11:15:01 -0000 1.3 *************** *** 54,57 **** --- 54,60 ---- * and distance, respectively. */ + + #include "openalpp/export.h" + #ifdef None #undef None // Defined in X-headers *************** *** 64,68 **** * parameters. */ ! class AudioEnvironment : public AudioBase { public: /** --- 67,71 ---- * parameters. */ ! class OPENALPP_API AudioEnvironment : public AudioBase { public: /** Index: deviceupdater.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/deviceupdater.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** deviceupdater.h 18 Oct 2002 07:50:10 -0000 1.1 --- deviceupdater.h 16 Apr 2003 11:15:01 -0000 1.2 *************** *** 26,32 **** --- 26,34 ---- #define DEVICEUPDATER_H_INCLUDED_C419EA9C + #include "openalpp/streamupdater.h" #include "openalpp/error.h" #include <portaudio.h> + #include "openalpp/export.h" namespace openalpp { *************** *** 35,39 **** * Updater for sound input devices (like microphones). */ ! class DeviceUpdater : public StreamUpdater, public ost::Semaphore { PortAudioStream *stream_; ost::Mutex inputmutex; --- 37,41 ---- * Updater for sound input devices (like microphones). */ ! class DeviceUpdater : public StreamUpdater, public ost::Semaphore { PortAudioStream *stream_; ost::Mutex inputmutex; *************** *** 52,56 **** * @param buffer2 are the (OpenAL) buffers to use. */ ! DeviceUpdater(int device, unsigned int frequency,unsigned int buffersize, SampleFormat format, ALuint buffer1,ALuint buffer2); --- 54,58 ---- * @param buffer2 are the (OpenAL) buffers to use. */ ! OPENALPP_API DeviceUpdater(int device, unsigned int frequency,unsigned int buffersize, SampleFormat format, ALuint buffer1,ALuint buffer2); *************** *** 59,63 **** * Destructor. */ ! ~DeviceUpdater(); /** --- 61,65 ---- * Destructor. */ ! OPENALPP_API ~DeviceUpdater(); /** *************** *** 65,79 **** * This will be called when the updater is Start():ed.. */ ! void run(); /** * Enter critical section. */ ! inline void Enter() {inputmutex.enterMutex();} /** * Leave critical section. */ ! inline void Leave() {inputmutex.leaveMutex();} /** --- 67,81 ---- * This will be called when the updater is Start():ed.. */ ! OPENALPP_API void run(); /** * Enter critical section. */ ! OPENALPP_API inline void Enter() {inputmutex.enterMutex();} /** * Leave critical section. */ ! OPENALPP_API inline void Leave() {inputmutex.leaveMutex();} /** *************** *** 83,87 **** * @param length is the length - in bytes - of the buffer */ ! void CopyInput(void *tempbuffer,int length); }; --- 85,89 ---- * @param length is the length - in bytes - of the buffer */ ! OPENALPP_API void CopyInput(void *tempbuffer,int length); }; Index: error.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/error.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** error.h 13 Dec 2002 13:03:42 -0000 1.3 --- error.h 16 Apr 2003 11:15:01 -0000 1.4 *************** *** 29,32 **** --- 29,33 ---- #include <string> #include <stdexcept> + #include "openalpp/export.h" namespace openalpp { *************** *** 37,41 **** * of Error (or one of its descendants) */ ! class Error : public std::runtime_error { public: /** --- 38,42 ---- * of Error (or one of its descendants) */ ! class Error : public std::runtime_error { public: /** *************** *** 73,77 **** * Caused by error in implementation, corrupted memory etc. */ ! class FatalError : public Error { public: /** --- 74,78 ---- * Caused by error in implementation, corrupted memory etc. */ ! class FatalError : public Error { public: /** *************** *** 86,90 **** * Caused by wrong file permissions, missing files etc. */ ! class FileError : public Error { public: /** --- 87,91 ---- * Caused by wrong file permissions, missing files etc. */ ! class FileError : public Error { public: /** *************** *** 99,103 **** * Caused by insufficient memory etc. */ ! class MemoryError : public Error { public: /** --- 100,104 ---- * Caused by insufficient memory etc. */ ! class MemoryError : public Error { public: /** *************** *** 112,116 **** * Caused by invalid (OpenAL) names. */ ! class NameError : public Error { public: /** --- 113,117 ---- * Caused by invalid (OpenAL) names. */ ! class NameError : public Error { public: /** *************** *** 125,129 **** * Caused by values out of range etc. */ ! class ValueError : public Error { public: /** --- 126,130 ---- * Caused by values out of range etc. */ ! class ValueError : public Error { public: /** *************** *** 138,142 **** * Caused by trying to do actions without proper initialization. */ ! class InitError : public Error { public: /** --- 139,143 ---- * Caused by trying to do actions without proper initialization. */ ! class InitError : public Error { public: /** *************** *** 154,158 **** * @return the stream. */ ! std::ostream &operator<<(std::ostream &stream,const Error &error); } --- 155,159 ---- * @return the stream. */ ! OPENALPP_API std::ostream &operator<<(std::ostream &stream,const Error &error); } Index: filestream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestream.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** filestream.h 7 Mar 2003 20:36:27 -0000 1.3 --- filestream.h 16 Apr 2003 11:15:01 -0000 1.4 *************** *** 27,30 **** --- 27,31 ---- #include "openalpp/stream.h" + #include "openalpp/export.h" namespace openalpp { *************** *** 34,38 **** * Vorbis files (http://www.vorbis.com/). */ ! class FileStream : public Stream { public: /** --- 35,39 ---- * Vorbis files (http://www.vorbis.com/). */ ! class OPENALPP_API FileStream : public Stream { public: /** Index: filestreamupdater.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestreamupdater.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** filestreamupdater.h 15 Feb 2003 02:30:50 -0000 1.1 --- filestreamupdater.h 16 Apr 2003 11:15:01 -0000 1.2 *************** *** 25,33 **** #ifndef FILESTREAMUPDATER_H_INCLUDED #define FILESTREAMUPDATER_H_INCLUDED - #include "openalpp/streamupdater.h" #include "stdlib.h" #include <vorbis/codec.h> #include <vorbis/vorbisfile.h> namespace openalpp { --- 25,35 ---- #ifndef FILESTREAMUPDATER_H_INCLUDED #define FILESTREAMUPDATER_H_INCLUDED #include "openalpp/streamupdater.h" #include "stdlib.h" #include <vorbis/codec.h> #include <vorbis/vorbisfile.h> + #include "openalpp/export.h" + + namespace openalpp { *************** *** 36,40 **** * Updater for streams from files. */ ! class FileStreamUpdater : public StreamUpdater { OggVorbis_File *oggfile_; // The file structure unsigned int buffersize_; // Size of the buffer in bytes --- 38,42 ---- * Updater for streams from files. */ ! class OPENALPP_API FileStreamUpdater : public StreamUpdater { OggVorbis_File *oggfile_; // The file structure unsigned int buffersize_; // Size of the buffer in bytes Index: groupsource.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/groupsource.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** groupsource.h 19 Feb 2003 18:35:08 -0000 1.2 --- groupsource.h 16 Apr 2003 11:15:01 -0000 1.3 *************** *** 26,29 **** --- 26,31 ---- #define GROUPSOURCE_H_INCLUDED_C427B440 + #include "openalpp/export.h" + #include "openalpp/source.h" #include "openalpp/audioconvert.h" *************** *** 40,44 **** * problem is that the sources cannot be moved separately. */ ! class GroupSource : public SourceBase { /** * Flag for whether the sources have been mixed yet. --- 42,46 ---- * problem is that the sources cannot be moved separately. */ ! class OPENALPP_API GroupSource : public SourceBase { /** * Flag for whether the sources have been mixed yet. Index: inputdevice.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/inputdevice.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** inputdevice.h 7 Mar 2003 20:36:29 -0000 1.5 --- inputdevice.h 16 Apr 2003 11:15:01 -0000 1.6 *************** *** 26,29 **** --- 26,30 ---- #define INPUTDEVICE_H_INCLUDED_C41987DC + #include "openalpp/export.h" #include "openalpp/stream.h" *************** *** 33,37 **** * Class for handling input devices, like microphones. */ ! class InputDevice : public Stream { static int nobjects_; --- 34,38 ---- * Class for handling input devices, like microphones. */ ! class OPENALPP_API InputDevice : public Stream { static int nobjects_; Index: listener.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/listener.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** listener.h 18 Oct 2002 07:50:11 -0000 1.1 --- listener.h 16 Apr 2003 11:15:01 -0000 1.2 *************** *** 25,28 **** --- 25,31 ---- #ifndef LISTENER_H_INCLUDED_C419EF1E #define LISTENER_H_INCLUDED_C419EF1E + + + #include "openalpp/export.h" #include "openalpp/positionedobject.h" *************** *** 32,36 **** * Class for listeners. */ ! class Listener : public PositionedObject { float position_[3]; float orientation_[6]; --- 35,39 ---- * Class for listeners. */ ! class OPENALPP_API Listener : public PositionedObject { float position_[3]; float orientation_[6]; Index: netstream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/netstream.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** netstream.h 7 Mar 2003 20:37:21 -0000 1.5 --- netstream.h 16 Apr 2003 11:15:01 -0000 1.6 *************** *** 27,30 **** --- 27,31 ---- #include "openalpp/stream.h" + #include "openalpp/export.h" namespace ost { *************** *** 40,44 **** * be used (tests were done with Mono8, 11025 Hz). */ ! class NetStream : public Stream { public: /** --- 41,45 ---- * be used (tests were done with Mono8, 11025 Hz). */ ! class OPENALPP_API NetStream : public Stream { public: /** Index: netupdater.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/netupdater.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** netupdater.h 7 Mar 2003 20:37:20 -0000 1.2 --- netupdater.h 16 Apr 2003 11:15:01 -0000 1.3 *************** *** 29,32 **** --- 29,33 ---- #include "openalpp/streamupdater.h" #include "stdlib.h" + #include "openalpp/export.h" namespace openalpp { *************** *** 35,39 **** * Updater for streams through sockets. */ ! class NetUpdater : public StreamUpdater { /** * Socket to receive sound data from. --- 36,40 ---- * Updater for streams through sockets. */ ! class OPENALPP_API NetUpdater : public StreamUpdater { /** * Socket to receive sound data from. Index: positionedobject.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/positionedobject.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** positionedobject.h 4 Dec 2002 07:13:12 -0000 1.2 --- positionedobject.h 16 Apr 2003 11:15:01 -0000 1.3 *************** *** 26,29 **** --- 26,30 ---- #define POSITIONEDOBJECT_H_INCLUDED_C4278579 + #include "openalpp/export.h" #include "openalpp/audiobase.h" *************** *** 34,38 **** * (I.e. listeners and sources). */ ! class PositionedObject : public AudioBase { public: --- 35,39 ---- * (I.e. listeners and sources). */ ! class OPENALPP_API PositionedObject : public AudioBase { public: Index: sample.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sample.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sample.h 7 Mar 2003 20:35:10 -0000 1.2 --- sample.h 16 Apr 2003 11:15:01 -0000 1.3 *************** *** 36,40 **** * Class for loading sampled files. */ ! class Sample : public SoundData { public: /** --- 36,40 ---- * Class for loading sampled files. */ ! class OPENALPP_API Sample : public SoundData { public: /** Index: sounddata.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sounddata.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sounddata.h 18 Oct 2002 07:50:11 -0000 1.1 --- sounddata.h 16 Apr 2003 11:15:01 -0000 1.2 *************** *** 26,29 **** --- 26,30 ---- #define SOUNDDATA_H_INCLUDED_C4199A75 + #include "openalpp/export.h" #include "openalpp/error.h" #include "openalpp/audiobase.h" *************** *** 34,38 **** * Base class for sound data. */ ! class SoundData : public AudioBase { protected: /** --- 35,39 ---- * Base class for sound data. */ ! class OPENALPP_API SoundData : public AudioBase { protected: /** Index: source.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/source.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** source.h 19 Feb 2003 18:35:10 -0000 1.2 --- source.h 16 Apr 2003 11:15:01 -0000 1.3 *************** *** 26,29 **** --- 26,30 ---- #define SOURCE_H_INCLUDED_C419B739 + #include "openalpp/export.h" #include "openalpp/stream.h" #include "openalpp/sourcebase.h" *************** *** 36,40 **** * This is used for standard OpenAL sources, whether streaming or not. */ ! class Source : public SourceBase { public: /** --- 37,41 ---- * This is used for standard OpenAL sources, whether streaming or not. */ ! class OPENALPP_API Source : public SourceBase { public: /** Index: sourcebase.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sourcebase.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sourcebase.h 18 Dec 2002 07:39:44 -0000 1.2 --- sourcebase.h 16 Apr 2003 11:15:01 -0000 1.3 *************** *** 25,28 **** --- 25,29 ---- #ifndef SOURCEBASE_H_INCLUDED_C419E330 #define SOURCEBASE_H_INCLUDED_C419E330 + #include "openalpp/export.h" #include "openalpp/positionedobject.h" #include "openalpp/error.h" *************** *** 44,48 **** * Source) should be created. */ ! class SourceBase : public PositionedObject { public: /** --- 45,49 ---- * Source) should be created. */ ! class OPENALPP_API SourceBase : public PositionedObject { public: /** Index: stream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/stream.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** stream.h 21 Feb 2003 14:37:10 -0000 1.4 --- stream.h 16 Apr 2003 11:15:01 -0000 1.5 *************** *** 26,29 **** --- 26,30 ---- #define STREAM_H_INCLUDED_C41983DF + #include "openalpp/export.h" #include "openalpp/sounddata.h" *************** *** 36,40 **** * Used for audio streams. */ ! class Stream : public SoundData { protected: /** --- 37,41 ---- * Used for audio streams. */ ! class OPENALPP_API Stream : public SoundData { protected: /** *************** *** 48,67 **** * Default constructor. */ ! Stream() throw (NameError); /** * Copy constructor. */ ! Stream(const Stream &stream); /** * Assignment operator. */ ! Stream &operator=(const Stream &stream); /** * Destructor. */ ! ~Stream(); /** --- 49,68 ---- * Default constructor. */ ! Stream() throw (NameError); /** * Copy constructor. */ ! Stream(const Stream &stream); /** * Assignment operator. */ ! Stream &operator=(const Stream &stream); /** * Destructor. */ ! ~Stream(); /** *************** *** 70,74 **** * @param sourcename is the (OpenAL) name of the source. */ ! void Record(ALuint sourcename); /** --- 71,75 ---- * @param sourcename is the (OpenAL) name of the source. */ ! void Record(ALuint sourcename); /** *************** *** 76,80 **** * @param sourcename is the (OpenAL) name of the source. */ ! void Stop(ALuint sourcename); }; --- 77,81 ---- * @param sourcename is the (OpenAL) name of the source. */ ! void Stop(ALuint sourcename); }; Index: streamupdater.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/streamupdater.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** streamupdater.h 21 Feb 2003 14:37:10 -0000 1.4 --- streamupdater.h 16 Apr 2003 11:15:02 -0000 1.5 *************** *** 26,34 **** --- 26,40 ---- #define STREAMUPDATER_H_INCLUDED_C419FA12 + #include <cc++/thread.h> #include <vector> + extern "C" { #include <AL/al.h> } + + #include "openalpp/export.h" + + #include "openalpp/audiobase.h" #include "openalpp/error.h" *************** *** 54,58 **** * @param frequency is the frequency of the sound. */ ! StreamUpdater(ALuint buffer1,ALuint buffer2, ALenum format,unsigned int frequency); --- 60,64 ---- * @param frequency is the frequency of the sound. */ ! OPENALPP_API StreamUpdater(ALuint buffer1,ALuint buffer2, ALenum format,unsigned int frequency); *************** *** 60,64 **** * Destructor. */ ! ~StreamUpdater(); /** --- 66,70 ---- * Destructor. */ ! OPENALPP_API ~StreamUpdater(); /** *************** *** 66,70 **** * @param sourcename is the OpenAL name of the source. */ ! void AddSource(ALuint sourcename); /** --- 72,76 ---- * @param sourcename is the OpenAL name of the source. */ ! OPENALPP_API void AddSource(ALuint sourcename); /** *************** *** 72,76 **** * @param sourcename is the OpenAL name of the source. */ ! void RemoveSource(ALuint sourcename); /** --- 78,82 ---- * @param sourcename is the OpenAL name of the source. */ ! OPENALPP_API void RemoveSource(ALuint sourcename); /** *************** *** 81,85 **** * @return done flag. I.e. stoprunning_. */ ! bool Update(void *buffer,unsigned int length); /** --- 87,91 ---- * @return done flag. I.e. stoprunning_. */ ! OPENALPP_API bool Update(void *buffer,unsigned int length); /** *************** *** 87,91 **** * Is called after Run() finishes, and deletes this. */ ! void final(); /** --- 93,97 ---- * Is called after Run() finishes, and deletes this. */ ! OPENALPP_API void final(); /** *************** *** 93,102 **** * @return this. */ ! StreamUpdater *Reference(); /** * Dereference this updater. */ ! void DeReference() throw (FatalError); protected: /** --- 99,108 ---- * @return this. */ ! OPENALPP_API StreamUpdater *Reference(); /** * Dereference this updater. */ ! OPENALPP_API void DeReference() throw (FatalError); protected: /** *************** *** 118,123 **** * Source to update. */ - std::vector<ALuint> sources_,newsources_,removesources_; /** * Flag for when Run should stop running.. --- 124,129 ---- * Source to update. */ + std::vector<ALuint> sources_,newsources_,removesources_; /** * Flag for when Run should stop running.. Index: windowsstuff.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/windowsstuff.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** windowsstuff.h 18 Oct 2002 07:50:12 -0000 1.1 --- windowsstuff.h 16 Apr 2003 11:15:02 -0000 1.2 *************** *** 29,37 **** //C++ exception specification ignored except to indicate a function is not __declspec(nothrow) #pragma warning( disable : 4290 ) #include <AL/alut.h> #define alGetSourceiv alGetSourcei ! inline ALboolean alutLoadWAV(const char *fname,ALvoid **buffer,ALint *format, ALsizei *size,ALsizei *bits,ALsizei *freq) { ALboolean loop; --- 29,38 ---- //C++ exception specification ignored except to indicate a function is not __declspec(nothrow) #pragma warning( disable : 4290 ) + #include "openalpp/export.h" #include <AL/alut.h> #define alGetSourceiv alGetSourcei ! inline OPENALPP_API ALboolean alutLoadWAV(const char *fname,ALvoid **buffer,ALint *format, ALsizei *size,ALsizei *bits,ALsizei *freq) { ALboolean loop; |
From: <vr-...@us...> - 2003-04-16 11:15:42
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1:/tmp/cvs-serv8710/src Modified Files: Makefile.in audiobase.cpp filestream.cpp groupsource.cpp nofilestream.cpp nostreaming.cpp Log Message: Changed windows version to dynamic library style. (Only under .NET) Fixed filestream.cpp so it works under windows. Index: Makefile.in =================================================================== RCS file: /cvsroot/alpp/openalpp/src/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.in 2 Apr 2003 14:11:26 -0000 1.7 --- Makefile.in 16 Apr 2003 11:15:03 -0000 1.8 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,5 ---- ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 12,16 **** # PARTICULAR PURPOSE. - @SET_MAKE@ SHELL = @SHELL@ --- 11,14 ---- *************** *** 34,40 **** --- 32,42 ---- includedir = @includedir@ oldincludedir = /usr/include + + DESTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. *************** *** 45,53 **** INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : --- 47,55 ---- INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ + NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 58,64 **** host_alias = @host_alias@ host_triplet = @host@ - AMTAR = @AMTAR@ AS = @AS@ - AWK = @AWK@ CC = @CC@ CCGNUCFLAGS = @CCGNUCFLAGS@ --- 60,64 ---- *************** *** 66,76 **** CXX = @CXX@ CXXCPP = @CXXCPP@ - DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 66,75 ---- CXX = @CXX@ CXXCPP = @CXXCPP@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ *************** *** 79,116 **** STRIP = @STRIP@ VERSION = @VERSION@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ INCLUDES = -I$(top_builddir)/include ! basicfiles = \ ! audioenvironment.cpp \ ! listener.cpp \ ! audiobase.cpp \ ! sourcebase.cpp \ ! source.cpp \ ! sample.cpp \ ! sounddata.cpp \ ! audioconvert.cpp \ ! error.cpp \ ! groupsource.cpp ! ! @WITH_CCGNU_TRUE@streamfiles = \ ! @WITH_CCGNU_TRUE@ netstream.cpp \ ! @WITH_CCGNU_TRUE@ streamupdater.cpp \ ! @WITH_CCGNU_TRUE@ netupdater.cpp \ ! @WITH_CCGNU_TRUE@ stream.cpp @WITH_CCGNU_FALSE@streamfiles = nostreaming.cpp noinputdevice.cpp nofilestream.cpp ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@oggfiles = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@ filestream.cpp \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@ filestreamupdater.cpp ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@oggfiles = nofilestream.cpp ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@devicefiles = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ deviceupdater.cpp \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ inputdevice.cpp ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@devicefiles = noinputdevice.cpp --- 78,91 ---- STRIP = @STRIP@ VERSION = @VERSION@ INCLUDES = -I$(top_builddir)/include ! basicfiles = audioenvironment.cpp listener.cpp audiobase.cpp sourcebase.cpp source.cpp sample.cpp sounddata.cpp audioconvert.cpp error.cpp groupsource.cpp + @WITH_CCGNU_TRUE@streamfiles = netstream.cpp streamupdater.cpp netupdater.cpp stream.cpp @WITH_CCGNU_FALSE@streamfiles = nostreaming.cpp noinputdevice.cpp nofilestream.cpp ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@oggfiles = filestream.cpp filestreamupdater.cpp @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@oggfiles = nofilestream.cpp ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@devicefiles = deviceupdater.cpp inputdevice.cpp @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@devicefiles = noinputdevice.cpp *************** *** 118,311 **** lib_LTLIBRARIES = libopenalpp.la - subdir = src mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(lib_LTLIBRARIES) - libopenalpp_la_LDFLAGS = - libopenalpp_la_LIBADD = - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@am_libopenalpp_la_OBJECTS = \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audioenvironment.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ listener.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audiobase.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sourcebase.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ source.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sample.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sounddata.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audioconvert.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ error.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ groupsource.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ nostreaming.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ noinputdevice.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ nofilestream.lo - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@am_libopenalpp_la_OBJECTS = \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audioenvironment.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ listener.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audiobase.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sourcebase.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ source.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sample.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sounddata.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audioconvert.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ error.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ groupsource.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ nostreaming.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ noinputdevice.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ nofilestream.lo - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@am_libopenalpp_la_OBJECTS = \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audioenvironment.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ listener.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audiobase.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sourcebase.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ source.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sample.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sounddata.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audioconvert.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ error.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ groupsource.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ nostreaming.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ noinputdevice.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ nofilestream.lo - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@am_libopenalpp_la_OBJECTS = \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audioenvironment.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ listener.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audiobase.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sourcebase.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ source.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sample.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sounddata.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audioconvert.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ error.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ groupsource.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ nostreaming.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ noinputdevice.lo \ - @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ nofilestream.lo - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@am_libopenalpp_la_OBJECTS = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audioenvironment.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ listener.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audiobase.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sourcebase.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ source.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sample.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sounddata.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audioconvert.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ error.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ groupsource.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ netstream.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ streamupdater.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ netupdater.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ stream.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ deviceupdater.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ inputdevice.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ nofilestream.lo - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@am_libopenalpp_la_OBJECTS = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audioenvironment.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ listener.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audiobase.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sourcebase.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ source.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sample.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sounddata.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audioconvert.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ error.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ groupsource.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ netstream.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ streamupdater.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ netupdater.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ stream.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ noinputdevice.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ nofilestream.lo - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@am_libopenalpp_la_OBJECTS = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audioenvironment.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ listener.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audiobase.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sourcebase.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ source.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sample.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sounddata.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audioconvert.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ error.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ groupsource.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ netstream.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ streamupdater.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ netupdater.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ stream.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ deviceupdater.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ inputdevice.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ filestream.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ filestreamupdater.lo - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@am_libopenalpp_la_OBJECTS = \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audioenvironment.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ listener.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audiobase.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sourcebase.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ source.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sample.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sounddata.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audioconvert.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ error.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ groupsource.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ netstream.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ streamupdater.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ netupdater.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ stream.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ noinputdevice.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ filestream.lo \ - @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ filestreamupdater.lo - libopenalpp_la_OBJECTS = $(am_libopenalpp_la_OBJECTS) ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/config/depcomp ! @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/audiobase.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/audioconvert.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/audioenvironment.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/deviceupdater.Plo $(DEPDIR)/error.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/filestream.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/filestreamupdater.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/groupsource.Plo $(DEPDIR)/inputdevice.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/listener.Plo $(DEPDIR)/netstream.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/netupdater.Plo $(DEPDIR)/nofilestream.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/noinputdevice.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/nostreaming.Plo $(DEPDIR)/sample.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/sounddata.Plo $(DEPDIR)/source.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/sourcebase.Plo $(DEPDIR)/stream.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/streamupdater.Plo ! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ! $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ! $(AM_CXXFLAGS) $(CXXFLAGS) ! CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ! $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ ! DIST_SOURCES = $(libopenalpp_la_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in ! SOURCES = $(libopenalpp_la_SOURCES) - all: all-am .SUFFIXES: ! .SUFFIXES: .cpp .lo .o .obj ! mostlyclean-libtool: ! -rm -f *.lo - clean-libtool: - -rm -rf .libs _libs ! distclean-libtool: ! -rm -f libtool ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --foreign src/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && \ ! CONFIG_HEADERS= CONFIG_LINKS= \ ! CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- 93,277 ---- lib_LTLIBRARIES = libopenalpp.la mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(lib_LTLIBRARIES) ! DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! libopenalpp_la_LDFLAGS = ! libopenalpp_la_LIBADD = ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@listener.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audiobase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@source.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sample.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sounddata.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@error.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@groupsource.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netstream.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@streamupdater.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netupdater.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@stream.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@noinputdevice.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@nofilestream.lo ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@listener.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audiobase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@source.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sample.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sounddata.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@error.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@groupsource.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nostreaming.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@noinputdevice.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nofilestream.lo ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@listener.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audiobase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@source.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sample.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sounddata.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@error.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@groupsource.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nostreaming.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@noinputdevice.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nofilestream.lo ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@listener.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audiobase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@source.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sample.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sounddata.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@error.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@groupsource.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netstream.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@streamupdater.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netupdater.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@stream.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@noinputdevice.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestream.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestreamupdater.lo ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@listener.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audiobase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@source.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sample.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sounddata.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@error.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@groupsource.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netstream.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@streamupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@stream.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@deviceupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@inputdevice.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@nofilestream.lo ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@listener.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audiobase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@source.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sample.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sounddata.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@error.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@groupsource.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netstream.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@streamupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@stream.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@deviceupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@inputdevice.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestream.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestreamupdater.lo ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@listener.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audiobase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@source.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sample.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sounddata.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@error.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@groupsource.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nostreaming.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@noinputdevice.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nofilestream.lo ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@listener.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audiobase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@source.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sample.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sounddata.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@error.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@groupsource.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nostreaming.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@noinputdevice.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nofilestream.lo CXXFLAGS = @CXXFLAGS@ ! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = Makefile.am Makefile.in + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + + TAR = tar + GZIP_ENV = --best + DEP_FILES = .deps/audiobase.P .deps/audioconvert.P \ + .deps/audioenvironment.P .deps/deviceupdater.P .deps/error.P \ + .deps/filestream.P .deps/filestreamupdater.P .deps/groupsource.P \ + .deps/inputdevice.P .deps/listener.P .deps/netstream.P \ + .deps/netupdater.P .deps/nofilestream.P .deps/noinputdevice.P \ + .deps/nostreaming.P .deps/sample.P .deps/sounddata.P .deps/source.P \ + .deps/sourcebase.P .deps/stream.P .deps/streamupdater.P + SOURCES = $(libopenalpp_la_SOURCES) + OBJECTS = $(libopenalpp_la_OBJECTS) + + all: all-redirect .SUFFIXES: ! .SUFFIXES: .S .c .cpp .lo .o .obj .s ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! mostlyclean-libLTLIBRARIES: ! ! clean-libLTLIBRARIES: ! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ! ! distclean-libLTLIBRARIES: ! ! maintainer-clean-libLTLIBRARIES: ! install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) *************** *** 313,318 **** @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done --- 279,284 ---- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done *************** *** 320,517 **** uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done ! clean-libLTLIBRARIES: ! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ! libopenalpp.la: $(libopenalpp_la_OBJECTS) $(libopenalpp_la_DEPENDENCIES) ! $(CXXLINK) -rpath $(libdir) $(libopenalpp_la_LDFLAGS) $(libopenalpp_la_OBJECTS) $(libopenalpp_la_LIBADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audiobase.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audioconvert.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audioenvironment.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/deviceupdater.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/error.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filestream.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filestreamupdater.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groupsource.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inputdevice.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/listener.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/netstream.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/netupdater.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nofilestream.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/noinputdevice.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nostreaming.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sample.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sounddata.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/source.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sourcebase.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stream.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/streamupdater.Plo@am__quote@ ! distclean-depend: ! -rm -rf $(DEPDIR) ! .cpp.o: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! .cpp.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `cygpath -w $<` .cpp.lo: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! CXXDEPMODE = @CXXDEPMODE@ ! uninstall-info-am: tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) - - installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) ! install: install-am ! install-exec: install-exec-am ! install-data: install-data-am ! uninstall: uninstall-am ! install-am: all-am ! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! installcheck: installcheck-am ! install-strip: ! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! `test -z '$(STRIP)' || \ ! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ! mostlyclean-generic: ! clean-generic: ! distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* ! maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ ! mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags dvi: dvi-am ! dvi-am: ! info: info-am - info-am: ! install-data-am: ! install-exec-am: install-libLTLIBRARIES ! install-info: install-info-am ! install-man: ! installcheck-am: ! maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! mostlyclean: mostlyclean-am ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES - .PHONY: GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ - distclean-depend distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool tags uninstall \ - uninstall-am uninstall-info-am uninstall-libLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 286,517 ---- uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) ! list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done ! # FIXME: We should only use cygpath when building on Windows, ! # and only if it is available. ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` ! ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs + distclean-libtool: + + maintainer-clean-libtool: + + libopenalpp.la: $(libopenalpp_la_OBJECTS) $(libopenalpp_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libopenalpp_la_LDFLAGS) $(libopenalpp_la_OBJECTS) $(libopenalpp_la_LIBADD) $(LIBS) + .cpp.o: + $(CXXCOMPILE) -c $< + .cpp.obj: + $(CXXCOMPILE) -c `cygpath -w $<` .cpp.lo: ! $(LTCXXCOMPILE) -c $< tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! ! subdir = src distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done ! DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) ! -include $(DEP_FILES) ! mostlyclean-depend: ! clean-depend: ! distclean-depend: ! -rm -rf .deps ! maintainer-clean-depend: ! %.o: %.c ! @echo '$(COMPILE) -c $<'; \ ! $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ! @-cp .deps/$(*F).pp .deps/$(*F).P; \ ! tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ ! rm .deps/$(*F).pp ! %.lo: %.c ! @echo '$(LTCOMPILE) -c $<'; \ ! $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ! @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ! < .deps/$(*F).pp > .deps/$(*F).P; \ ! tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ ! rm -f .deps/$(*F).pp ! %.o: %.cpp ! @echo '$(CXXCOMPILE) -c $<'; \ ! $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ! @-cp .deps/$(*F).pp .deps/$(*F).P; \ ! tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ ! rm .deps/$(*F).pp + %.lo: %.cpp + @echo '$(LTCXXCOMPILE) -c $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp + info-am: + info: info-am + dvi-am: dvi: dvi-am + check-am: all-am + check: check-am + installcheck-am: + installcheck: installcheck-am + install-exec-am: install-libLTLIBRARIES + install-exec: install-exec-am ! install-data-am: ! install-data: install-data-am ! install-am: all-am ! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! install: install-am ! uninstall-am: uninstall-libLTLIBRARIES ! uninstall: uninstall-am ! all-am: Makefile $(LTLIBRARIES) ! all-redirect: all-am ! install-strip: ! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(libdir) ! mostlyclean-generic: ! clean-generic: ! distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* ! maintainer-clean-generic: ! mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ ! clean-depend clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-libLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-depend \ ! distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-depend \ ! maintainer-clean-generic distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." ! ! maintainer-clean: maintainer-clean-am ! ! .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ ! clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ ! uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ ! distclean-compile clean-compile maintainer-clean-compile \ ! mostlyclean-libtool distclean-libtool clean-libtool \ ! maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ! distclean-depend clean-depend maintainer-clean-depend info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: audiobase.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/audiobase.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** audiobase.cpp 21 Feb 2003 14:47:15 -0000 1.11 --- audiobase.cpp 16 Apr 2003 11:15:04 -0000 1.12 *************** *** 23,29 **** */ #include "openalpp/audiobase.h" #include "stdio.h" - namespace openalpp { --- 23,29 ---- */ + #include "openalpp/audiobase.h" #include "stdio.h" namespace openalpp { Index: filestream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/filestream.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** filestream.cpp 7 Mar 2003 20:30:03 -0000 1.3 --- filestream.cpp 16 Apr 2003 11:15:04 -0000 1.4 *************** *** 27,30 **** --- 27,35 ---- #include "openalpp/sample.h" + #ifdef _WIN32 /* We need the following two to set stdin/stdout to binary */ + #include <io.h> + #include <fcntl.h> + #endif + namespace openalpp { *************** *** 35,38 **** --- 40,50 ---- if(!filehandle) throw FileError("FileStream: Couldn't open file"); + + #ifdef _WIN32 /* We need to set stdin/stdout to binary mode. Damn windows. */ + /* Beware the evil ifdef. We avoid these where we can, but this one we + cannot. Don't add any more, you'll probably go to hell if you do. */ + _setmode( _fileno( filehandle ), _O_BINARY ); + _setmode( _fileno( filehandle ), _O_BINARY ); + #endif // Check for file type, create a FileStreamUpdater if a known type is Index: groupsource.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/groupsource.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** groupsource.cpp 19 Feb 2003 18:47:20 -0000 1.5 --- groupsource.cpp 16 Apr 2003 11:15:05 -0000 1.6 *************** *** 140,144 **** alGetListenerfv(AL_ORIENTATION,orientation); //Normalize at and up vectors ! dist=sqrt(orientation[0]*orientation[0]+ orientation[1]*orientation[1]+ orientation[2]*orientation[2]); --- 140,144 ---- alGetListenerfv(AL_ORIENTATION,orientation); //Normalize at and up vectors ! dist=(float)sqrt(orientation[0]*orientation[0]+ orientation[1]*orientation[1]+ orientation[2]*orientation[2]); *************** *** 148,152 **** orientation[1]/=dist; orientation[2]/=dist; ! dist=sqrt(orientation[3]*orientation[3]+ orientation[4]*orientation[4]+ orientation[5]*orientation[5]); --- 148,152 ---- orientation[1]/=dist; orientation[2]/=dist; ! dist=(float)sqrt(orientation[3]*orientation[3]+ orientation[4]*orientation[4]+ orientation[5]*orientation[5]); *************** *** 169,173 **** right[2]=orientation[0]*orientation[4]-orientation[3]*orientation[1]; // The length of the cross-product of two normalized vectors will be sqrt(2) ! float dsqrt2=5.0/sqrt(2); right[0]*=dsqrt2; right[1]*=dsqrt2; --- 169,173 ---- right[2]=orientation[0]*orientation[4]-orientation[3]*orientation[1]; // The length of the cross-product of two normalized vectors will be sqrt(2) ! float dsqrt2=(float)5.0/sqrt(2); right[0]*=dsqrt2; right[1]*=dsqrt2; *************** *** 413,417 **** } ALint amp; ! for(int i=0;i<(size/2);i++) { amp=bdata[i]+data[i]; if(amp>32767) --- 413,417 ---- } ALint amp; ! for(unsigned int i=0;i<(size/2);i++) { amp=bdata[i]+data[i]; if(amp>32767) Index: nofilestream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/nofilestream.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nofilestream.cpp 28 Feb 2003 08:36:23 -0000 1.2 --- nofilestream.cpp 16 Apr 2003 11:15:05 -0000 1.3 *************** *** 27,31 **** namespace openalpp { ! FileStream::FileStream(const char */*filename*/,const int /*buffersize*/) throw (NameError,InitError,FileError) : Stream() { throw InitError("No support for streaming from files compiled in."); --- 27,31 ---- namespace openalpp { ! FileStream::FileStream(const char *,const int) throw (NameError,InitError,FileError) : Stream() { throw InitError("No support for streaming from files compiled in."); *************** *** 40,43 **** --- 40,44 ---- FileStream &FileStream::operator=(const FileStream &/*stream*/) { + return *this; } Index: nostreaming.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/nostreaming.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nostreaming.cpp 16 Feb 2003 22:37:02 -0000 1.1 --- nostreaming.cpp 16 Apr 2003 11:15:06 -0000 1.2 *************** *** 36,39 **** --- 36,40 ---- Stream &Stream::operator=(const Stream &stream) { + return *this; } *************** *** 64,67 **** --- 65,69 ---- NetStream &NetStream::operator=(const NetStream &stream) { + return *this; } |
Update of /cvsroot/alpp/openalpp/VisualStudio In directory sc8-pr-cvs1:/tmp/cvs-serv8710/VisualStudio Modified Files: moving.vcproj openalpp.sln openalpp.vcproj simple.vcproj testmic.vcproj testsend.vcproj teststream.vcproj Added Files: testfstream.vcproj Log Message: Changed windows version to dynamic library style. (Only under .NET) Fixed filestream.cpp so it works under windows. --- NEW FILE: testfstream.vcproj --- <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.00" Name="testfstream" ProjectGUID="{3B36C471-B270-4A97-8A7E-0681ACAFB492}" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="..\bin" IntermediateDirectory=".\testfstream___Win32_Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="..\include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\testfstream___Win32_Debug/testfstream.pch" AssemblerListingLocation=".\testfstream___Win32_Debug/" ObjectFile=".\testfstream___Win32_Debug/" ProgramDataBaseFileName=".\testfstream___Win32_Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="ccgnu2.lib" OutputFile="$(OutDir)/$(ProjectName)d.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" IgnoreDefaultLibraryNames="libcd" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\testfstream___Win32_Debug/testfstream.pdb" SubSystem="1"/> <Tool Name="VCMIDLTool" TypeLibraryName=".\testfstream___Win32_Debug/testfstream.tlb"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1053"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory=".\testfstream___Win32_Release" IntermediateDirectory=".\testfstream___Win32_Release" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="..\include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\testfstream___Win32_Release/testfstream.pch" AssemblerListingLocation=".\testfstream___Win32_Release/" ObjectFile=".\testfstream___Win32_Release/" ProgramDataBaseFileName=".\testfstream___Win32_Release/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="odbc32.lib odbccp32.lib openal32.lib alut.lib ccgnu2.lib wsock32.lib" OutputFile="$(OutDir)/$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\lib" ProgramDatabaseFile=".\testfstream___Win32_Release/testfstream.pdb" SubSystem="1"/> <Tool Name="VCMIDLTool" TypeLibraryName=".\testfstream___Win32_Release/testfstream.tlb"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1053"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> </Configurations> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> <File RelativePath="..\tests\testfstream.cpp"> </File> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> Index: moving.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/moving.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** moving.vcproj 18 Oct 2002 07:50:03 -0000 1.1 --- moving.vcproj 16 Apr 2003 11:14:59 -0000 1.2 *************** *** 1,138 **** ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="moving" ! ProjectGUID="{B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory=".\Debug" ! IntermediateDirectory=".\Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="1" ! AdditionalIncludeDirectories="..\include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Debug/moving.pch" ! AssemblerListingLocation=".\Debug/" ! ObjectFile=".\Debug/" ! ProgramDataBaseFileName=".\Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="odbc32.lib odbccp32.lib openalppd.lib openal32.lib alut.lib ccgnu2d.lib" ! OutputFile="bin/moving.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd.lib" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\Debug/moving.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Debug/moving.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory=".\Release" ! IntermediateDirectory=".\Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="1" ! AdditionalIncludeDirectories="..\include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Release/moving.pch" ! AssemblerListingLocation=".\Release/" ! ObjectFile=".\Release/" ! ProgramDataBaseFileName=".\Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="odbc32.lib odbccp32.lib openalpp.lib openal32.lib alut.lib ccgnu2.lib" ! OutputFile="bin/moving.exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! ProgramDatabaseFile=".\Release/moving.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Release/moving.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\moving.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,138 ---- ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="moving" ! ProjectGUID="{B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="1" ! AdditionalIncludeDirectories="..\include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Debug/moving.pch" ! AssemblerListingLocation=".\Debug/" ! ObjectFile=".\Debug/" ! ProgramDataBaseFileName=".\Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2d.lib" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd.lib" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\Debug/moving.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Debug/moving.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory=".\Release" ! IntermediateDirectory=".\Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="1" ! AdditionalIncludeDirectories="..\include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Release/moving.pch" ! AssemblerListingLocation=".\Release/" ! ObjectFile=".\Release/" ! ProgramDataBaseFileName=".\Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies=" ccgnu2.lib" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! ProgramDatabaseFile=".\Release/moving.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Release/moving.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\moving.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: openalpp.sln =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.sln,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** openalpp.sln 18 Oct 2002 07:50:04 -0000 1.1 --- openalpp.sln 16 Apr 2003 11:15:00 -0000 1.2 *************** *** 1,56 **** ! Microsoft Visual Studio Solution File, Format Version 7.00 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openalpp", "openalpp.vcproj", "{358B15AF-C2B1-490F-ABB7-0AD1AA96D335}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moving", "moving.vcproj", "{B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple", "simple.vcproj", "{33F6F3B5-3247-476A-A2D9-19316B88423B}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testmic", "testmic.vcproj", "{F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsend", "testsend.vcproj", "{9740C9CE-674E-4083-80FE-9ADE598B0000}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "teststream", "teststream.vcproj", "{3B36C471-B270-4A97-8A7E-0681ACAFB492}" ! EndProject ! Global ! GlobalSection(SolutionConfiguration) = preSolution ! ConfigName.0 = Debug ! ConfigName.1 = Release ! EndGlobalSection ! GlobalSection(ProjectDependencies) = postSolution ! {B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}.0 = {358B15AF-C2B1-490F-ABB7-0AD1AA96D335} ! {33F6F3B5-3247-476A-A2D9-19316B88423B}.0 = {358B15AF-C2B1-490F-ABB7-0AD1AA96D335} ! {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.0 = {358B15AF-C2B1-490F-ABB7-0AD1AA96D335} ! {9740C9CE-674E-4083-80FE-9ADE598B0000}.0 = {358B15AF-C2B1-490F-ABB7-0AD1AA96D335} ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.0 = {358B15AF-C2B1-490F-ABB7-0AD1AA96D335} ! EndGlobalSection ! GlobalSection(ProjectConfiguration) = postSolution ! {358B15AF-C2B1-490F-ABB7-0AD1AA96D335}.Debug.ActiveCfg = Debug|Win32 ! {358B15AF-C2B1-490F-ABB7-0AD1AA96D335}.Debug.Build.0 = Debug|Win32 ! {358B15AF-C2B1-490F-ABB7-0AD1AA96D335}.Release.ActiveCfg = Release|Win32 ! {358B15AF-C2B1-490F-ABB7-0AD1AA96D335}.Release.Build.0 = Release|Win32 ! {B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}.Debug.ActiveCfg = Debug|Win32 ! {B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}.Debug.Build.0 = Debug|Win32 ! {B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}.Release.ActiveCfg = Release|Win32 ! {B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}.Release.Build.0 = Release|Win32 ! {33F6F3B5-3247-476A-A2D9-19316B88423B}.Debug.ActiveCfg = Debug|Win32 ! {33F6F3B5-3247-476A-A2D9-19316B88423B}.Debug.Build.0 = Debug|Win32 ! {33F6F3B5-3247-476A-A2D9-19316B88423B}.Release.ActiveCfg = Release|Win32 ! {33F6F3B5-3247-476A-A2D9-19316B88423B}.Release.Build.0 = Release|Win32 ! {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.Debug.ActiveCfg = Debug|Win32 ! {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.Debug.Build.0 = Debug|Win32 ! {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.Release.ActiveCfg = Release|Win32 ! {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.Release.Build.0 = Release|Win32 ! {9740C9CE-674E-4083-80FE-9ADE598B0000}.Debug.ActiveCfg = Debug|Win32 ! {9740C9CE-674E-4083-80FE-9ADE598B0000}.Debug.Build.0 = Debug|Win32 ! {9740C9CE-674E-4083-80FE-9ADE598B0000}.Release.ActiveCfg = Release|Win32 ! {9740C9CE-674E-4083-80FE-9ADE598B0000}.Release.Build.0 = Release|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Debug.ActiveCfg = Debug|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Debug.Build.0 = Debug|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Release.ActiveCfg = Release|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Release.Build.0 = Release|Win32 ! EndGlobalSection ! GlobalSection(ExtensibilityGlobals) = postSolution ! EndGlobalSection ! GlobalSection(ExtensibilityAddIns) = postSolution ! EndGlobalSection ! EndGlobal --- 1,63 ---- ! Microsoft Visual Studio Solution File, Format Version 7.00 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moving", "moving.vcproj", "{B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple", "simple.vcproj", "{33F6F3B5-3247-476A-A2D9-19316B88423B}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testmic", "testmic.vcproj", "{F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsend", "testsend.vcproj", "{9740C9CE-674E-4083-80FE-9ADE598B0000}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "teststream", "teststream.vcproj", "{3B36C471-B270-4A97-8A7E-0681ACAFB492}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfstream", "testfstream.vcproj", "{3B36C471-B270-4A97-8A7E-0681ACAFB492}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openalpp", "openalpp.vcproj", "{2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}" ! EndProject ! Global ! GlobalSection(SolutionConfiguration) = preSolution ! ConfigName.0 = Debug ! ConfigName.1 = Release ! EndGlobalSection ! GlobalSection(ProjectDependencies) = postSolution ! {B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} ! {33F6F3B5-3247-476A-A2D9-19316B88423B}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} ! {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} ! {9740C9CE-674E-4083-80FE-9ADE598B0000}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.0 = {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3} ! EndGlobalSection ! GlobalSection(ProjectConfiguration) = postSolution ! {B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}.Debug.ActiveCfg = Debug|Win32 ! {B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}.Debug.Build.0 = Debug|Win32 ! {B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}.Release.ActiveCfg = Release|Win32 ! {B9EDEBD3-BCC0-4ADB-A2BE-CAA2FBCD587E}.Release.Build.0 = Release|Win32 ! {33F6F3B5-3247-476A-A2D9-19316B88423B}.Debug.ActiveCfg = Debug|Win32 ! {33F6F3B5-3247-476A-A2D9-19316B88423B}.Debug.Build.0 = Debug|Win32 ! {33F6F3B5-3247-476A-A2D9-19316B88423B}.Release.ActiveCfg = Release|Win32 ! {33F6F3B5-3247-476A-A2D9-19316B88423B}.Release.Build.0 = Release|Win32 ! {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.Debug.ActiveCfg = Debug|Win32 ! {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.Debug.Build.0 = Debug|Win32 ! {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.Release.ActiveCfg = Release|Win32 ! {F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}.Release.Build.0 = Release|Win32 ! {9740C9CE-674E-4083-80FE-9ADE598B0000}.Debug.ActiveCfg = Debug|Win32 ! {9740C9CE-674E-4083-80FE-9ADE598B0000}.Debug.Build.0 = Debug|Win32 ! {9740C9CE-674E-4083-80FE-9ADE598B0000}.Release.ActiveCfg = Release|Win32 ! {9740C9CE-674E-4083-80FE-9ADE598B0000}.Release.Build.0 = Release|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Debug.ActiveCfg = Debug|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Debug.Build.0 = Debug|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Release.ActiveCfg = Release|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Release.Build.0 = Release|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Debug.ActiveCfg = Debug|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Debug.Build.0 = Debug|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Release.ActiveCfg = Release|Win32 ! {3B36C471-B270-4A97-8A7E-0681ACAFB492}.Release.Build.0 = Release|Win32 ! {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}.Debug.ActiveCfg = Debug|Win32 ! {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}.Debug.Build.0 = Debug|Win32 ! {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}.Release.ActiveCfg = Release|Win32 ! {2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}.Release.Build.0 = Release|Win32 ! EndGlobalSection ! GlobalSection(ExtensibilityGlobals) = postSolution ! EndGlobalSection ! GlobalSection(ExtensibilityAddIns) = postSolution ! EndGlobalSection ! EndGlobal Index: openalpp.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/openalpp.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** openalpp.vcproj 18 Oct 2002 07:50:04 -0000 1.1 --- openalpp.vcproj 16 Apr 2003 11:15:00 -0000 1.2 *************** *** 1,222 **** ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="openalpp" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\lib" ! IntermediateDirectory=".\Debug" ! ConfigurationType="4" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="1" ! AdditionalIncludeDirectories="..\include" ! PreprocessorDefinitions="WIN32,_DEBUG,_LIB" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Debug/openalpp.pch" ! AssemblerListingLocation=".\Debug/" ! ObjectFile=".\Debug/" ! ProgramDataBaseFileName=".\Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLibrarianTool" ! OutputFile="$(OutDir)\openalpp.lib" ! SuppressStartupBanner="TRUE"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="..\lib" ! IntermediateDirectory=".\Release" ! ConfigurationType="4" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="1" ! AdditionalIncludeDirectories="..\include" ! PreprocessorDefinitions="WIN32,NDEBUG,_LIB" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Release/openalpp.pch" ! AssemblerListingLocation=".\Release/" ! ObjectFile=".\Release/" ! ProgramDataBaseFileName=".\Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLibrarianTool" ! OutputFile="$(OutDir)\openalpp.lib" ! SuppressStartupBanner="TRUE"/> ! <Tool ! Name="VCMIDLTool"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\src\audiobase.cpp"> ! </File> ! <File ! RelativePath="..\src\audioconvert.cpp"> ! </File> ! <File ! RelativePath="..\src\audioenvironment.cpp"> ! </File> ! <File ! RelativePath="..\src\deviceupdater.cpp"> ! </File> ! <File ! RelativePath="..\src\error.cpp"> ! </File> ! <File ! RelativePath="..\src\groupsource.cpp"> ! </File> ! <File ! RelativePath="..\src\inputdevice.cpp"> ! </File> ! <File ! RelativePath="..\src\listener.cpp"> ! </File> ! <File ! RelativePath="..\src\netstream.cpp"> ! </File> ! <File ! RelativePath="..\src\netupdater.cpp"> ! </File> ! <File ! RelativePath="..\src\sample.cpp"> ! </File> ! <File ! RelativePath="..\src\sounddata.cpp"> ! </File> ! <File ! RelativePath="..\src\source.cpp"> ! </File> ! <File ! RelativePath="..\src\sourcebase.cpp"> ! </File> ! <File ! RelativePath="..\src\stream.cpp"> ! </File> ! <File ! RelativePath="..\src\streamupdater.cpp"> ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl"> ! <File ! RelativePath="..\include\openalpp\alpp.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\audiobase.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\audioconvert.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\audioenvironment.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\deviceupdater.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\error.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\groupsource.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\inputdevice.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\listener.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\netstream.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\netupdater.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\positionedobject.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\sample.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\sounddata.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\source.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\sourcebase.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\stream.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\streamupdater.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\windowsstuff.h"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,273 ---- ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="openalpp" ! ProjectGUID="{2BA79A95-C0A7-4F13-9D84-7912AEA4A8B3}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="../lib" ! IntermediateDirectory=".\Debug" ! ConfigurationType="2" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="_DEBUG;_WINDOWS;_USRDLL;OPENALPP_EXPORTS;WIN32" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! RuntimeTypeInfo="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Debug/openalpp.pch" ! AssemblerListingLocation=".\Debug/" ! ObjectFile=".\Debug/" ! ProgramDataBaseFileName=".\Debug/" ! BrowseInformation="1" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2d.lib alut.lib openal32.lib vorbisfile_d.lib ogg_d.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib" ! OutputFile="../bin/openalppd.dll" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="../lib,c:\projects\osgvr\lib,c:\projects\ConfigScript\lib,c:\projects\vrutils\lib,C:\tools\cmltoolkit\lib.chk\win32_single_msvcrt,c:\projects\openalpp\lib" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\../lib/openalppd.pdb" ! ImportLibrary=".\../lib/openalppd.lib"/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="_DEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1" ! TypeLibraryName=".\../lib/openalpp.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory=".\../lib" ! IntermediateDirectory=".\Release" ! ConfigurationType="2" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;OPENALPP_EXPORTS;WIN32" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! RuntimeTypeInfo="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Release/openalpp.pch" ! AssemblerListingLocation=".\Release/" ! ObjectFile=".\Release/" ! ProgramDataBaseFileName=".\Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2.lib alut.lib openal32.lib vorbisfile.lib ogg.lib pastaticdsd.lib winmm.lib wsock32.lib dsound.lib" ! OutputFile="$(OutDir)/$(ProjectName).dll" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="./lib,c:\projects\osgvr\lib,c:\projects\ConfigScript\lib,c:\projects\vrutils\lib,C:\tools\cmltoolkit\lib.rel\win32_single_msvcrt,c:\projects\openalpp\lib" ! IgnoreDefaultLibraryNames="LIBCD,MSVCRTD" ! ProgramDatabaseFile=".\../lib/openalpp.pdb" ! ImportLibrary=".\../lib/openalpp.lib"/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="NDEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1" ! TypeLibraryName=".\../lib/openalpp.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source files" ! Filter=""> ! <File ! RelativePath="..\src\audiobase.cpp"> ! </File> ! <File ! RelativePath="..\src\audioconvert.cpp"> ! </File> ! <File ! RelativePath="..\src\audioenvironment.cpp"> ! </File> ! <File ! RelativePath="..\src\deviceupdater.cpp"> ! </File> ! <File ! RelativePath="..\src\error.cpp"> ! </File> ! <File ! RelativePath="..\src\filestream.cpp"> ! </File> ! <File ! RelativePath="..\src\filestreamupdater.cpp"> ! </File> ! <File ! RelativePath="..\src\groupsource.cpp"> ! </File> ! <File ! RelativePath="..\src\inputdevice.cpp"> ! </File> ! <File ! RelativePath="..\src\listener.cpp"> ! </File> ! <File ! RelativePath="..\src\netstream.cpp"> ! </File> ! <File ! RelativePath="..\src\netupdater.cpp"> ! </File> ! <File ! RelativePath="..\src\openalpp.cpp"> ! </File> ! <File ! RelativePath="..\src\sample.cpp"> ! </File> ! <File ! RelativePath="..\src\sounddata.cpp"> ! </File> ! <File ! RelativePath="..\src\source.cpp"> ! </File> ! <File ! RelativePath="..\src\sourcebase.cpp"> ! </File> ! <File ! RelativePath="..\src\stream.cpp"> ! </File> ! <File ! RelativePath="..\src\streamupdater.cpp"> ! </File> ! </Filter> ! <Filter ! Name="Header files" ! Filter=""> ! <File ! RelativePath="..\include\openalpp\alpp.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\audiobase.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\audioconvert.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\audioenvironment.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\deviceupdater.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\error.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\export.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\filestream.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\filestreamupdater.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\groupsource.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\inputdevice.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\listener.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\netstream.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\netupdater.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\positionedobject.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\sample.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\sounddata.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\source.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\sourcebase.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\stream.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\streamupdater.h"> ! </File> ! <File ! RelativePath="..\include\openalpp\windowsstuff.h"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: simple.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/simple.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** simple.vcproj 18 Oct 2002 07:50:04 -0000 1.1 --- simple.vcproj 16 Apr 2003 11:15:00 -0000 1.2 *************** *** 1,139 **** ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="simple" ! ProjectGUID="{33F6F3B5-3247-476A-A2D9-19316B88423B}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Release|Win32" ! OutputDirectory=".\Release" ! IntermediateDirectory=".\Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="..\include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Release/simple.pch" ! AssemblerListingLocation=".\Release/" ! ObjectFile=".\Release/" ! ProgramDataBaseFileName=".\Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="odbc32.lib odbccp32.lib openalpp.lib openal32.lib alut.lib ccgnu2.lib" ! OutputFile="bin\simple.exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="MSVCRTD,libcd" ! ProgramDatabaseFile=".\Release/simple.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Release/simple.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory=".\Debug" ! IntermediateDirectory=".\Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="..\include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Debug/simple.pch" ! AssemblerListingLocation=".\Debug/" ! ObjectFile=".\Debug/" ! ProgramDataBaseFileName=".\Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="odbc32.lib odbccp32.lib openalppd.lib openal32.lib alut.lib ccgnu2d.lib" ! OutputFile="bin\simple.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd.lib" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\Debug/simple.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Debug/simple.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\simple.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,139 ---- ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="simple" ! ProjectGUID="{33F6F3B5-3247-476A-A2D9-19316B88423B}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Release|Win32" ! OutputDirectory=".\Release" ! IntermediateDirectory=".\Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="..\include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Release/simple.pch" ! AssemblerListingLocation=".\Release/" ! ObjectFile=".\Release/" ! ProgramDataBaseFileName=".\Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2.lib" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="MSVCRTD,libcd" ! ProgramDatabaseFile=".\Release/simple.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Release/simple.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="..\include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\Debug/simple.pch" ! AssemblerListingLocation=".\Debug/" ! ObjectFile=".\Debug/" ! ProgramDataBaseFileName=".\Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2d.lib" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd.lib" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\Debug/simple.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\Debug/simple.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\simple.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: testmic.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/testmic.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** testmic.vcproj 18 Oct 2002 07:50:04 -0000 1.1 --- testmic.vcproj 16 Apr 2003 11:15:00 -0000 1.2 *************** *** 1,139 **** ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="testmic" ! ProjectGUID="{F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Release|Win32" ! OutputDirectory=".\testmic___Win32_Release" ! IntermediateDirectory=".\testmic___Win32_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testmic___Win32_Release/testmic.pch" ! AssemblerListingLocation=".\testmic___Win32_Release/" ! ObjectFile=".\testmic___Win32_Release/" ! ProgramDataBaseFileName=".\testmic___Win32_Release/" ! BrowseInformation="1" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="odbc32.lib odbccp32.lib openalpp.lib openal32.lib alut.lib ccgnu2.lib pastaticdsd.lib dsound.lib winmm.lib" ! OutputFile="bin\testmic.exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd" ! ProgramDatabaseFile=".\testmic___Win32_Release/testmic.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testmic___Win32_Release/testmic.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory=".\testmic___Win32_Debug" ! IntermediateDirectory=".\testmic___Win32_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testmic___Win32_Debug/testmic.pch" ! AssemblerListingLocation=".\testmic___Win32_Debug/" ! ObjectFile=".\testmic___Win32_Debug/" ! ProgramDataBaseFileName=".\testmic___Win32_Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="odbc32.lib odbccp32.lib openalppd.lib openal32.lib alut.lib ccgnu2d.lib pastaticdsd.lib dsound.lib winmm.lib" ! OutputFile="bin\testmic.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd.lib" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\testmic___Win32_Debug/testmic.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testmic___Win32_Debug/testmic.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\testmic.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,139 ---- ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="testmic" ! ProjectGUID="{F98212F5-A462-4F75-9AF6-4ED4E79A4B1F}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Release|Win32" ! OutputDirectory=".\testmic___Win32_Release" ! IntermediateDirectory=".\testmic___Win32_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testmic___Win32_Release/testmic.pch" ! AssemblerListingLocation=".\testmic___Win32_Release/" ! ObjectFile=".\testmic___Win32_Release/" ! ProgramDataBaseFileName=".\testmic___Win32_Release/" ! BrowseInformation="1" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="odbc32.lib odbccp32.lib openalpp.lib openal32.lib alut.lib ccgnu2.lib pastaticdsd.lib dsound.lib winmm.lib" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd" ! ProgramDatabaseFile=".\testmic___Win32_Release/testmic.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testmic___Win32_Release/testmic.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\testmic___Win32_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="0" ! PrecompiledHeaderFile=".\testmic___Win32_Debug/testmic.pch" ! AssemblerListingLocation=".\testmic___Win32_Debug/" ! ObjectFile=".\testmic___Win32_Debug/" ! ProgramDataBaseFileName=".\testmic___Win32_Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="ccgnu2d.lib" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd.lib" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\testmic___Win32_Debug/testmic.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testmic___Win32_Debug/testmic.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\testmic.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: testsend.vcproj =================================================================== RCS file: /cvsroot/alpp/openalpp/VisualStudio/testsend.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** testsend.vcproj 18 Oct 2002 07:50:05 -0000 1.1 --- testsend.vcproj 16 Apr 2003 11:15:00 -0000 1.2 *************** *** 1,137 **** ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="testsend" ! ProjectGUID="{9740C9CE-674E-4083-80FE-9ADE598B0000}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory=".\testsend___Win32_Debug" ! IntermediateDirectory=".\testsend___Win32_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testsend___Win32_Debug/testsend.pch" ! AssemblerListingLocation=".\testsend___Win32_Debug/" ! ObjectFile=".\testsend___Win32_Debug/" ! ProgramDataBaseFileName=".\testsend___Win32_Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="odbc32.lib odbccp32.lib openal32.lib alut.lib ccgnu2d.lib" ! OutputFile="bin\testsend.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! IgnoreDefaultLibraryNames="libcd" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\testsend___Win32_Debug/testsend.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testsend___Win32_Debug/testsend.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory=".\testsend___Win32_Release" ! IntermediateDirectory=".\testsend___Win32_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testsend___Win32_Release/testsend.pch" ! AssemblerListingLocation=".\testsend___Win32_Release/" ! ObjectFile=".\testsend___Win32_Release/" ! ProgramDataBaseFileName=".\testsend___Win32_Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="odbc32.lib odbccp32.lib openalpp.lib openal32.lib alut.lib ccgnu2.lib wsock32.lib" ! OutputFile="bin\testsend.exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd" ! ProgramDatabaseFile=".\testsend___Win32_Release/testsend.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testsend___Win32_Release/testsend.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="NDEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! </Configurations> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> ! <File ! RelativePath="..\tests\testsend.cpp"> ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,137 ---- ! <?xml version="1.0" encoding = "Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.00" ! Name="testsend" ! ProjectGUID="{9740C9CE-674E-4083-80FE-9ADE598B0000}" ! SccProjectName="" ! SccLocalPath=""> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="..\bin" ! IntermediateDirectory=".\testsend___Win32_Debug" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" ! BasicRuntimeChecks="3" ! RuntimeLibrary="3" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testsend___Win32_Debug/testsend.pch" ! AssemblerListingLocation=".\testsend___Win32_Debug/" ! ObjectFile=".\testsend___Win32_Debug/" ! ProgramDataBaseFileName=".\testsend___Win32_Debug/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! DebugInformationFormat="4"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies=" ccgnu2d.lib" ! OutputFile="$(OutDir)/$(ProjectName)d.exe" ! LinkIncremental="2" ! SuppressStartupBanner="TRUE" ! IgnoreDefaultLibraryNames="libcd" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\testsend___Win32_Debug/testsend.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testsend___Win32_Debug/testsend.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! PreprocessorDefinitions="_DEBUG" ! Culture="1053"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory=".\testsend___Win32_Release" ! IntermediateDirectory=".\testsend___Win32_Release" ! ConfigurationType="1" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE" ! CharacterSet="2"> ! <Tool ! Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" ! OptimizeForProcessor="2" ! AdditionalIncludeDirectories="../include" ! PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" ! StringPooling="TRUE" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="TRUE" ! UsePrecompiledHeader="2" ! PrecompiledHeaderFile=".\testsend___Win32_Release/testsend.pch" ! AssemblerListingLocation=".\testsend___Win32_Release/" ! ObjectFile=".\testsend___Win32_Release/" ! ProgramDataBaseFileName=".\testsend___Win32_Release/" ! WarningLevel="3" ! SuppressStartupBanner="TRUE" ! CompileAs="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/MACHINE:I386" ! AdditionalDependencies="odbc32.lib odbccp32.lib openalpp.lib openal32.lib alut.lib ccgnu2.lib wsock32.lib" ! OutputFile="$(OutDir)/$(ProjectName).exe" ! LinkIncremental="1" ! SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="..\lib" ! IgnoreDefaultLibraryNames="libcd" ! ProgramDatabaseFile=".\testsend___Win32_Release/testsend.pdb" ! SubSystem="1"/> ! <Tool ! Name="VCMIDLTool" ! TypeLibraryName=".\testsend___Win32_Release/testsend.tlb"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool" ! ... [truncated message content] |
From: <vr-...@us...> - 2003-04-16 11:15:34
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv8710 Modified Files: Makefile.in autogen.sh configure Log Message: Changed windows version to dynamic library style. (Only under .NET) Fixed filestream.cpp so it works under windows. Index: Makefile.in =================================================================== RCS file: /cvsroot/alpp/openalpp/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.in 2 Apr 2003 14:11:25 -0000 1.7 --- Makefile.in 16 Apr 2003 11:14:54 -0000 1.8 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,5 ---- ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 12,16 **** # PARTICULAR PURPOSE. - @SET_MAKE@ SHELL = @SHELL@ --- 11,14 ---- *************** *** 34,40 **** --- 32,42 ---- includedir = @includedir@ oldincludedir = /usr/include + + DESTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = . *************** *** 45,53 **** INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : --- 47,55 ---- INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ + NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 58,64 **** host_alias = @host_alias@ host_triplet = @host@ - AMTAR = @AMTAR@ AS = @AS@ - AWK = @AWK@ CC = @CC@ CCGNUCFLAGS = @CCGNUCFLAGS@ --- 60,64 ---- *************** *** 66,76 **** CXX = @CXX@ CXXCPP = @CXXCPP@ - DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 66,75 ---- CXX = @CXX@ CXXCPP = @CXXCPP@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ *************** *** 79,85 **** STRIP = @STRIP@ VERSION = @VERSION@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ SUBDIRS = src include tests --- 78,81 ---- *************** *** 89,155 **** pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = openalpp.pc - subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = openalpp.pc ! DIST_SOURCES = ! DATA = $(pkgconfig_DATA) - RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ - uninstall-info-recursive all-recursive install-data-recursive \ - install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive check-recursive installcheck-recursive - DIST_COMMON = COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \ - config/README config/config.guess config/config.sub \ - config/install-sh config/ltmain.sh config/missing \ - config/mkinstalldirs configure configure.in openalpp.pc.in - DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive ! .SUFFIXES: ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs ! distclean-libtool: ! -rm -f libtool ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --foreign Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && \ ! CONFIG_HEADERS= CONFIG_LINKS= \ ! CONFIG_FILES=$@ $(SHELL) ./config.status ! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) - - $(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) openalpp.pc: $(top_builddir)/config.status openalpp.pc.in ! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status ! uninstall-info-am: install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) ! @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ ! rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ done --- 85,137 ---- pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = openalpp.pc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = openalpp.pc ! DATA = $(pkgconfig_DATA) + DIST_COMMON = COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \ + configure configure.in openalpp.pc.in ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = tar ! GZIP_ENV = --best ! all: all-redirect ! .SUFFIXES: ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) ! cd $(top_builddir) \ ! && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status ! $(ACLOCAL_M4): configure.in ! cd $(srcdir) && $(ACLOCAL) ! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) openalpp.pc: $(top_builddir)/config.status openalpp.pc.in ! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status ! install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ! fi; fi; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) ! list='$(pkgconfig_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ done *************** *** 160,164 **** # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! $(RECURSIVE_TARGETS): @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ --- 142,151 ---- # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! ! @SET_MAKE@ ! ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ *************** *** 183,196 **** @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! case "$@" in \ ! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ! *) list='$(SUBDIRS)' ;; \ ! esac; \ ! rev=''; for subdir in $$list; do \ ! if test "$$subdir" = "."; then :; else \ ! rev="$$subdir $$rev"; \ ! fi; \ done; \ ! rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ --- 170,178 ---- @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ ! rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ ! test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ *************** *** 211,274 **** tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - top_distdir = . - # Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) ! GZIP_ENV = --best ! distdir: $(DISTFILES) ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) ! $(mkinstalldirs) $(distdir)/. $(distdir)/config @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done --- 193,279 ---- tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) ! # This target untars the dist file and tries a VPATH configuration. Then ! # it guarantees that the distribution is self-contained by making another ! # tarfile. ! distcheck: dist ! -rm -rf $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst ! dc_install_base=`cd $(distdir)/=inst && pwd`; \ ! cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ ! && $(MAKE) $(AM_MAKEFLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) dvi \ ! && $(MAKE) $(AM_MAKEFLAGS) check \ ! && $(MAKE) $(AM_MAKEFLAGS) install \ ! && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ! && $(MAKE) $(AM_MAKEFLAGS) dist ! -rm -rf $(distdir) ! @banner="$(distdir).tar.gz is ready for distribution"; \ ! dashes=`echo "$$banner" | sed s/./=/g`; \ ! echo "$$dashes"; \ ! echo "$$banner"; \ ! echo "$$dashes" ! dist: distdir ! -chmod -R a+r $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) ! -rm -rf $(distdir) ! dist-all: distdir ! -chmod -R a+r $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) ! -rm -rf $(distdir) distdir: $(DISTFILES) ! -rm -rf $(distdir) mkdir $(distdir) ! -chmod 777 $(distdir) ! here=`cd $(top_builddir) && pwd`; \ ! top_distdir=`cd $(distdir) && pwd`; \ ! distdir=`cd $(distdir) && pwd`; \ ! cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done *************** *** 278,349 **** || mkdir $(distdir)/$$subdir \ || exit 1; \ ! (cd $$subdir && \ ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" \ ! distdir=../$(distdir)/$$subdir \ ! distdir) \ || exit 1; \ fi; \ done ! -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ! || chmod -R a+r $(distdir) ! dist: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) ! ! # This target untars the dist file and tries a VPATH configuration. Then ! # it guarantees that the distribution is self-contained by making another ! # tarfile. ! distcheck: dist ! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ! chmod -R a-w $(distdir); chmod a+w $(distdir) ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst ! chmod a-w $(distdir) ! dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ ! && cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ ! && $(MAKE) $(AM_MAKEFLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) dvi \ ! && $(MAKE) $(AM_MAKEFLAGS) check \ ! && $(MAKE) $(AM_MAKEFLAGS) install \ ! && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ! && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ ! || (echo "Error: files left after uninstall" 1>&2; \ ! exit 1) ) \ ! && $(MAKE) $(AM_MAKEFLAGS) dist \ ! && $(MAKE) $(AM_MAKEFLAGS) distclean \ ! && rm -f $(distdir).tar.gz \ ! && (test `find . -type f -print | wc -l` -eq 0 \ ! || (echo "Error: files left after distclean" 1>&2; \ ! exit 1) ) ! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) ! @echo "$(distdir).tar.gz is ready for distribution" | \ ! sed 'h;s/./=/g;p;x;p;x' check-am: all-am check: check-recursive ! all-am: Makefile $(DATA) ! installdirs: installdirs-recursive ! installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) ! ! install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive - uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! ! installcheck: installcheck-recursive install-strip: ! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! `test -z '$(STRIP)' || \ ! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: --- 283,319 ---- || mkdir $(distdir)/$$subdir \ || exit 1; \ ! chmod 777 $(distdir)/$$subdir; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ fi; \ done ! info-am: ! info: info-recursive ! dvi-am: ! dvi: dvi-recursive check-am: all-am check: check-recursive ! installcheck-am: ! installcheck: installcheck-recursive ! install-exec-am: install-exec: install-exec-recursive + + install-data-am: install-pkgconfigDATA install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! install: install-recursive ! uninstall-am: uninstall-pkgconfigDATA ! uninstall: uninstall-recursive ! all-am: Makefile $(DATA) ! all-redirect: all-recursive install-strip: ! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ! installdirs: installdirs-recursive ! installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) ! ! mostlyclean-generic: *************** *** 351,417 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-recursive ! ! clean-am: clean-generic clean-libtool mostlyclean-am ! ! dist-all: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) ! distclean: distclean-recursive ! -rm -f config.status config.cache config.log ! distclean-am: clean-am distclean-generic distclean-libtool \ ! distclean-tags ! ! dvi: dvi-recursive ! ! dvi-am: ! ! info: info-recursive ! info-am: ! install-data-am: install-pkgconfigDATA ! install-exec-am: ! install-info: install-info-recursive ! install-man: ! installcheck-am: maintainer-clean: maintainer-clean-recursive ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-recursive ! ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! uninstall-am: uninstall-info-am uninstall-pkgconfigDATA ! ! uninstall-info: uninstall-info-recursive ! ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive dist dist-all \ ! distcheck distclean distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am \ ! dvi-recursive info info-am info-recursive install install-am \ ! install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-info install-info-am install-info-recursive install-man \ ! install-pkgconfigDATA install-recursive install-strip \ ! installcheck installcheck-am installdirs installdirs-am \ ! installdirs-recursive maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am \ ! uninstall-info-recursive uninstall-pkgconfigDATA \ ! uninstall-recursive --- 321,362 ---- distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-tags mostlyclean-generic ! mostlyclean: mostlyclean-recursive ! clean-am: clean-tags clean-generic mostlyclean-am ! clean: clean-recursive ! distclean-am: distclean-tags distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-recursive ! -rm -f config.status ! maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive + -rm -f config.status ! .PHONY: uninstall-pkgconfigDATA install-pkgconfigDATA \ ! install-data-recursive uninstall-data-recursive install-exec-recursive \ ! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ ! all-recursive check-recursive installcheck-recursive info-recursive \ ! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ ! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs-am \ ! installdirs mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean *************** *** 423,426 **** --- 368,372 ---- ALL-install: cd $(top_builddir); make -j4 install + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: autogen.sh =================================================================== RCS file: /cvsroot/alpp/openalpp/autogen.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** autogen.sh 18 Dec 2002 10:33:48 -0000 1.2 --- autogen.sh 16 Apr 2003 11:14:56 -0000 1.3 *************** *** 4,6 **** automake --foreign --add-missing autoconf ! ./configure --disable-libtool-lock $@ --- 4,6 ---- automake --foreign --add-missing autoconf ! ./configure --disable-libtool-lock $@ Index: configure =================================================================== RCS file: /cvsroot/alpp/openalpp/configure,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** configure 2 Apr 2003 14:11:25 -0000 1.6 --- configure 16 Apr 2003 11:14:56 -0000 1.7 *************** *** 13,19 **** # Any additions from configure.in: ac_help="$ac_help - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors" - ac_help="$ac_help --enable-shared[=PKGS] build shared libraries [default=yes]" ac_help="$ac_help --- 13,16 ---- *************** *** 738,745 **** [...2239 lines suppressed...] - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`echo "$file" | sed -e 's|/[^/]*$||'` - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done - exit 0 --- 6204,6210 ---- |
From: <vr-...@us...> - 2003-04-02 14:11:32
|
Update of /cvsroot/alpp/openalpp/tests In directory sc8-pr-cvs1:/tmp/cvs-serv15028/tests Modified Files: Makefile.in Log Message: Added #undef None due to clash with a previous definition in x-headers. Index: Makefile.in =================================================================== RCS file: /cvsroot/alpp/openalpp/tests/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.in 28 Feb 2003 08:36:23 -0000 1.7 --- Makefile.in 2 Apr 2003 14:11:26 -0000 1.8 *************** *** 1,5 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 11,14 **** --- 12,16 ---- # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 32,42 **** includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. --- 34,40 ---- *************** *** 47,55 **** INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : --- 45,53 ---- INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 60,64 **** --- 58,64 ---- host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ CC = @CC@ CCGNUCFLAGS = @CCGNUCFLAGS@ *************** *** 66,75 **** CXX = @CXX@ CXXCPP = @CXXCPP@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ - MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 66,76 ---- CXX = @CXX@ CXXCPP = @CXXCPP@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ *************** *** 78,81 **** --- 79,85 ---- STRIP = @STRIP@ VERSION = @VERSION@ + am__include = @am__include@ + am__quote = @am__quote@ + install_sh = @install_sh@ INCLUDES = -I$(top_builddir)/include *************** *** 100,231 **** @WITH_CCGNU_TRUE@testfstream_SOURCES = testfstream.cpp mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = ! @WITH_CCGNU_TRUE@bin_PROGRAMS = teststream$(EXEEXT) testsend$(EXEEXT) \ ! @WITH_CCGNU_TRUE@testfstream$(EXEEXT) testmic$(EXEEXT) simple$(EXEEXT) \ ! @WITH_CCGNU_TRUE@moving$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) ! DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! @WITH_CCGNU_TRUE@teststream_OBJECTS = teststream.$(OBJEXT) ! teststream_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@teststream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@teststream_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@teststream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! teststream_LDFLAGS = ! @WITH_CCGNU_TRUE@testsend_OBJECTS = testsend.$(OBJEXT) ! testsend_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@testsend_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@testsend_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@testsend_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! testsend_LDFLAGS = ! @WITH_CCGNU_TRUE@testfstream_OBJECTS = testfstream.$(OBJEXT) ! testfstream_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@testfstream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@testfstream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@testfstream_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@testfstream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@testfstream_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! testfstream_LDFLAGS = ! @WITH_CCGNU_TRUE@testmic_OBJECTS = testmic.$(OBJEXT) ! testmic_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@testmic_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@testmic_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@testmic_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! testmic_LDFLAGS = ! @WITH_CCGNU_TRUE@simple_OBJECTS = simple.$(OBJEXT) ! simple_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@simple_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@simple_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@simple_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! simple_LDFLAGS = ! @WITH_CCGNU_TRUE@moving_OBJECTS = moving.$(OBJEXT) ! moving_LDADD = $(LDADD) ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@moving_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@moving_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@moving_DEPENDENCIES = ../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@moving_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@../src/libopenalpp.la ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@moving_DEPENDENCIES = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@../src/libopenalpp.la ! moving_LDFLAGS = ! CXXFLAGS = @CXXFLAGS@ ! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = README Makefile.am Makefile.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = tar ! GZIP_ENV = --best ! DEP_FILES = .deps/moving.P .deps/simple.P .deps/testfstream.P \ ! .deps/testmic.P .deps/testsend.P .deps/teststream.P ! SOURCES = $(teststream_SOURCES) $(testsend_SOURCES) $(testfstream_SOURCES) $(testmic_SOURCES) $(simple_SOURCES) $(moving_SOURCES) ! OBJECTS = $(teststream_OBJECTS) $(testsend_OBJECTS) $(testfstream_OBJECTS) $(testmic_OBJECTS) $(simple_OBJECTS) $(moving_OBJECTS) - all: all-redirect .SUFFIXES: ! .SUFFIXES: .S .c .cpp .lo .o .obj .s ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ! ! mostlyclean-binPROGRAMS: ! ! clean-binPROGRAMS: ! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ! distclean-binPROGRAMS: ! maintainer-clean-binPROGRAMS: install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ! $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done --- 104,274 ---- @WITH_CCGNU_TRUE@testfstream_SOURCES = testfstream.cpp + subdir = tests mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = ! @WITH_CCGNU_TRUE@bin_PROGRAMS = teststream$(EXEEXT) testsend$(EXEEXT) \ ! @WITH_CCGNU_TRUE@ testfstream$(EXEEXT) testmic$(EXEEXT) \ ! @WITH_CCGNU_TRUE@ simple$(EXEEXT) moving$(EXEEXT) ! @WITH_CCGNU_FALSE@bin_PROGRAMS = ! PROGRAMS = $(bin_PROGRAMS) + @WITH_CCGNU_TRUE@am_moving_OBJECTS = moving.$(OBJEXT) + @WITH_CCGNU_FALSE@am_moving_OBJECTS = + moving_OBJECTS = $(am_moving_OBJECTS) + moving_LDADD = $(LDADD) + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@moving_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@moving_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@moving_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@moving_DEPENDENCIES = + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@moving_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@moving_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@moving_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@moving_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + moving_LDFLAGS = + @WITH_CCGNU_TRUE@am_simple_OBJECTS = simple.$(OBJEXT) + @WITH_CCGNU_FALSE@am_simple_OBJECTS = + simple_OBJECTS = $(am_simple_OBJECTS) + simple_LDADD = $(LDADD) + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@simple_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@simple_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + simple_LDFLAGS = + @WITH_CCGNU_TRUE@am_testfstream_OBJECTS = testfstream.$(OBJEXT) + @WITH_CCGNU_FALSE@am_testfstream_OBJECTS = + testfstream_OBJECTS = $(am_testfstream_OBJECTS) + testfstream_LDADD = $(LDADD) + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testfstream_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testfstream_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testfstream_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testfstream_DEPENDENCIES = + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testfstream_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testfstream_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testfstream_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testfstream_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + testfstream_LDFLAGS = + @WITH_CCGNU_TRUE@am_testmic_OBJECTS = testmic.$(OBJEXT) + @WITH_CCGNU_FALSE@am_testmic_OBJECTS = + testmic_OBJECTS = $(am_testmic_OBJECTS) + testmic_LDADD = $(LDADD) + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testmic_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testmic_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + testmic_LDFLAGS = + @WITH_CCGNU_TRUE@am_testsend_OBJECTS = testsend.$(OBJEXT) + @WITH_CCGNU_FALSE@am_testsend_OBJECTS = + testsend_OBJECTS = $(am_testsend_OBJECTS) + testsend_LDADD = $(LDADD) + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@testsend_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@testsend_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + testsend_LDFLAGS = + @WITH_CCGNU_TRUE@am_teststream_OBJECTS = teststream.$(OBJEXT) + @WITH_CCGNU_FALSE@am_teststream_OBJECTS = + teststream_OBJECTS = $(am_teststream_OBJECTS) + teststream_LDADD = $(LDADD) + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@teststream_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ ../src/libopenalpp.la + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@teststream_DEPENDENCIES = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ ../src/libopenalpp.la + teststream_LDFLAGS = ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/config/depcomp ! @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/moving.Po $(DEPDIR)/simple.Po \ ! @AMDEP_TRUE@ $(DEPDIR)/testfstream.Po $(DEPDIR)/testmic.Po \ ! @AMDEP_TRUE@ $(DEPDIR)/testsend.Po $(DEPDIR)/teststream.Po ! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ! $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ! $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ! $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! CXXFLAGS = @CXXFLAGS@ ! DIST_SOURCES = $(moving_SOURCES) $(simple_SOURCES) \ ! $(testfstream_SOURCES) $(testmic_SOURCES) $(testsend_SOURCES) \ ! $(teststream_SOURCES) ! DIST_COMMON = README Makefile.am Makefile.in ! SOURCES = $(moving_SOURCES) $(simple_SOURCES) $(testfstream_SOURCES) $(testmic_SOURCES) $(testsend_SOURCES) $(teststream_SOURCES) ! all: all-am .SUFFIXES: ! .SUFFIXES: .cpp .lo .o .obj ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign tests/Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! if test -f $$p \ ! || test -f $$p1 \ ! ; then \ ! f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done *************** *** 233,435 **** uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! list='$(bin_PROGRAMS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done ! # FIXME: We should only use cygpath when building on Windows, ! # and only if it is available. ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` ! ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! ! maintainer-clean-libtool: ! ! teststream$(EXEEXT): $(teststream_OBJECTS) $(teststream_DEPENDENCIES) ! @rm -f teststream$(EXEEXT) ! $(CXXLINK) $(teststream_LDFLAGS) $(teststream_OBJECTS) $(teststream_LDADD) $(LIBS) ! ! testsend$(EXEEXT): $(testsend_OBJECTS) $(testsend_DEPENDENCIES) ! @rm -f testsend$(EXEEXT) ! $(CXXLINK) $(testsend_LDFLAGS) $(testsend_OBJECTS) $(testsend_LDADD) $(LIBS) ! ! testfstream$(EXEEXT): $(testfstream_OBJECTS) $(testfstream_DEPENDENCIES) ! @rm -f testfstream$(EXEEXT) ! $(CXXLINK) $(testfstream_LDFLAGS) $(testfstream_OBJECTS) $(testfstream_LDADD) $(LIBS) ! ! testmic$(EXEEXT): $(testmic_OBJECTS) $(testmic_DEPENDENCIES) ! @rm -f testmic$(EXEEXT) ! $(CXXLINK) $(testmic_LDFLAGS) $(testmic_OBJECTS) $(testmic_LDADD) $(LIBS) ! simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES) ! @rm -f simple$(EXEEXT) ! $(CXXLINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS) - moving$(EXEEXT): $(moving_OBJECTS) $(moving_DEPENDENCIES) - @rm -f moving$(EXEEXT) - $(CXXLINK) $(moving_LDFLAGS) $(moving_OBJECTS) $(moving_LDADD) $(LIBS) .cpp.o: ! $(CXXCOMPILE) -c $< .cpp.obj: ! $(CXXCOMPILE) -c `cygpath -w $<` .cpp.lo: ! $(LTCXXCOMPILE) -c $< tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) ! ! mostlyclean-tags: ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = tests distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign tests/Makefile @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - - DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) - - -include $(DEP_FILES) - - mostlyclean-depend: - - clean-depend: - - distclean-depend: - -rm -rf .deps - - maintainer-clean-depend: - - %.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - - %.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp - - %.o: %.cpp - @echo '$(CXXCOMPILE) -c $<'; \ - $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - - %.lo: %.cpp - @echo '$(LTCXXCOMPILE) -c $<'; \ - $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: install-binPROGRAMS ! install-exec: install-exec-am ! install-data-am: ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-binPROGRAMS uninstall: uninstall-am - all-am: Makefile $(PROGRAMS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) mostlyclean-generic: --- 276,415 ---- uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ! rm -f $(DESTDIR)$(bindir)/$$f; \ done ! clean-binPROGRAMS: ! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ! moving$(EXEEXT): $(moving_OBJECTS) $(moving_DEPENDENCIES) ! @rm -f moving$(EXEEXT) ! $(CXXLINK) $(moving_LDFLAGS) $(moving_OBJECTS) $(moving_LDADD) $(LIBS) ! simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES) ! @rm -f simple$(EXEEXT) ! $(CXXLINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS) ! testfstream$(EXEEXT): $(testfstream_OBJECTS) $(testfstream_DEPENDENCIES) ! @rm -f testfstream$(EXEEXT) ! $(CXXLINK) $(testfstream_LDFLAGS) $(testfstream_OBJECTS) $(testfstream_LDADD) $(LIBS) ! testmic$(EXEEXT): $(testmic_OBJECTS) $(testmic_DEPENDENCIES) ! @rm -f testmic$(EXEEXT) ! $(CXXLINK) $(testmic_LDFLAGS) $(testmic_OBJECTS) $(testmic_LDADD) $(LIBS) ! testsend$(EXEEXT): $(testsend_OBJECTS) $(testsend_DEPENDENCIES) ! @rm -f testsend$(EXEEXT) ! $(CXXLINK) $(testsend_LDFLAGS) $(testsend_OBJECTS) $(testsend_LDADD) $(LIBS) ! teststream$(EXEEXT): $(teststream_OBJECTS) $(teststream_DEPENDENCIES) ! @rm -f teststream$(EXEEXT) ! $(CXXLINK) $(teststream_LDFLAGS) $(teststream_OBJECTS) $(teststream_LDADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/moving.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/simple.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testfstream.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testmic.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testsend.Po@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/teststream.Po@am__quote@ ! distclean-depend: ! -rm -rf $(DEPDIR) .cpp.o: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! .cpp.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `cygpath -w $<` ! .cpp.lo: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! CXXDEPMODE = @CXXDEPMODE@ ! uninstall-info-am: tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) install: install-am ! install-exec: install-exec-am ! install-data: install-data-am uninstall: uninstall-am + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: *************** *** 437,485 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ ! clean-depend clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ ! distclean-tags distclean-depend distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-binPROGRAMS \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-depend \ ! maintainer-clean-generic distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ ! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir \ ! mostlyclean-depend distclean-depend clean-depend \ ! maintainer-clean-depend info-am info dvi-am dvi check check-am \ ! installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 417,474 ---- distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: ! ! install-exec-am: install-binPROGRAMS ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic + mostlyclean: mostlyclean-am + + mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + + uninstall-am: uninstall-binPROGRAMS uninstall-info-am + + .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool distclean distclean-compile \ + distclean-depend distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am info info-am install \ + install-am install-binPROGRAMS install-data install-data-am \ + install-exec install-exec-am install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool tags uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. |
From: <vr-...@us...> - 2003-04-02 14:11:31
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1:/tmp/cvs-serv15028/src Modified Files: Makefile.in Log Message: Added #undef None due to clash with a previous definition in x-headers. Index: Makefile.in =================================================================== RCS file: /cvsroot/alpp/openalpp/src/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 28 Feb 2003 08:36:22 -0000 1.6 --- Makefile.in 2 Apr 2003 14:11:26 -0000 1.7 *************** *** 1,5 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 11,14 **** --- 12,16 ---- # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 32,42 **** includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. --- 34,40 ---- *************** *** 47,55 **** INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : --- 45,53 ---- INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 60,64 **** --- 58,64 ---- host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ CC = @CC@ CCGNUCFLAGS = @CCGNUCFLAGS@ *************** *** 66,75 **** CXX = @CXX@ CXXCPP = @CXXCPP@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ - MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 66,76 ---- CXX = @CXX@ CXXCPP = @CXXCPP@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ *************** *** 78,91 **** STRIP = @STRIP@ VERSION = @VERSION@ INCLUDES = -I$(top_builddir)/include ! basicfiles = audioenvironment.cpp listener.cpp audiobase.cpp sourcebase.cpp source.cpp sample.cpp sounddata.cpp audioconvert.cpp error.cpp groupsource.cpp - @WITH_CCGNU_TRUE@streamfiles = netstream.cpp streamupdater.cpp netupdater.cpp stream.cpp @WITH_CCGNU_FALSE@streamfiles = nostreaming.cpp noinputdevice.cpp nofilestream.cpp ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@oggfiles = filestream.cpp filestreamupdater.cpp @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@oggfiles = nofilestream.cpp ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@devicefiles = deviceupdater.cpp inputdevice.cpp @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@devicefiles = noinputdevice.cpp --- 79,116 ---- STRIP = @STRIP@ VERSION = @VERSION@ + am__include = @am__include@ + am__quote = @am__quote@ + install_sh = @install_sh@ INCLUDES = -I$(top_builddir)/include ! basicfiles = \ ! audioenvironment.cpp \ ! listener.cpp \ ! audiobase.cpp \ ! sourcebase.cpp \ ! source.cpp \ ! sample.cpp \ ! sounddata.cpp \ ! audioconvert.cpp \ ! error.cpp \ ! groupsource.cpp ! ! @WITH_CCGNU_TRUE@streamfiles = \ ! @WITH_CCGNU_TRUE@ netstream.cpp \ ! @WITH_CCGNU_TRUE@ streamupdater.cpp \ ! @WITH_CCGNU_TRUE@ netupdater.cpp \ ! @WITH_CCGNU_TRUE@ stream.cpp @WITH_CCGNU_FALSE@streamfiles = nostreaming.cpp noinputdevice.cpp nofilestream.cpp ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@oggfiles = \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@ filestream.cpp \ ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@ filestreamupdater.cpp ! @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@oggfiles = nofilestream.cpp ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@devicefiles = \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ deviceupdater.cpp \ ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_TRUE@ inputdevice.cpp ! @WITH_CCGNU_TRUE@@WITH_PORTAUDIO_FALSE@devicefiles = noinputdevice.cpp *************** *** 93,277 **** lib_LTLIBRARIES = libopenalpp.la mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(lib_LTLIBRARIES) ! DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! libopenalpp_la_LDFLAGS = ! libopenalpp_la_LIBADD = ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@listener.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audiobase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@source.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sample.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sounddata.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@error.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@groupsource.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netstream.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@streamupdater.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netupdater.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@stream.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@noinputdevice.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@nofilestream.lo ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@listener.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audiobase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@source.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sample.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sounddata.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@error.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@groupsource.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nostreaming.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@noinputdevice.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nofilestream.lo ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@listener.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audiobase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@source.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sample.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sounddata.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@error.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@groupsource.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nostreaming.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@noinputdevice.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nofilestream.lo ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@listener.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audiobase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@source.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sample.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sounddata.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@error.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@groupsource.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netstream.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@streamupdater.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netupdater.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@stream.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@noinputdevice.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestream.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestreamupdater.lo ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@listener.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audiobase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@source.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sample.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@sounddata.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@error.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@groupsource.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netstream.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@streamupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@netupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@stream.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@deviceupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@inputdevice.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@nofilestream.lo ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@listener.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audiobase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@source.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sample.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@sounddata.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@error.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@groupsource.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netstream.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@streamupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@netupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@stream.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@deviceupdater.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@inputdevice.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestream.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@filestreamupdater.lo ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioenvironment.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@listener.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audiobase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sourcebase.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@source.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sample.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@sounddata.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@audioconvert.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@error.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@groupsource.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nostreaming.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@noinputdevice.lo \ ! @WITH_PORTAUDIO_FALSE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@nofilestream.lo ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@libopenalpp_la_OBJECTS = \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioenvironment.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@listener.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audiobase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sourcebase.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@source.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sample.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@sounddata.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@audioconvert.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@error.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@groupsource.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nostreaming.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@noinputdevice.lo \ ! @WITH_PORTAUDIO_TRUE@@WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@nofilestream.lo ! CXXFLAGS = @CXXFLAGS@ ! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = Makefile.am Makefile.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! ! TAR = tar ! GZIP_ENV = --best ! DEP_FILES = .deps/audiobase.P .deps/audioconvert.P \ ! .deps/audioenvironment.P .deps/deviceupdater.P .deps/error.P \ ! .deps/filestream.P .deps/filestreamupdater.P .deps/groupsource.P \ ! .deps/inputdevice.P .deps/listener.P .deps/netstream.P \ ! .deps/netupdater.P .deps/nofilestream.P .deps/noinputdevice.P \ ! .deps/nostreaming.P .deps/sample.P .deps/sounddata.P .deps/source.P \ ! .deps/sourcebase.P .deps/stream.P .deps/streamupdater.P SOURCES = $(libopenalpp_la_SOURCES) - OBJECTS = $(libopenalpp_la_OBJECTS) - - all: all-redirect - .SUFFIXES: - .SUFFIXES: .S .c .cpp .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - ! mostlyclean-libLTLIBRARIES: ! clean-libLTLIBRARIES: ! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ! distclean-libLTLIBRARIES: ! maintainer-clean-libLTLIBRARIES: install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) --- 118,311 ---- lib_LTLIBRARIES = libopenalpp.la + subdir = src mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(lib_LTLIBRARIES) + libopenalpp_la_LDFLAGS = + libopenalpp_la_LIBADD = + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@am_libopenalpp_la_OBJECTS = \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audioenvironment.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ listener.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audiobase.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sourcebase.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ source.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sample.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sounddata.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audioconvert.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ error.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ groupsource.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ nostreaming.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ noinputdevice.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ nofilestream.lo + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@am_libopenalpp_la_OBJECTS = \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audioenvironment.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ listener.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audiobase.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sourcebase.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ source.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sample.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sounddata.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audioconvert.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ error.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ groupsource.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ nostreaming.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ noinputdevice.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ nofilestream.lo + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@am_libopenalpp_la_OBJECTS = \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audioenvironment.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ listener.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audiobase.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sourcebase.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ source.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sample.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sounddata.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audioconvert.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ error.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ groupsource.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ nostreaming.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ noinputdevice.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ nofilestream.lo + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@am_libopenalpp_la_OBJECTS = \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audioenvironment.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ listener.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audiobase.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sourcebase.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ source.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sample.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sounddata.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audioconvert.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ error.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ groupsource.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ nostreaming.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ noinputdevice.lo \ + @WITH_CCGNU_FALSE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ nofilestream.lo + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@am_libopenalpp_la_OBJECTS = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audioenvironment.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ listener.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audiobase.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sourcebase.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ source.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sample.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ sounddata.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ audioconvert.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ error.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ groupsource.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ netstream.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ streamupdater.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ netupdater.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ stream.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ deviceupdater.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ inputdevice.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_TRUE@ nofilestream.lo + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@am_libopenalpp_la_OBJECTS = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audioenvironment.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ listener.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audiobase.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sourcebase.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ source.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sample.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ sounddata.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ audioconvert.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ error.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ groupsource.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ netstream.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ streamupdater.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ netupdater.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ stream.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ noinputdevice.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_FALSE@@WITH_PORTAUDIO_FALSE@ nofilestream.lo + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@am_libopenalpp_la_OBJECTS = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audioenvironment.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ listener.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audiobase.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sourcebase.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ source.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sample.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ sounddata.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ audioconvert.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ error.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ groupsource.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ netstream.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ streamupdater.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ netupdater.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ stream.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ deviceupdater.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ inputdevice.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ filestream.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_TRUE@ filestreamupdater.lo + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@am_libopenalpp_la_OBJECTS = \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audioenvironment.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ listener.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audiobase.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sourcebase.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ source.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sample.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ sounddata.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ audioconvert.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ error.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ groupsource.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ netstream.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ streamupdater.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ netupdater.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ stream.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ noinputdevice.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ filestream.lo \ + @WITH_CCGNU_TRUE@@WITH_OGGVORBIS_TRUE@@WITH_PORTAUDIO_FALSE@ filestreamupdater.lo + libopenalpp_la_OBJECTS = $(am_libopenalpp_la_OBJECTS) ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! depcomp = $(SHELL) $(top_srcdir)/config/depcomp ! @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/audiobase.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/audioconvert.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/audioenvironment.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/deviceupdater.Plo $(DEPDIR)/error.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/filestream.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/filestreamupdater.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/groupsource.Plo $(DEPDIR)/inputdevice.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/listener.Plo $(DEPDIR)/netstream.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/netupdater.Plo $(DEPDIR)/nofilestream.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/noinputdevice.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/nostreaming.Plo $(DEPDIR)/sample.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/sounddata.Plo $(DEPDIR)/source.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/sourcebase.Plo $(DEPDIR)/stream.Plo \ ! @AMDEP_TRUE@ $(DEPDIR)/streamupdater.Plo ! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ! $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ! $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ! $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! CXXFLAGS = @CXXFLAGS@ ! DIST_SOURCES = $(libopenalpp_la_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libopenalpp_la_SOURCES) ! all: all-am ! .SUFFIXES: ! .SUFFIXES: .cpp .lo .o .obj ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) *************** *** 279,284 **** @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done --- 313,318 ---- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done *************** *** 286,467 **** uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) ! list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done ! # FIXME: We should only use cygpath when building on Windows, ! # and only if it is available. ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` ! ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! maintainer-clean-libtool: - libopenalpp.la: $(libopenalpp_la_OBJECTS) $(libopenalpp_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libopenalpp_la_LDFLAGS) $(libopenalpp_la_OBJECTS) $(libopenalpp_la_LIBADD) $(LIBS) .cpp.o: ! $(CXXCOMPILE) -c $< .cpp.obj: ! $(CXXCOMPILE) -c `cygpath -w $<` .cpp.lo: ! $(LTCXXCOMPILE) -c $< tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) ! ! mostlyclean-tags: ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = src distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/Makefile @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - - DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) - - -include $(DEP_FILES) - - mostlyclean-depend: - - clean-depend: - - distclean-depend: - -rm -rf .deps - - maintainer-clean-depend: - - %.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - - %.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp - - %.o: %.cpp - @echo '$(CXXCOMPILE) -c $<'; \ - $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - - %.lo: %.cpp - @echo '$(LTCXXCOMPILE) -c $<'; \ - $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: install-libLTLIBRARIES ! install-exec: install-exec-am ! install-data-am: ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-libLTLIBRARIES uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) mostlyclean-generic: --- 320,457 ---- uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done ! clean-libLTLIBRARIES: ! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ! libopenalpp.la: $(libopenalpp_la_OBJECTS) $(libopenalpp_la_DEPENDENCIES) ! $(CXXLINK) -rpath $(libdir) $(libopenalpp_la_LDFLAGS) $(libopenalpp_la_OBJECTS) $(libopenalpp_la_LIBADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audiobase.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audioconvert.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audioenvironment.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/deviceupdater.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/error.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filestream.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filestreamupdater.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groupsource.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inputdevice.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/listener.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/netstream.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/netupdater.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nofilestream.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/noinputdevice.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nostreaming.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sample.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sounddata.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/source.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sourcebase.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stream.Plo@am__quote@ ! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/streamupdater.Plo@am__quote@ ! distclean-depend: ! -rm -rf $(DEPDIR) .cpp.o: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! .cpp.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(CXXCOMPILE) -c -o $@ `cygpath -w $<` ! .cpp.lo: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! CXXDEPMODE = @CXXDEPMODE@ ! uninstall-info-am: tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(LTLIBRARIES) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(libdir) install: install-am ! install-exec: install-exec-am ! install-data: install-data-am uninstall: uninstall-am + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: *************** *** 469,517 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ ! clean-depend clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-libLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-depend \ ! distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-depend \ ! maintainer-clean-generic distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ ! clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ ! uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ ! distclean-compile clean-compile maintainer-clean-compile \ ! mostlyclean-libtool distclean-libtool clean-libtool \ ! maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ! distclean-depend clean-depend maintainer-clean-depend info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 459,517 ---- distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ ! mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-libtool distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: ! ! install-exec-am: install-libLTLIBRARIES ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic + mostlyclean: mostlyclean-am + + mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + + uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES + + .PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ + distclean-depend distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool tags uninstall \ + uninstall-am uninstall-info-am uninstall-libLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. |
From: <vr-...@us...> - 2003-04-02 14:11:31
|
Update of /cvsroot/alpp/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv15028 Modified Files: Makefile.in configure Log Message: Added #undef None due to clash with a previous definition in x-headers. Index: Makefile.in =================================================================== RCS file: /cvsroot/alpp/openalpp/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 28 Feb 2003 08:36:21 -0000 1.6 --- Makefile.in 2 Apr 2003 14:11:25 -0000 1.7 *************** *** 1,5 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 11,14 **** --- 12,16 ---- # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 32,42 **** includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . --- 34,40 ---- *************** *** 47,55 **** INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : --- 45,53 ---- INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 60,64 **** --- 58,64 ---- host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ + AWK = @AWK@ CC = @CC@ CCGNUCFLAGS = @CCGNUCFLAGS@ *************** *** 66,75 **** CXX = @CXX@ CXXCPP = @CXXCPP@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ - MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 66,76 ---- CXX = @CXX@ CXXCPP = @CXXCPP@ + DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EXEEXT = @EXEEXT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ *************** *** 78,81 **** --- 79,85 ---- STRIP = @STRIP@ VERSION = @VERSION@ + am__include = @am__include@ + am__quote = @am__quote@ + install_sh = @install_sh@ SUBDIRS = src include tests *************** *** 85,137 **** pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = openalpp.pc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = openalpp.pc ! DATA = $(pkgconfig_DATA) ! ! DIST_COMMON = COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \ ! configure configure.in openalpp.pc.in ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - TAR = tar - GZIP_ENV = --best - all: all-redirect .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) ! cd $(top_builddir) \ ! && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status ! $(ACLOCAL_M4): configure.in ! cd $(srcdir) && $(ACLOCAL) ! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) - openalpp.pc: $(top_builddir)/config.status openalpp.pc.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ! fi; fi; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) ! list='$(pkgconfig_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ done --- 89,155 ---- pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = openalpp.pc + subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ! CONFIG_CLEAN_FILES = openalpp.pc ! DIST_SOURCES = ! DATA = $(pkgconfig_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ ! uninstall-info-recursive all-recursive install-data-recursive \ ! install-exec-recursive installdirs-recursive install-recursive \ ! uninstall-recursive check-recursive installcheck-recursive ! DIST_COMMON = COPYING INSTALL Makefile.am Makefile.in aclocal.m4 \ ! config/README config/config.guess config/config.sub \ ! config/install-sh config/ltmain.sh config/missing \ ! config/mkinstalldirs configure configure.in openalpp.pc.in ! DIST_SUBDIRS = $(SUBDIRS) ! all: all-recursive .SUFFIXES: ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs ! distclean-libtool: ! -rm -f libtool ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --foreign Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && \ ! CONFIG_HEADERS= CONFIG_LINKS= \ ! CONFIG_FILES=$@ $(SHELL) ./config.status ! ! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): configure.in + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + openalpp.pc: $(top_builddir)/config.status openalpp.pc.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + uninstall-info-am: install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) ! @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ ! rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ done *************** *** 142,151 **** # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! ! @SET_MAKE@ ! ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ --- 160,164 ---- # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! $(RECURSIVE_TARGETS): @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ *************** *** 170,178 **** @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ ! rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ ! test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ --- 183,196 ---- @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! case "$@" in \ ! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ! *) list='$(SUBDIRS)' ;; \ ! esac; \ ! rev=''; for subdir in $$list; do \ ! if test "$$subdir" = "."; then :; else \ ! rev="$$subdir $$rev"; \ ! fi; \ done; \ ! rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ *************** *** 193,279 **** tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) ! ! mostlyclean-tags: ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) ! # This target untars the dist file and tries a VPATH configuration. Then ! # it guarantees that the distribution is self-contained by making another ! # tarfile. ! distcheck: dist ! -rm -rf $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst ! dc_install_base=`cd $(distdir)/=inst && pwd`; \ ! cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ ! && $(MAKE) $(AM_MAKEFLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) dvi \ ! && $(MAKE) $(AM_MAKEFLAGS) check \ ! && $(MAKE) $(AM_MAKEFLAGS) install \ ! && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ! && $(MAKE) $(AM_MAKEFLAGS) dist ! -rm -rf $(distdir) ! @banner="$(distdir).tar.gz is ready for distribution"; \ ! dashes=`echo "$$banner" | sed s/./=/g`; \ ! echo "$$dashes"; \ ! echo "$$banner"; \ ! echo "$$dashes" ! dist: distdir ! -chmod -R a+r $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) ! -rm -rf $(distdir) ! dist-all: distdir ! -chmod -R a+r $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) ! -rm -rf $(distdir) distdir: $(DISTFILES) ! -rm -rf $(distdir) mkdir $(distdir) ! -chmod 777 $(distdir) ! here=`cd $(top_builddir) && pwd`; \ ! top_distdir=`cd $(distdir) && pwd`; \ ! distdir=`cd $(distdir) && pwd`; \ ! cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done --- 211,274 ---- tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + top_distdir = . + # Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) ! GZIP_ENV = --best ! distdir: $(DISTFILES) ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) ! $(mkinstalldirs) $(distdir)/. $(distdir)/config @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done *************** *** 283,319 **** || mkdir $(distdir)/$$subdir \ || exit 1; \ ! chmod 777 $(distdir)/$$subdir; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ fi; \ done ! info-am: ! info: info-recursive ! dvi-am: ! dvi: dvi-recursive check-am: all-am check: check-recursive ! installcheck-am: ! installcheck: installcheck-recursive ! install-exec-am: ! install-exec: install-exec-recursive ! install-data-am: install-pkgconfigDATA install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive - uninstall-am: uninstall-pkgconfigDATA - uninstall: uninstall-recursive - all-am: Makefile $(DATA) - all-redirect: all-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: installdirs-recursive - installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) - mostlyclean-generic: --- 278,349 ---- || mkdir $(distdir)/$$subdir \ || exit 1; \ ! (cd $$subdir && \ ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" \ ! distdir=../$(distdir)/$$subdir \ ! distdir) \ || exit 1; \ fi; \ done ! -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ! || chmod -R a+r $(distdir) ! dist: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) ! ! # This target untars the dist file and tries a VPATH configuration. Then ! # it guarantees that the distribution is self-contained by making another ! # tarfile. ! distcheck: dist ! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ! chmod -R a-w $(distdir); chmod a+w $(distdir) ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst ! chmod a-w $(distdir) ! dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ ! && cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ ! && $(MAKE) $(AM_MAKEFLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) dvi \ ! && $(MAKE) $(AM_MAKEFLAGS) check \ ! && $(MAKE) $(AM_MAKEFLAGS) install \ ! && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ! && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ ! || (echo "Error: files left after uninstall" 1>&2; \ ! exit 1) ) \ ! && $(MAKE) $(AM_MAKEFLAGS) dist \ ! && $(MAKE) $(AM_MAKEFLAGS) distclean \ ! && rm -f $(distdir).tar.gz \ ! && (test `find . -type f -print | wc -l` -eq 0 \ ! || (echo "Error: files left after distclean" 1>&2; \ ! exit 1) ) ! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) ! @echo "$(distdir).tar.gz is ready for distribution" | \ ! sed 'h;s/./=/g;p;x;p;x' check-am: all-am check: check-recursive ! all-am: Makefile $(DATA) ! installdirs: installdirs-recursive ! installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) ! install: install-recursive ! install-exec: install-exec-recursive install-data: install-data-recursive + uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: *************** *** 321,362 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) ! -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-tags mostlyclean-generic ! mostlyclean: mostlyclean-recursive ! clean-am: clean-tags clean-generic mostlyclean-am ! clean: clean-recursive ! distclean-am: distclean-tags distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-recursive ! -rm -f config.status ! maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive - -rm -f config.status ! .PHONY: uninstall-pkgconfigDATA install-pkgconfigDATA \ ! install-data-recursive uninstall-data-recursive install-exec-recursive \ ! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ ! all-recursive check-recursive installcheck-recursive info-recursive \ ! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ ! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs-am \ ! installdirs mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean --- 351,417 ---- distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-recursive ! clean-am: clean-generic clean-libtool mostlyclean-am ! dist-all: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) ! distclean: distclean-recursive ! -rm -f config.status config.cache config.log ! distclean-am: clean-am distclean-generic distclean-libtool \ ! distclean-tags ! dvi: dvi-recursive ! dvi-am: ! info: info-recursive ! info-am: ! ! install-data-am: install-pkgconfigDATA ! ! install-exec-am: ! ! install-info: install-info-recursive ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-recursive ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-recursive ! ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! uninstall-am: uninstall-info-am uninstall-pkgconfigDATA ! ! uninstall-info: uninstall-info-recursive ! ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive dist dist-all \ ! distcheck distclean distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am \ ! dvi-recursive info info-am info-recursive install install-am \ ! install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-info install-info-am install-info-recursive install-man \ ! install-pkgconfigDATA install-recursive install-strip \ ! installcheck installcheck-am installdirs installdirs-am \ ! installdirs-recursive maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-libtool mostlyclean-recursive tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am \ ! uninstall-info-recursive uninstall-pkgconfigDATA \ ! uninstall-recursive *************** *** 368,372 **** ALL-install: cd $(top_builddir); make -j4 install - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 423,426 ---- Index: configure =================================================================== RCS file: /cvsroot/alpp/openalpp/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure 28 Feb 2003 08:36:21 -0000 1.5 --- configure 2 Apr 2003 14:11:25 -0000 1.6 *************** *** 13,16 **** --- 13,19 ---- # Any additions from configure.in: ac_help="$ac_help + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors" + ac_help="$ac_help --enable-shared[=PKGS] build shared libraries [default=yes]" ac_help="$ac_help *************** *** 735,739 **** [...2239 lines suppressed...] + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`echo "$file" | sed -e 's|/[^/]*$||'` + $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done + exit 0 |
From: <vr-...@us...> - 2003-04-02 14:11:31
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv15028/include/openalpp Modified Files: audioenvironment.h Log Message: Added #undef None due to clash with a previous definition in x-headers. Index: audioenvironment.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/audioenvironment.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** audioenvironment.h 18 Oct 2002 07:50:10 -0000 1.1 --- audioenvironment.h 2 Apr 2003 14:11:25 -0000 1.2 *************** *** 54,57 **** --- 54,60 ---- * and distance, respectively. */ + #ifdef None + #undef None // Defined in X-headers + #endif typedef enum DistanceModel {None,InverseDistance,InverseDistanceClamped}; |
From: <tom...@us...> - 2003-03-07 20:44:04
|
Update of /cvsroot/alpp/openalpp/src In directory sc8-pr-cvs1:/tmp/cvs-serv1170 Modified Files: filestream.cpp inputdevice.cpp netstream.cpp Log Message: Changed so that buffer size is given in samples instead of bytes. Index: filestream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/filestream.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** filestream.cpp 16 Feb 2003 23:11:21 -0000 1.2 --- filestream.cpp 7 Mar 2003 20:30:03 -0000 1.3 *************** *** 25,28 **** --- 25,29 ---- #include "openalpp/filestreamupdater.h" #include "openalpp/filestream.h" + #include "openalpp/sample.h" namespace openalpp { *************** *** 48,52 **** buffername_,buffer2_->GetName(), format,ogginfo->rate, ! buffersize); } else { fclose(filehandle); --- 49,53 ---- buffername_,buffer2_->GetName(), format,ogginfo->rate, ! buffersize*SampleSize(format)); } else { fclose(filehandle); Index: inputdevice.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/inputdevice.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** inputdevice.cpp 21 Feb 2003 14:47:15 -0000 1.7 --- inputdevice.cpp 7 Mar 2003 20:30:07 -0000 1.8 *************** *** 25,28 **** --- 25,29 ---- #include "openalpp/deviceupdater.h" #include "openalpp/inputdevice.h" + #include "openalpp/sample.h" #include <portaudio.h> *************** *** 50,54 **** Init(); ! updater_=new DeviceUpdater(device,samplerate,buffersize,format,buffername_,buffer2_->GetName()); } --- 51,55 ---- Init(); ! updater_=new DeviceUpdater(device,samplerate,buffersize*SampleFormat(format),format,buffername_,buffer2_->GetName()); } Index: netstream.cpp =================================================================== RCS file: /cvsroot/alpp/openalpp/src/netstream.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** netstream.cpp 21 Feb 2003 14:47:15 -0000 1.6 --- netstream.cpp 7 Mar 2003 20:30:08 -0000 1.7 *************** *** 25,28 **** --- 25,29 ---- #include "openalpp/netupdater.h" #include "openalpp/netstream.h" + #include "openalpp/sample.h" namespace openalpp { *************** *** 30,47 **** NetStream::NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket) : Stream() { ! unsigned int frequency=11025,packetsize=1024; ALenum format=AL_FORMAT_MONO8; if(controlsocket) { *controlsocket >> format; *controlsocket >> frequency; ! *controlsocket >> packetsize; } updater_=new NetUpdater(socket,controlsocket, buffername_,buffer2_->GetName(), ! format,frequency,packetsize); } NetStream::NetStream(ost::UDPSocket *socket,SampleFormat format, ! unsigned int frequency,unsigned int packetsize) : Stream() { ALenum alformat=0; --- 31,48 ---- NetStream::NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket) : Stream() { ! unsigned int frequency=11025,buffersize=2048; ALenum format=AL_FORMAT_MONO8; if(controlsocket) { *controlsocket >> format; *controlsocket >> frequency; ! *controlsocket >> buffersize; } updater_=new NetUpdater(socket,controlsocket, buffername_,buffer2_->GetName(), ! format,frequency,buffersize*SampleSize(format)); } NetStream::NetStream(ost::UDPSocket *socket,SampleFormat format, ! unsigned int frequency,unsigned int buffersize) : Stream() { ALenum alformat=0; *************** *** 61,65 **** } updater_=new NetUpdater(socket,NULL,buffername_,buffer2_->GetName(), ! alformat,frequency,packetsize); } --- 62,66 ---- } updater_=new NetUpdater(socket,NULL,buffername_,buffer2_->GetName(), ! alformat,frequency,buffersize*SampleSize(format)); } |
From: <tom...@us...> - 2003-03-07 20:37:32
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv4788 Modified Files: netupdater.h netstream.h Log Message: Changed so that buffer size is given in samples instead of bytes. Also, the size given is now _buffer_ size not _packet_ size... Index: netupdater.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/netupdater.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** netupdater.h 18 Oct 2002 07:50:11 -0000 1.1 --- netupdater.h 7 Mar 2003 20:37:20 -0000 1.2 *************** *** 47,53 **** /** ! * Size of sound packets (in bytes). */ ! unsigned int packetsize_; public: /** --- 47,53 ---- /** ! * Size of sound buffer (in bytes). */ ! unsigned int buffersize_; public: /** *************** *** 60,69 **** * @param format is the (OpenAL) format of the sound data. * @param frequency is the frequency of the sound data. ! * @param packetsize is the size of the sound packets. */ NetUpdater(ost::UDPSocket *socket,ost::TCPStream *controlsocket, const ALuint buffer1,ALuint buffer2, ALenum format,unsigned int frequency, ! unsigned int packetsize); /** --- 60,69 ---- * @param format is the (OpenAL) format of the sound data. * @param frequency is the frequency of the sound data. ! * @param buffersize is how much data to buffer before adding to the stream. */ NetUpdater(ost::UDPSocket *socket,ost::TCPStream *controlsocket, const ALuint buffer1,ALuint buffer2, ALenum format,unsigned int frequency, ! unsigned int buffersize); /** Index: netstream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/netstream.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** netstream.h 21 Feb 2003 14:37:10 -0000 1.4 --- netstream.h 7 Mar 2003 20:37:21 -0000 1.5 *************** *** 47,54 **** * @param controlsocket is an (optional) TCPStream that can be used to send * information about the stream. The constructor will begin with trying to ! * read SampleFormat, frequency, and packetsize. The sender can also use the * control socket to send "EXIT" when it's run out of data to send. If * this parameter is not given, defaults will be used (format=Mono8, ! * frequency=11025, packetsize=1024). */ NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket=NULL); --- 47,54 ---- * @param controlsocket is an (optional) TCPStream that can be used to send * information about the stream. The constructor will begin with trying to ! * read SampleFormat, frequency, and buffer size. The sender can also use the * control socket to send "EXIT" when it's run out of data to send. If * this parameter is not given, defaults will be used (format=Mono8, ! * frequency=11025, buffersize=4096). */ NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket=NULL); *************** *** 59,66 **** * @param format is the format the data will be in. * @param frequency is the frequency of the sound. ! * @param packetsize is the size of the packets the sound will be sent in. */ NetStream(ost::UDPSocket *socket,SampleFormat format,unsigned int frequency, ! unsigned int packetsize); /** --- 59,68 ---- * @param format is the format the data will be in. * @param frequency is the frequency of the sound. ! * @param buffersize is the size of the sound buffer. Note that the actual ! * packets sent over the network can be smaller (or bigger!); this is just ! * the size of the buffer OpenAL++ will use to receive the data. */ NetStream(ost::UDPSocket *socket,SampleFormat format,unsigned int frequency, ! unsigned int buffersize); /** |
From: <tom...@us...> - 2003-03-07 20:36:39
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv4461 Modified Files: filestream.h inputdevice.h Log Message: Changed so that buffer size is given in samples instead of bytes. Index: filestream.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/filestream.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** filestream.h 16 Feb 2003 22:48:13 -0000 1.2 --- filestream.h 7 Mar 2003 20:36:27 -0000 1.3 *************** *** 41,47 **** * @param filename is the name of the file to try to open. * @param buffersize is an optional parameter specifying how large the ! * buffer should be. */ ! FileStream(const char *filename,const int buffersize=131072) throw (NameError,InitError,FileError); --- 41,47 ---- * @param filename is the name of the file to try to open. * @param buffersize is an optional parameter specifying how large the ! * buffer should be (in samples per second). */ ! FileStream(const char *filename,const int buffersize=65536) throw (NameError,InitError,FileError); Index: inputdevice.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/inputdevice.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** inputdevice.h 21 Feb 2003 14:37:10 -0000 1.4 --- inputdevice.h 7 Mar 2003 20:36:29 -0000 1.5 *************** *** 50,54 **** * @param device is the device to open. -1 for default input. * @param samplerate is the desired sample rate. ! * @param buffersize is the desired buffer size. * @param format is the desired sample format. */ --- 50,54 ---- * @param device is the device to open. -1 for default input. * @param samplerate is the desired sample rate. ! * @param buffersize is the desired buffer size _in samples_. * @param format is the desired sample format. */ |
From: <tom...@us...> - 2003-03-07 20:35:16
|
Update of /cvsroot/alpp/openalpp/include/openalpp In directory sc8-pr-cvs1:/tmp/cvs-serv3924 Modified Files: sample.h Log Message: Added a couple of utility functions (they might be moved to another file later) Index: sample.h =================================================================== RCS file: /cvsroot/alpp/openalpp/include/openalpp/sample.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sample.h 18 Oct 2002 07:50:11 -0000 1.1 --- sample.h 7 Mar 2003 20:35:10 -0000 1.2 *************** *** 68,71 **** --- 68,76 ---- }; + /** + * Check how large a sample is in the given format. + */ + unsigned int SampleSize(SampleFormat format); + unsigned int SampleSize(ALenum format); } |