diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.in | 25 | ||||
| -rwxr-xr-x | tests/Windows/rtaudio.dsw | 12 | ||||
| -rw-r--r-- | tests/playsaw.cpp | 3 | ||||
| -rw-r--r-- | tests/testall.cpp | 3 |
4 files changed, 22 insertions, 21 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in index bc17be5..ec41447 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -3,49 +3,52 @@ PROGRAMS = audioprobe playsaw playraw record duplex testall RM = /bin/rm -SRC_PATH = ../ -INCLUDE = ../ +SRC_PATH = .. +INCLUDE = .. OBJECT_PATH = @object_path@ vpath %.o $(OBJECT_PATH) -OBJECTS = RtAudio.o +OBJECTS = RtAudio.o @objects@ CC = @CXX@ DEFS = @debug@ DEFS += @audio_apis@ CFLAGS = @cflags@ -CFLAGS += @warn@ -I$(INCLUDE) +CFLAGS += @warn@ -I$(INCLUDE) -I../include LIBRARY = @LIBS@ LIBRARY += @frameworks@ %.o : $(SRC_PATH)/%.cpp $(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@ +%.o : ../include/%.cpp + $(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@ + all : $(PROGRAMS) audioprobe : audioprobe.cpp $(OBJECTS) - $(CC) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY) + $(CC) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp $(OBJECT_PATH)/*.o $(LIBRARY) playsaw : playsaw.cpp $(OBJECTS) - $(CC) $(CFLAGS) $(DEFS) -o playsaw playsaw.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY) + $(CC) $(CFLAGS) $(DEFS) -o playsaw playsaw.cpp $(OBJECT_PATH)/*.o $(LIBRARY) playraw : playraw.cpp $(OBJECTS) - $(CC) $(CFLAGS) $(DEFS) -o playraw playraw.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY) + $(CC) $(CFLAGS) $(DEFS) -o playraw playraw.cpp $(OBJECT_PATH)/*.o $(LIBRARY) record : record.cpp $(OBJECTS) - $(CC) $(CFLAGS) $(DEFS) -o record record.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY) + $(CC) $(CFLAGS) $(DEFS) -o record record.cpp $(OBJECT_PATH)/*.o $(LIBRARY) duplex : duplex.cpp $(OBJECTS) - $(CC) $(CFLAGS) $(DEFS) -o duplex duplex.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY) + $(CC) $(CFLAGS) $(DEFS) -o duplex duplex.cpp $(OBJECT_PATH)/*.o $(LIBRARY) testall : testall.cpp $(OBJECTS) - $(CC) $(CFLAGS) $(DEFS) -o testall testall.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY) + $(CC) $(CFLAGS) $(DEFS) -o testall testall.cpp $(OBJECT_PATH)/*.o $(LIBRARY) clean : -rm $(OBJECT_PATH)/*.o -rm $(PROGRAMS) - -rm -f *.raw *~ + -rm -f *.raw *~ *.exe strip : strip $(PROGRAMS) diff --git a/tests/Windows/rtaudio.dsw b/tests/Windows/rtaudio.dsw index ee73090..fe5f324 100755 --- a/tests/Windows/rtaudio.dsw +++ b/tests/Windows/rtaudio.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ###############################################################################
-Project: "duplex"=".\duplex.dsp" - Package Owner=<4>
+Project: "audioprobe"=.\audioprobe.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@ Package=<4> ###############################################################################
-Project: "playraw"=".\playraw.dsp" - Package Owner=<4>
+Project: "duplex"=.\duplex.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -27,7 +27,7 @@ Package=<4> ###############################################################################
-Project: "playsaw"=".\playsaw.dsp" - Package Owner=<4>
+Project: "playraw"=.\playraw.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -39,7 +39,7 @@ Package=<4> ###############################################################################
-Project: "probe"=".\probe.dsp" - Package Owner=<4>
+Project: "playsaw"=.\playsaw.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -51,7 +51,7 @@ Package=<4> ###############################################################################
-Project: "record"=".\record.dsp" - Package Owner=<4>
+Project: "record"=.\record.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -63,7 +63,7 @@ Package=<4> ###############################################################################
-Project: "testall"=".\testall.dsp" - Package Owner=<4>
+Project: "testall"=.\testall.dsp - Package Owner=<4>
Package=<5>
{{{
diff --git a/tests/playsaw.cpp b/tests/playsaw.cpp index 772881c..c39bcb4 100644 --- a/tests/playsaw.cpp +++ b/tests/playsaw.cpp @@ -129,8 +129,7 @@ int main( int argc, char *argv[] ) if ( argc > 4 ) offset = (unsigned int) atoi( argv[4] ); - double *data; - data = (double *) calloc( channels, sizeof( double ) ); + double *data = (double *) calloc( channels, sizeof( double ) ); // Let RtAudio print messages to stderr. dac.showWarnings( true ); diff --git a/tests/testall.cpp b/tests/testall.cpp index 5efb0dd..2eeb330 100644 --- a/tests/testall.cpp +++ b/tests/testall.cpp @@ -108,8 +108,7 @@ int main( int argc, char *argv[] ) if ( argc > 4 ) offset = (unsigned int) atoi( argv[4] ); - double *data; - data = (double *) calloc( channels, sizeof( double ) ); + double *data = (double *) calloc( channels, sizeof( double ) ); // Let RtAudio print messages to stderr. dac.showWarnings( true ); |