Fix for compile bug in Windows DS and library configure in linux (GS).
authorGary Scavone <gary@music.mcgill.ca>
Tue, 30 Aug 2011 18:47:27 +0000 (18:47 +0000)
committerStephen Sinclair <sinclair@music.mcgill.ca>
Thu, 10 Oct 2013 23:38:29 +0000 (01:38 +0200)
Makefile.in
RtAudio.cpp
configure.ac

index 10b7ac39d852da5aa972a27747f77cbfe284988d..8a6b03bf5d14255db50575e4096e10be93a6f2fe 100644 (file)
@@ -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@
index 4a3966b5700ba3e16caa1a5897e41bde199a3dcf..8a520c3ca3583738b94d09e3b0e36214287b7971 100644 (file)
@@ -3664,9 +3664,9 @@ unsigned int RtApiDs :: getDeviceCount( void )
   std::vector< int > indices;\r
   for ( unsigned int i=0; i<dsDevices.size(); i++ )\r
     if ( dsDevices[i].found == false ) indices.push_back( i );\r
-  for ( unsigned int nErased=0, unsigned int i=0; i<indices.size(); i++, nErased++ ) {\r
-    dsDevices.erase( dsDevices.begin()-nErased );\r
-  }\r
+  unsigned int nErased = 0;\r
+  for ( unsigned int i=0; i<indices.size(); i++ )\r
+    dsDevices.erase( dsDevices.begin()-nErased++ );\r
 \r
   return dsDevices.size();\r
 }\r
index 422d257daf17a3c37ac72b80bc9344eaeb4dec10..13132aa7e0729e22c949b038107f7465c9d4a461 100644 (file)
@@ -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"] )