Fixed all VS6 and VS8 projects with new third party projects layout
git-svn-id: https://svn.pjsip.org/repos/pjproject/branches/split-3rd-party@1177 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/third_party/build/gsm/libgsmcodec.dsp b/third_party/build/gsm/libgsmcodec.dsp
index f7ca6f0..6f070cc 100644
--- a/third_party/build/gsm/libgsmcodec.dsp
+++ b/third_party/build/gsm/libgsmcodec.dsp
@@ -32,17 +32,17 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\gsm-i386-vc6-release"
-# PROP BASE Intermediate_Dir "output\gsm-i386-vc6-release"
+# PROP BASE Output_Dir "output\gsm-i386-win32-vc6-release"
+# PROP BASE Intermediate_Dir "output\gsm-i386-win32-vc6-release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\gsm-i386-vc6-release"
-# PROP Intermediate_Dir "output\gsm-i386-vc6-release"
+# PROP Output_Dir "output\gsm-i386-win32-vc6-release"
+# PROP Intermediate_Dir "output\gsm-i386-win32-vc6-release"
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /GX /O2 /I "." /I "../../gsm/inc" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /GX /O2 /I "." /I "../../gsm/inc" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,19 +50,19 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\libgsmcodec-i386-vc6-release.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\libgsmcodec-i386-win32-vc6-release.lib"
!ELSEIF "$(CFG)" == "libgsmcodec - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\gsm-i386-vc6-debug"
-# PROP BASE Intermediate_Dir "output\gsm-i386-vc6-debug"
+# PROP BASE Output_Dir "output\gsm-i386-win32-vc6-debug"
+# PROP BASE Intermediate_Dir "output\gsm-i386-win32-vc6-debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\gsm-i386-vc6-debug"
-# PROP Intermediate_Dir "output\gsm-i386-vc6-debug"
+# PROP Output_Dir "output\gsm-i386-win32-vc6-debug"
+# PROP Intermediate_Dir "output\gsm-i386-win32-vc6-debug"
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
@@ -74,7 +74,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\libgsmcodec-i386-vc6-debug.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\libgsmcodec-i386-win32-vc6-debug.lib"
!ENDIF
diff --git a/third_party/build/ilbc/libilbccodec.dsp b/third_party/build/ilbc/libilbccodec.dsp
index 8726aac..679667b 100644
--- a/third_party/build/ilbc/libilbccodec.dsp
+++ b/third_party/build/ilbc/libilbccodec.dsp
@@ -32,17 +32,17 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\ilbc-i386-vc6-release"
-# PROP BASE Intermediate_Dir "output\ilbc-i386-vc6-release"
+# PROP BASE Output_Dir "output\ilbc-i386-win32-vc6-release"
+# PROP BASE Intermediate_Dir "output\ilbc-i386-win32-vc6-release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\ilbc-i386-vc6-release"
-# PROP Intermediate_Dir "output\ilbc-i386-vc6-release"
+# PROP Output_Dir "output\ilbc-i386-win32-vc6-release"
+# PROP Intermediate_Dir "output\ilbc-i386-win32-vc6-release"
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,19 +50,19 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\libilbccodec-i386-vc6-release.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\libilbccodec-i386-win32-vc6-release.lib"
!ELSEIF "$(CFG)" == "libilbccodec - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\ilbc-i386-vc6-debug"
-# PROP BASE Intermediate_Dir "output\ilbc-i386-vc6-debug"
+# PROP BASE Output_Dir "output\ilbc-i386-win32-vc6-debug"
+# PROP BASE Intermediate_Dir "output\ilbc-i386-win32-vc6-debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\ilbc-i386-vc6-debug"
-# PROP Intermediate_Dir "output\ilbc-i386-vc6-debug"
+# PROP Output_Dir "output\ilbc-i386-win32-vc6-debug"
+# PROP Intermediate_Dir "output\ilbc-i386-win32-vc6-debug"
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
@@ -74,7 +74,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\libilbccodec-i386-vc6-debug.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\libilbccodec-i386-win32-vc6-debug.lib"
!ENDIF
@@ -151,10 +151,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\ilbc\iLBC_test.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\ilbc\LPCdecode.c
# End Source File
# Begin Source File
diff --git a/third_party/build/portaudio/libportaudio.dsp b/third_party/build/portaudio/libportaudio.dsp
index 57a105e..688f413 100644
--- a/third_party/build/portaudio/libportaudio.dsp
+++ b/third_party/build/portaudio/libportaudio.dsp
@@ -32,17 +32,17 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\pa-i386-vc6-release"
-# PROP BASE Intermediate_Dir "output\pa-i386-vc6-release"
+# PROP BASE Output_Dir "output\pa-i386-win32-vc6-release"
+# PROP BASE Intermediate_Dir "output\pa-i386-win32-vc6-release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\pa-i386-vc6-release"
-# PROP Intermediate_Dir "output\pa-i386-vc6-release"
+# PROP Output_Dir "output\pa-i386-win32-vc6-release"
+# PROP Intermediate_Dir "output\pa-i386-win32-vc6-release"
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\portaudio\src\common" /I "..\..\portaudio\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PA_ENABLE_DEBUG_OUTPUT" /D "_CRT_SECURE_NO_DEPRECATE" /D "PA_NO_ASIO" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\portaudio\src\common" /I "..\..\portaudio\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PA_ENABLE_DEBUG_OUTPUT" /D "_CRT_SECURE_NO_DEPRECATE" /D "PA_NO_ASIO" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,19 +50,19 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\libportaudio-i386-vc6-release.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\libportaudio-i386-win32-vc6-release.lib"
!ELSEIF "$(CFG)" == "libportaudio - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\pa-i386-vc6-debug"
-# PROP BASE Intermediate_Dir "output\pa-i386-vc6-debug"
+# PROP BASE Output_Dir "output\pa-i386-win32-vc6-debug"
+# PROP BASE Intermediate_Dir "output\pa-i386-win32-vc6-debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\pa-i386-vc6-debug"
-# PROP Intermediate_Dir "output\pa-i386-vc6-debug"
+# PROP Output_Dir "output\pa-i386-win32-vc6-debug"
+# PROP Intermediate_Dir "output\pa-i386-win32-vc6-debug"
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
@@ -74,7 +74,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\libportaudio-i386-vc6-debug.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\libportaudio-i386-win32-vc6-debug.lib"
!ENDIF
diff --git a/third_party/build/resample/config.h b/third_party/build/resample/config.h
new file mode 100644
index 0000000..fde8937
--- /dev/null
+++ b/third_party/build/resample/config.h
@@ -0,0 +1,3 @@
+#define RESAMPLE_HAS_SMALL_FILTER 1
+#define RESAMPLE_HAS_LARGE_FILTER 1
+
diff --git a/third_party/build/resample/libresample.dsp b/third_party/build/resample/libresample.dsp
new file mode 100644
index 0000000..82aab15
--- /dev/null
+++ b/third_party/build/resample/libresample.dsp
@@ -0,0 +1,118 @@
+# Microsoft Developer Studio Project File - Name="libresample" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libresample - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libresample.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libresample.mak" CFG="libresample - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libresample - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libresample - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libresample - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "output\libresample-i386-win32-vc6-release"
+# PROP BASE Intermediate_Dir "output\libresample-i386-win32-vc6-release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "output\libresample-i386-win32-vc6-release"
+# PROP Intermediate_Dir "output\libresample-i386-win32-vc6-release"
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../../resample/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\libresample-i386-win32-vc6-release.lib"
+
+!ELSEIF "$(CFG)" == "libresample - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "output\libresample-i386-win32-vc6-debug"
+# PROP BASE Intermediate_Dir "output\libresample-i386-win32-vc6-debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "output\libresample-i386-win32-vc6-debug"
+# PROP Intermediate_Dir "output\libresample-i386-win32-vc6-debug"
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "../../resample/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\..\lib\libresample-i386-win32-vc6-debug.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "libresample - Win32 Release"
+# Name "libresample - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\resample\src\largefilter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\resample\src\resample.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\resample\src\resamplesubs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\resample\src\smallfilter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\resample\src\stddefs.h
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\resample\include\resamplesubs.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/third_party/build/speex/libspeex.dsp b/third_party/build/speex/libspeex.dsp
index b36818f..a769c1e 100644
--- a/third_party/build/speex/libspeex.dsp
+++ b/third_party/build/speex/libspeex.dsp
@@ -32,17 +32,17 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "output\libspeex-i386-vc6-release"
-# PROP BASE Intermediate_Dir "output\libspeex-i386-vc6-release"
+# PROP BASE Output_Dir "output\libspeex-i386-win32-vc6-release"
+# PROP BASE Intermediate_Dir "output\libspeex-i386-win32-vc6-release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "output\libspeex-i386-vc6-release"
-# PROP Intermediate_Dir "output\libspeex-i386-vc6-release"
+# PROP Output_Dir "output\libspeex-i386-win32-vc6-release"
+# PROP Intermediate_Dir "output\libspeex-i386-win32-vc6-release"
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /GX /Ox /Ot /Og /Oi /Ob2 /I "." /I "../../speex/include" /I "../../../pjlib/include" /D inline=__inline /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /MD /GX /Ox /Ot /Og /Oi /Ob2 /I "." /I "../../speex/include" /I "../../../pjlib/include" /D inline=__inline /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,23 +50,23 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\libspeex-i386-vc6-release.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\libspeex-i386-win32-vc6-release.lib"
!ELSEIF "$(CFG)" == "libspeex - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "output\libspeex-i386-vc6-debug"
-# PROP BASE Intermediate_Dir "output\libspeex-i386-vc6-debug"
+# PROP BASE Output_Dir "output\libspeex-i386-win32-vc6-debug"
+# PROP BASE Intermediate_Dir "output\libspeex-i386-win32-vc6-debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "output\libspeex-i386-vc6-debug"
-# PROP Intermediate_Dir "output\libspeex-i386-vc6-debug"
+# PROP Output_Dir "output\libspeex-i386-win32-vc6-debug"
+# PROP Intermediate_Dir "output\libspeex-i386-win32-vc6-debug"
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /Ob0 /I "." /I "../../speex/include" /I "../../../pjlib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "." /I "../../speex/include" /I "../../../pjlib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +74,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\lib\libspeex-i386-vc6-debug.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\libspeex-i386-win32-vc6-debug.lib"
!ENDIF