Version 1.0.8

7 files changed, 17 insertions, 13 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8cb0f5a..f33d669 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -11,12 +11,10 @@ vpath %.o $(OBJECT_PATH)
 OBJECTS	=	RtMidi.o
 
 CC       = @CXX@
-DEFS     = @debug@
-DEFS    += @midi_api@
-CFLAGS   = @cflags@
-CFLAGS  += @warn@ -I$(INCLUDE)
+DEFS     = @CPPFLAGS@
+CFLAGS   = @CXXFLAGS@
+CFLAGS  += -I$(INCLUDE)
 LIBRARY  = @LIBS@
-LIBRARY += @frameworks@
 
 %.o : $(SRC_PATH)/%.cpp
 	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
diff --git a/tests/cmidiin.cpp b/tests/cmidiin.cpp
index 18d147a..0556b80 100644
--- a/tests/cmidiin.cpp
+++ b/tests/cmidiin.cpp
@@ -8,6 +8,7 @@
 //*****************************************//
 
 #include <iostream>
+#include <cstdlib>
 #include "RtMidi.h"
 
 void usage( void ) {
@@ -24,7 +25,7 @@ void mycallback( double deltatime, std::vector< unsigned char > *message, void *
   for ( unsigned int i=0; i<nBytes; i++ )
     std::cout << "Byte " << i << " = " << (int)message->at(i) << ", ";
   if ( nBytes > 0 )
-    std::cout << "stamp = " << deltatime << '\n';
+    std::cout << "stamp = " << deltatime << std::endl;
 }
 
 int main( int argc, char *argv[] )
diff --git a/tests/midiout.cpp b/tests/midiout.cpp
index 85d327f..ed65b0d 100644
--- a/tests/midiout.cpp
+++ b/tests/midiout.cpp
@@ -7,6 +7,7 @@
 //*****************************************//
 
 #include <iostream>
+#include <cstdlib>
 #include "RtMidi.h"
 
 // Platform-dependent sleep routines.
diff --git a/tests/midiprobe.cpp b/tests/midiprobe.cpp
index 7b4dc8c..06d9497 100644
--- a/tests/midiprobe.cpp
+++ b/tests/midiprobe.cpp
@@ -5,6 +5,7 @@
 // by Gary Scavone, 2003-2004.
 
 #include <iostream>
+#include <cstdlib>
 #include "RtMidi.h"
 
 int main()
diff --git a/tests/qmidiin.cpp b/tests/qmidiin.cpp
index 4fed0b9..de8337e 100644
--- a/tests/qmidiin.cpp
+++ b/tests/qmidiin.cpp
@@ -8,6 +8,7 @@
 //*****************************************//
 
 #include <iostream>
+#include <cstdlib>
 #include <signal.h>
 #include "RtMidi.h"
 
@@ -83,7 +84,7 @@ int main( int argc, char *argv[] )
     for ( i=0; i<nBytes; i++ )
       std::cout << "Byte " << i << " = " << (int)message[i] << ", ";
     if ( nBytes > 0 )
-      std::cout << "stamp = " << stamp << '\n';
+      std::cout << "stamp = " << stamp << std::endl;
 
     // Sleep for 10 milliseconds.
     SLEEP( 10 );
diff --git a/tests/sysextest.cpp b/tests/sysextest.cpp
index 781df0b..89ddf7d 100644
--- a/tests/sysextest.cpp
+++ b/tests/sysextest.cpp
@@ -7,6 +7,8 @@
 //*****************************************//
 
 #include <iostream>
+#include <cstdlib>
+#include <typeinfo>
 #include "RtMidi.h"
 
 void usage( void ) {
@@ -134,7 +136,7 @@ bool chooseMidiPort( RtMidi *rtmidi )
     } while ( i >= nPorts );
   }
 
-  std::cout << "\n";
+  std::cout << std::endl;
   rtmidi->openPort( i );
 
   return true;
diff --git a/tests/sysextest.dsp b/tests/sysextest.dsp
index 88b8880..84ce289 100644
--- a/tests/sysextest.dsp
+++ b/tests/sysextest.dsp
@@ -42,14 +42,14 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_MM__" /YX /FD /c

+# ADD CPP /nologo /W3 /GR /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_MM__" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:console /machine:I386

 

 !ELSEIF  "$(CFG)" == "sysextest - Win32 Debug"

@@ -65,15 +65,15 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c

-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_MM__" /YX /FD /GZ  /c

+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_MM__" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 

 !ENDIF