More ticket #774: compilation error for VS8 and make build system due to last modifications in libg7221codec and pjmedia_test

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2617 74dad513-b988-da41-8d7b-12977e46ad98

2 files changed, 105 insertions, 159 deletions

diff --git a/third_party/build/g7221/Makefile b/third_party/build/g7221/Makefile
index 16758171..12529699 100644
--- a/third_party/build/g7221/Makefile
+++ b/third_party/build/g7221/Makefile
@@ -21,7 +21,7 @@ export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
 
 export G7221_CODEC_SRCDIR = ../../g7221
 export G7221_CODEC_OBJS = common/common.o common/huff_tab.o common/tables.o \
-                	common/stl-files/basop32.o common/stl-files/count.o \
+                	common/stl-files/basop32.o  \
                 	decode/coef2sam.o decode/dct4_s.o decode/decoder.o \
                 	encode/dct4_a.o encode/sam2coef.o encode/encoder.o
 
diff --git a/third_party/build/g7221/libg7221codec.vcproj b/third_party/build/g7221/libg7221codec.vcproj
index 20939d9f..881f8963 100644
--- a/third_party/build/g7221/libg7221codec.vcproj
+++ b/third_party/build/g7221/libg7221codec.vcproj
@@ -19,7 +19,7 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			UseOfMFC="0"

@@ -46,7 +46,7 @@
 				Optimization="3"

 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

-				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -93,13 +93,10 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

+			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -118,35 +115,20 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile=""

-				AssemblerListingLocation="$(OutDir)"

-				ObjectFile="$(OutDir)"

-				ProgramDataBaseFileName="$(OutDir)"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

+				ExecutionBucket="7"

+				Optimization="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-debug.lib"

-				SuppressStartupBanner="true"

+				Name="VCLinkerTool"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -156,19 +138,25 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\output\libg7221codec-i386-win32-vc8-debug/libg7221codec.bsc"

 			/>

 			<Tool

-				Name="VCFxCopTool"

+				Name="VCCodeSignTool"

 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

 			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Win32"

-			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			Name="Debug|Win32"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			UseOfMFC="0"

@@ -192,27 +180,26 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="1"

-				FavorSizeOrSpeed="2"

-				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

+				Optimization="0"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

 				PrecompiledHeaderFile=""

 				AssemblerListingLocation="$(OutDir)"

 				ObjectFile="$(OutDir)"

 				ProgramDataBaseFileName="$(OutDir)"

 				WarningLevel="4"

 				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="_DEBUG"

 				Culture="1033"

 			/>

 			<Tool

@@ -220,7 +207,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-release.lib"

+				OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-debug.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -232,7 +219,7 @@
 			<Tool

 				Name="VCBscMakeTool"

 				SuppressStartupBanner="true"

-				OutputFile=".\output\libg7221codec-i386-win32-vc8-release/libg7221codec.bsc"

+				OutputFile=".\output\libg7221codec-i386-win32-vc8-debug/libg7221codec.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -242,13 +229,10 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Win32"

-			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

+			OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

+			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -267,36 +251,19 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="1"

-				FavorSizeOrSpeed="2"

-				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=""

-				AssemblerListingLocation="$(OutDir)"

-				ObjectFile="$(OutDir)"

-				ProgramDataBaseFileName="$(OutDir)"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

+				ExecutionBucket="7"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-release.lib"

-				SuppressStartupBanner="true"

+				Name="VCLinkerTool"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -306,21 +273,30 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\output\libg7221codec-i386-win32-vc8-release/libg7221codec.bsc"

 			/>

 			<Tool

-				Name="VCFxCopTool"

+				Name="VCCodeSignTool"

 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

 			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

-			OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"

+			Name="Release-Dynamic|Win32"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\"

 			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

+			ConfigurationType="4"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -339,20 +315,36 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

 				Optimization="3"

+				InlineFunctionExpansion="1"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(OutDir)"

+				ObjectFile="$(OutDir)"

