Various Makefile and Windows project/workspace file updates.

diff --git a/tests/Windows/audioprobe.dsp b/tests/Windows/audioprobe.dsp
index e084893c58387d52cc07d62b26234cef57439e83..679bf9a856df3deeb3570ed7b30433862ffb2fab 100755 (executable)
--- a/tests/Windows/audioprobe.dsp
+++ b/tests/Windows/audioprobe.dsp
@@ -42,14 +42,14 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOW_DS__" /D "__WINDOWS_ASIO__" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "__WINDOW_DS__" /D "__WINDOWS_DS__" /D "__WINDOWS_ASIO__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# 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\r
+# 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\r
 # 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 dsound.lib /nologo /subsystem:console /machine:I386\r
 \r
 !ELSEIF  "$(CFG)" == "audioprobe - Win32 Debug"\r
@@ -65,15 +65,15 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOW_DS__" /YX /FD /GZ  /c\r
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "__WINDOWS_DS__" /D "__WINDOWS_ASIO__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# 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\r
+# 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\r
 # 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 dsound.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
 \r
 !ENDIF \r
@@ -87,15 +87,15 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asio.cpp\r
+SOURCE=..\..\include\asio.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrivers.cpp\r
+SOURCE=..\..\include\asiodrivers.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiolist.cpp\r
+SOURCE=..\..\include\asiolist.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -103,7 +103,7 @@ SOURCE=..\audioprobe.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiothiscallresolver.cpp\r
+SOURCE=..\..\include\iasiothiscallresolver.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -115,35 +115,35 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asio.h\r
+SOURCE=..\..\include\asio.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrivers.h\r
+SOURCE=..\..\include\asiodrivers.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrvr.h\r
+SOURCE=..\..\include\asiodrvr.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiolist.h\r
+SOURCE=..\..\include\asiolist.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiosys.h\r
+SOURCE=..\..\include\asiosys.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\ginclude.h\r
+SOURCE=..\..\include\ginclude.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiodrv.h\r
+SOURCE=..\..\include\iasiodrv.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiothiscallresolver.h\r
+SOURCE=..\..\include\iasiothiscallresolver.h\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/tests/Windows/duplex.dsp b/tests/Windows/duplex.dsp
index 8f346146cfc52c76bed3d1e29c73cbec75aebe27..c9ba2941abe024d1a16aa283a4d03ee14fcd6e4a 100755 (executable)
--- a/tests/Windows/duplex.dsp
+++ b/tests/Windows/duplex.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "__WINDOWS_DS__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "__WINDOWS_DS__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "__WINDOWS_ASIO__.__WINDOWS_DS__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "__WINDOWS_ASIO__.__WINDOWS_DS__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -87,15 +87,15 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\asio.cpp\r
+SOURCE=..\..\include\asio.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\asiodrivers.cpp\r
+SOURCE=..\..\include\asiodrivers.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\asiolist.cpp\r
+SOURCE=..\..\include\asiolist.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -103,7 +103,7 @@ SOURCE=..\duplex.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\iasiothiscallresolver.cpp\r
+SOURCE=..\..\include\iasiothiscallresolver.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -115,35 +115,35 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\asio.h\r
+SOURCE=..\..\include\asio.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\asiodrivers.h\r
+SOURCE=..\..\include\asiodrivers.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\asiodrvr.h\r
+SOURCE=..\..\include\asiodrvr.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\asiolist.h\r
+SOURCE=..\..\include\asiolist.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\asiosys.h\r
+SOURCE=..\..\include\asiosys.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\ginclude.h\r
+SOURCE=..\..\include\ginclude.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\iasiodrv.h\r
+SOURCE=..\..\include\iasiodrv.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\newrtaudio\asio\iasiothiscallresolver.h\r
+SOURCE=..\..\include\iasiothiscallresolver.h\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/tests/Windows/playraw.dsp b/tests/Windows/playraw.dsp
index 0c31402b54ca8b902d67942cbc17bb849c608d70..849890d21787e24aa4abed17bc5111be09cafb90 100755 (executable)
--- a/tests/Windows/playraw.dsp
+++ b/tests/Windows/playraw.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -87,19 +87,19 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asio.cpp\r
+SOURCE=..\..\include\asio.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrivers.cpp\r
+SOURCE=..\..\include\asiodrivers.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiolist.cpp\r
+SOURCE=..\..\include\asiolist.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiothiscallresolver.cpp\r
+SOURCE=..\..\include\iasiothiscallresolver.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -115,35 +115,35 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asio.h\r
+SOURCE=..\..\include\asio.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrivers.h\r
+SOURCE=..\..\include\asiodrivers.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrvr.h\r
+SOURCE=..\..\include\asiodrvr.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiolist.h\r
+SOURCE=..\..\include\asiolist.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiosys.h\r
+SOURCE=..\..\include\asiosys.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\ginclude.h\r
+SOURCE=..\..\include\ginclude.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiodrv.h\r
+SOURCE=..\..\include\iasiodrv.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiothiscallresolver.h\r
+SOURCE=..\..\include\iasiothiscallresolver.h\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/tests/Windows/playsaw.dsp b/tests/Windows/playsaw.dsp
index 5a755a25f3fa3b93b9bd3f8ffd595f2f04026664..7923c1ce65b68120786e5c37cf4d49a8ad697214 100755 (executable)
--- a/tests/Windows/playsaw.dsp
+++ b/tests/Windows/playsaw.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -87,19 +87,19 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asio.cpp\r
+SOURCE=..\..\include\asio.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrivers.cpp\r
+SOURCE=..\..\include\asiodrivers.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiolist.cpp\r
+SOURCE=..\..\include\asiolist.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiothiscallresolver.cpp\r
+SOURCE=..\..\include\iasiothiscallresolver.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -115,35 +115,35 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asio.h\r
+SOURCE=..\..\include\asio.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrivers.h\r
+SOURCE=..\..\include\asiodrivers.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrvr.h\r
+SOURCE=..\..\include\asiodrvr.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiolist.h\r
+SOURCE=..\..\include\asiolist.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiosys.h\r
+SOURCE=..\..\include\asiosys.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\ginclude.h\r
+SOURCE=..\..\include\ginclude.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiodrv.h\r
+SOURCE=..\..\include\iasiodrv.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiothiscallresolver.h\r
+SOURCE=..\..\include\iasiothiscallresolver.h\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/tests/Windows/record.dsp b/tests/Windows/record.dsp
index 526cc876ebc5fdd2167c745db1098f56db7c2b1b..9ba312ccf5286503ad0f55fafec2be3b5b1f908b 100755 (executable)
--- a/tests/Windows/record.dsp
+++ b/tests/Windows/record.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -87,19 +87,19 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asio.cpp\r
+SOURCE=..\..\include\asio.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrivers.cpp\r
+SOURCE=..\..\include\asiodrivers.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiolist.cpp\r
+SOURCE=..\..\include\asiolist.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiothiscallresolver.cpp\r
+SOURCE=..\..\include\iasiothiscallresolver.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -115,35 +115,35 @@ SOURCE=..\..\RtAudio.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asio.h\r
+SOURCE=..\..\include\asio.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrivers.h\r
+SOURCE=..\..\include\asiodrivers.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrvr.h\r
+SOURCE=..\..\include\asiodrvr.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiolist.h\r
+SOURCE=..\..\include\asiolist.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiosys.h\r
+SOURCE=..\..\include\asiosys.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\ginclude.h\r
+SOURCE=..\..\include\ginclude.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiodrv.h\r
+SOURCE=..\..\include\iasiodrv.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiothiscallresolver.h\r
+SOURCE=..\..\include\iasiothiscallresolver.h\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/tests/Windows/testall.dsp b/tests/Windows/testall.dsp
index 8824b93e8ce92f541bdba6884ba79b07c98d6472..72b6259e8404f2d8d251f0285fa30b1ec4f44ee2 100755 (executable)
--- a/tests/Windows/testall.dsp
+++ b/tests/Windows/testall.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../" /I "../../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__WINDOWS_ASIO__" /D "__WINDOWS_DS__" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -87,19 +87,19 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asio.cpp\r
+SOURCE=..\..\include\asio.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrivers.cpp\r
+SOURCE=..\..\include\asiodrivers.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiolist.cpp\r
+SOURCE=..\..\include\asiolist.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiothiscallresolver.cpp\r
+SOURCE=..\..\include\iasiothiscallresolver.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -115,35 +115,35 @@ SOURCE=..\testall.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asio.h\r
+SOURCE=..\..\include\asio.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrivers.h\r
+SOURCE=..\..\include\asiodrivers.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiodrvr.h\r
+SOURCE=..\..\include\asiodrvr.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiolist.h\r
+SOURCE=..\..\include\asiolist.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\asiosys.h\r
+SOURCE=..\..\include\asiosys.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\ginclude.h\r
+SOURCE=..\..\include\ginclude.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiodrv.h\r
+SOURCE=..\..\include\iasiodrv.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\asio\iasiothiscallresolver.h\r
+SOURCE=..\..\include\iasiothiscallresolver.h\r
 # End Source File\r
 # Begin Source File\r
 \r