Added sample of ps inherited from another ps.
git-svn-id: https://svn.pjsip.org/repos/pjproject/branches/projects/vs-reorg@2609 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/third_party/build/g7221/libg7221codec.vcproj b/third_party/build/g7221/libg7221codec.vcproj
index 4cce458..1a0fbd8 100644
--- a/third_party/build/g7221/libg7221codec.vcproj
+++ b/third_party/build/g7221/libg7221codec.vcproj
@@ -25,7 +25,7 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-release-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
+ InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -263,10 +263,9 @@
</Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
- IntermediateDirectory="$(OutDir)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-debug-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -288,7 +287,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
@@ -299,7 +297,6 @@
BrowseInformationFile="$(IntDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -340,7 +337,6 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-debug-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -421,7 +417,6 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-debug-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -742,7 +737,6 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-debug-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -1055,7 +1049,6 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-release-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
diff --git a/third_party/build/gsm/libgsmcodec.vcproj b/third_party/build/gsm/libgsmcodec.vcproj
index 4e0da66..becf5c6 100644
--- a/third_party/build/gsm/libgsmcodec.vcproj
+++ b/third_party/build/gsm/libgsmcodec.vcproj
@@ -25,7 +25,6 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-debug-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -47,7 +46,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=".,../../gsm/inc"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
@@ -59,7 +57,6 @@
ProgramDataBaseFileName=".\output\gsm-i386-win32-vc8-debug/"
WarningLevel="4"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -2417,11 +2414,11 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
- RelativePath="config.h"
+ RelativePath="..\..\gsm\inc\config.h"
>
</File>
<File
- RelativePath="..\..\gsm\inc\config.h"
+ RelativePath="config.h"
>
</File>
<File
diff --git a/third_party/build/ilbc/libilbccodec.vcproj b/third_party/build/ilbc/libilbccodec.vcproj
index cb5144d..4c0665b 100644
--- a/third_party/build/ilbc/libilbccodec.vcproj
+++ b/third_party/build/ilbc/libilbccodec.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="libilbccodec"
ProjectGUID="{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}"
+ RootNamespace="libilbccodec"
>
<Platforms>
<Platform
@@ -24,7 +25,6 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-debug-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -46,7 +46,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -57,7 +56,6 @@
ProgramDataBaseFileName=".\output\ilbc-i386-win32-vc8-debug/"
WarningLevel="4"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/third_party/build/milenage/libmilenage.vcproj b/third_party/build/milenage/libmilenage.vcproj
index 3e45aed..32171c2 100644
--- a/third_party/build/milenage/libmilenage.vcproj
+++ b/third_party/build/milenage/libmilenage.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="libmilenage"
ProjectGUID="{4BF51C21-5A30-423B-82FE-1ED410E5769D}"
+ RootNamespace="libmilenage"
>
<Platforms>
<Platform
@@ -24,7 +25,6 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-debug-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -46,7 +46,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories="../../../pjlib/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
@@ -58,7 +57,6 @@
ProgramDataBaseFileName=".\output/libmilenage-i386-win32-vc8-debug/"
WarningLevel="4"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/third_party/build/portaudio/libportaudio.vcproj b/third_party/build/portaudio/libportaudio.vcproj
index 24be5c9..a54d198 100644
--- a/third_party/build/portaudio/libportaudio.vcproj
+++ b/third_party/build/portaudio/libportaudio.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="libportaudio"
ProjectGUID="{3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}"
+ RootNamespace="libportaudio"
>
<Platforms>
<Platform
@@ -24,7 +25,6 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-debug-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -46,7 +46,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories="..\..\portaudio\src\common;..\..\portaudio\include;..\..\portaudio\src\os\win;"$(DXSDK_DIR)include""
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO"
MinimalRebuild="true"
@@ -58,7 +57,6 @@
ProgramDataBaseFileName=".\output\pa-i386-win32-vc8-debug/"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/third_party/build/resample/libresample.vcproj b/third_party/build/resample/libresample.vcproj
index b72fadb..f7714dd 100644
--- a/third_party/build/resample/libresample.vcproj
+++ b/third_party/build/resample/libresample.vcproj
@@ -4,6 +4,7 @@
Version="8.00"
Name="libresample"
ProjectGUID="{6794B975-4E84-4F49-B2DC-C31F2224E03E}"
+ RootNamespace="libresample"
>
<Platforms>
<Platform
@@ -24,7 +25,6 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-debug-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -46,7 +46,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=".,../../resample/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
@@ -58,7 +57,6 @@
ProgramDataBaseFileName=".\output\libresample-i386-win32-vc8-debug/"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/third_party/build/speex/libspeex.vcproj b/third_party/build/speex/libspeex.vcproj
index 77a56c0..a490216 100644
--- a/third_party/build/speex/libspeex.vcproj
+++ b/third_party/build/speex/libspeex.vcproj
@@ -25,7 +25,6 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-debug-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -46,7 +45,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=".,../../speex/include,../../../pjlib/include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_CONFIG_H"
RuntimeLibrary="1"
@@ -56,7 +54,6 @@
ProgramDataBaseFileName=".\output\libspeex-i386-win32-vc8-debug/"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/third_party/build/srtp/libsrtp.vcproj b/third_party/build/srtp/libsrtp.vcproj
index 739dfdd..1cfe863 100644
--- a/third_party/build/srtp/libsrtp.vcproj
+++ b/third_party/build/srtp/libsrtp.vcproj
@@ -26,7 +26,6 @@
OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
- InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-debug-defaults.vsprops"
CharacterSet="2"
>
<Tool
@@ -46,7 +45,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
@@ -55,7 +53,6 @@
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"