+				ProgramDataBaseFileName="$(OutDir)"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLinkerTool"

+				Name="VCLibrarianTool"

+				OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-release.lib"

+				SuppressStartupBanner="true"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -362,24 +354,18 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\output\libg7221codec-i386-win32-vc8-release/libg7221codec.bsc"

 			/>

 			<Tool

-				Name="VCCodeSignTool"

+				Name="VCFxCopTool"

 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

 			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

+			Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

 			OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

@@ -402,6 +388,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				ExecutionBucket="7"

+				Optimization="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -440,10 +427,13 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

-			OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"

+			Name="Release-Static|Win32"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\"

 			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="1"

+			ConfigurationType="4"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -462,20 +452,36 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

 				Optimization="3"

+				InlineFunctionExpansion="1"

+				FavorSizeOrSpeed="2"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=""

+				AssemblerListingLocation="$(OutDir)"

+				ObjectFile="$(OutDir)"

+				ProgramDataBaseFileName="$(OutDir)"

+				WarningLevel="4"

+				SuppressStartupBanner="true"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLinkerTool"

+				Name="VCLibrarianTool"

+				OutputFile="..\..\lib\libg7221codec-i386-win32-vc8-release.lib"

+				SuppressStartupBanner="true"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -485,21 +491,15 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\output\libg7221codec-i386-win32-vc8-release/libg7221codec.bsc"

 			/>

 			<Tool

-				Name="VCCodeSignTool"

+				Name="VCFxCopTool"

 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

 			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

 		</Configuration>

 		<Configuration

 			Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

@@ -565,7 +565,7 @@
 		</Configuration>

 		<Configuration

 			Name="Debug-Static|Win32"

-			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			UseOfMFC="0"

@@ -590,7 +590,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -702,7 +702,7 @@
 		</Configuration>

 		<Configuration

 			Name="Debug-Dynamic|Win32"

-			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)"

+			OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="4"

 			UseOfMFC="0"

@@ -727,7 +727,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -1100,62 +1100,8 @@
 						>

 					</File>

 					<File

-						RelativePath="..\..\g7221\common\stl-files\count.c"

+						RelativePath="..\..\g7221\common\stl-files\basop32_i.h"

 						>

-						<FileConfiguration

-							Name="Release|Win32"

-							>

-							<Tool

-								Name="VCCLCompilerTool"

-								AdditionalIncludeDirectories=""

-								PreprocessorDefinitions=""

-							/>

-						</FileConfiguration>

-						<FileConfiguration

-							Name="Debug|Win32"

-							>

-							<Tool

-								Name="VCCLCompilerTool"

-								AdditionalIncludeDirectories=""

-								PreprocessorDefinitions=""

-							/>

-						</FileConfiguration>

-						<FileConfiguration

-							Name="Release-Dynamic|Win32"

-							>

-							<Tool

-								Name="VCCLCompilerTool"

-								AdditionalIncludeDirectories=""

-								PreprocessorDefinitions=""

-							/>

-						</FileConfiguration>

-						<FileConfiguration

-							Name="Release-Static|Win32"

-							>

-							<Tool

-								Name="VCCLCompilerTool"

-								AdditionalIncludeDirectories=""

-								PreprocessorDefinitions=""

-							/>

-						</FileConfiguration>

-						<FileConfiguration

-							Name="Debug-Static|Win32"

-							>

-							<Tool

-								Name="VCCLCompilerTool"

-								AdditionalIncludeDirectories=""

-								PreprocessorDefinitions=""

-							/>

-						</FileConfiguration>

-						<FileConfiguration

-							Name="Debug-Dynamic|Win32"

-							>

-							<Tool

-								Name="VCCLCompilerTool"

-								AdditionalIncludeDirectories=""

-								PreprocessorDefinitions=""

-							/>

-						</FileConfiguration>

 					</File>

 					<File

 						RelativePath="..\..\g7221\common\stl-files\count.h"