diff options
| author | Gary Scavone <gary@music.mcgill.ca> | 2011-08-30 18:47:27 +0000 |
|---|---|---|
| committer | Stephen Sinclair <sinclair@music.mcgill.ca> | 2013-10-11 01:38:29 +0200 |
| commit | 325fea749470f53e3d9dcd903d1c9b7c881a37fc (patch) | |
| tree | 66011339647868f6b429819e916f0abcd753fb47 | |
| parent | 692c1b860c5ccc43420263f12a4d6a46f987b8a6 (diff) | |
Fix for compile bug in Windows DS and library configure in linux (GS).
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | RtAudio.cpp | 6 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 10b7ac3..8a6b03b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,7 +8,8 @@ OBJECTS = RtAudio.o @objects@ STATIC = librtaudio.a SHARED = @sharedlib@ -RELEASE = 4.0.7 +RELEASE = 4.0.9 +MAJOR = 4 LIBRARIES = $(STATIC) $(SHARED) CC = @CXX@ diff --git a/RtAudio.cpp b/RtAudio.cpp index 4a3966b..8a520c3 100644 --- a/RtAudio.cpp +++ b/RtAudio.cpp @@ -3664,9 +3664,9 @@ unsigned int RtApiDs :: getDeviceCount( void ) std::vector< int > indices;
for ( unsigned int i=0; i<dsDevices.size(); i++ )
if ( dsDevices[i].found == false ) indices.push_back( i );
- for ( unsigned int nErased=0, unsigned int i=0; i<indices.size(); i++, nErased++ ) {
- dsDevices.erase( dsDevices.begin()-nErased );
- }
+ unsigned int nErased = 0;
+ for ( unsigned int i=0; i<indices.size(); i++ )
+ dsDevices.erase( dsDevices.begin()-nErased++ );
return dsDevices.size();
}
diff --git a/configure.ac b/configure.ac index 422d257..13132aa 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,7 @@ AC_CANONICAL_HOST AC_SUBST( sharedlib, ["librtaudio.so"] ) AC_SUBST( sharedname, ["librtaudio.so.\$(RELEASE)"] ) -AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o \$(SHAREDLIB).\$(RELEASE)"] ) +AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHARED).\$(MAJOR) -o \$(SHARED).\$(RELEASE)"] ) case $host in *-apple*) AC_SUBST( sharedlib, ["librtaudio.dylib"] ) |