summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pjproject-vs8.sln2
-rw-r--r--pjproject.dsw2
-rw-r--r--third_party/build/g7221/libg7221codec.dsp (renamed from third_party/build/g7221/libg7221.dsp)0
-rw-r--r--third_party/build/g7221/libg7221codec.vcproj (renamed from third_party/build/g7221/libg7221.vcproj)38
4 files changed, 20 insertions, 22 deletions
diff --git a/pjproject-vs8.sln b/pjproject-vs8.sln
index b8145558..39785db6 100644
--- a/pjproject-vs8.sln
+++ b/pjproject-vs8.sln
@@ -145,7 +145,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjmedia_test", "pjmedia\bui
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjmedia_audiodev", "pjmedia\build\pjmedia_audiodev.vcproj", "{4281CA5E-1D48-45D4-A991-2718A454B4BA}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7221", "third_party\build\g7221\libg7221.vcproj", "{2A3F241E-682C-47E1-9543-DC28708B406A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7221codec", "third_party\build\g7221\libg7221codec.vcproj", "{2A3F241E-682C-47E1-9543-DC28708B406A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/pjproject.dsw b/pjproject.dsw
index 80ecb291..cf5bc1aa 100644
--- a/pjproject.dsw
+++ b/pjproject.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
###############################################################################
-Project: "libg7221codec"=.\third_party\build\g7221\libg7221.dsp - Package Owner=<4>
+Project: "libg7221codec"=.\third_party\build\g7221\libg7221codec.dsp - Package Owner=<4>
Package=<5>
{{{
diff --git a/third_party/build/g7221/libg7221.dsp b/third_party/build/g7221/libg7221codec.dsp
index cc8adcb1..cc8adcb1 100644
--- a/third_party/build/g7221/libg7221.dsp
+++ b/third_party/build/g7221/libg7221codec.dsp
diff --git a/third_party/build/g7221/libg7221.vcproj b/third_party/build/g7221/libg7221codec.vcproj
index 9ab08934..a5fa227d 100644
--- a/third_party/build/g7221/libg7221.vcproj
+++ b/third_party/build/g7221/libg7221codec.vcproj
@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="libg7221"
+ Name="libg7221codec"
ProjectGUID="{2A3F241E-682C-47E1-9543-DC28708B406A}"
>
<Platforms>
@@ -15,10 +15,9 @@
<Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\output\libg7221-i386-win32-vc6-release"
- IntermediateDirectory=".\output\libg7221-i386-win32-vc6-release"
+ OutputDirectory=".\output\libg7221codec-i386-win32-vc8-release"
+ IntermediateDirectory=".\output\libg7221codec-i386-win32-vc8-release"
ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -45,12 +44,12 @@
AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="true"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\output\libg7221-i386-win32-vc6-release/libg7221.pch"
- AssemblerListingLocation=".\output\libg7221-i386-win32-vc6-release/"
- ObjectFile=".\output\libg7221-i386-win32-vc6-release/"
- ProgramDataBaseFileName=".\output\libg7221-i386-win32-vc6-release/"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation=".\output\libg7221codec-i386-win32-vc8-release/"
+ ObjectFile=".\output\libg7221codec-i386-win32-vc8-release/"
+ ProgramDataBaseFileName=".\output\libg7221codec-i386-win32-vc8-release/"
WarningLevel="3"
SuppressStartupBanner="true"
/>
@@ -67,7 +66,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\libg7221-i386-win32-vc6-release.lib"
+ OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-release.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -79,7 +78,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\output\libg7221-i386-win32-vc6-release/libg7221.bsc"
+ OutputFile=".\output\libg7221codec-i386-win32-vc8-release/libg7221codec.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -90,10 +89,9 @@
</Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\output\libg7221-i386-win32-vc6-debug"
- IntermediateDirectory=".\output\libg7221-i386-win32-vc6-debug"
+ OutputDirectory=".\output\libg7221codec-i386-win32-vc8-debug"
+ IntermediateDirectory=".\output\libg7221codec-i386-win32-vc8-debug"
ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -121,10 +119,10 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
- PrecompiledHeaderFile=".\output\libg7221-i386-win32-vc6-debug/libg7221.pch"
- AssemblerListingLocation=".\output\libg7221-i386-win32-vc6-debug/"
- ObjectFile=".\output\libg7221-i386-win32-vc6-debug/"
- ProgramDataBaseFileName=".\output\libg7221-i386-win32-vc6-debug/"
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation=".\output\libg7221codec-i386-win32-vc8-debug/"
+ ObjectFile=".\output\libg7221codec-i386-win32-vc8-debug/"
+ ProgramDataBaseFileName=".\output\libg7221codec-i386-win32-vc8-debug/"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
@@ -142,7 +140,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\lib\libg7221-i386-win32-vc6-debug.lib"
+ OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-debug.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -154,7 +152,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\output\libg7221-i386-win32-vc6-debug/libg7221.bsc"
+ OutputFile=".\output\libg7221codec-i386-win32-vc8-debug/libg7221codec.bsc"
/>
<Tool
Name="VCFxCopTool"