More ticket #774: replaced dependency to STL

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

3 files changed, 30 insertions, 93 deletions

diff --git a/third_party/build/g7221/Makefile b/third_party/build/g7221/Makefile
index 12529699..60590307 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/basic_op.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.dsp b/third_party/build/g7221/libg7221codec.dsp
index 3567a07d..82cc644a 100644
--- a/third_party/build/g7221/libg7221codec.dsp
+++ b/third_party/build/g7221/libg7221codec.dsp
@@ -43,7 +43,6 @@ RSC=rc.exe
 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 "../../g7221/common" /I "../../g7221/common/stl-files" /I "../../../pjlib/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /c

-# SUBTRACT CPP /Z<none>

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -89,33 +88,29 @@ LIB32=link.exe -lib
 # Begin Group "common"

 

 # PROP Default_Filter ""

-# Begin Group "stl-files"

-

-# PROP Default_Filter ""

 # Begin Source File

 

-SOURCE="..\..\g7221\common\stl-files\basop32.c"

+SOURCE=..\..\g7221\common\basic_op.c

 # End Source File

 # Begin Source File

 

-SOURCE="..\..\g7221\common\stl-files\basop32.h"

+SOURCE=..\..\g7221\common\basic_op.h

 # End Source File

 # Begin Source File

 

-SOURCE="..\..\g7221\common\stl-files\basop32_i.h"

+SOURCE=..\..\g7221\common\basic_op_i.h

 # End Source File

 # Begin Source File

 

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

+SOURCE=..\..\g7221\common\common.c

 # End Source File

 # Begin Source File

 

-SOURCE="..\..\g7221\common\stl-files\typedef.h"

+SOURCE=..\..\g7221\common\count.h

 # End Source File

-# End Group

 # Begin Source File

 

-SOURCE=..\..\g7221\common\common.c

+SOURCE=..\..\g7221\common\defs.h

 # End Source File

 # Begin Source File

 

@@ -137,6 +132,10 @@ SOURCE=..\..\g7221\common\tables.c
 

 SOURCE=..\..\g7221\common\tables.h

 # End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\common\typedef.h

+# End Source File

 # End Group

 # Begin Group "decode"

 

@@ -182,10 +181,6 @@ SOURCE=..\..\g7221\encode\sam2coef.c
 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\..\g7221\common\defs.h

-# End Source File

 # End Group

 # End Target

 # End Project

diff --git a/third_party/build/g7221/libg7221codec.vcproj b/third_party/build/g7221/libg7221codec.vcproj
index 881f8963..fed93a5a 100644
--- a/third_party/build/g7221/libg7221codec.vcproj
+++ b/third_party/build/g7221/libg7221codec.vcproj
@@ -849,6 +849,18 @@
 				Name="common"

 				>

 				<File

+					RelativePath="..\..\g7221\common\basic_op.c"

+					>

+				</File>

+				<File

+					RelativePath="..\..\g7221\common\basic_op.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\g7221\common\basic_op_i.h"

+					>

+				</File>

+				<File

 					RelativePath="..\..\g7221\common\common.c"

 					>

 					<FileConfiguration

@@ -907,6 +919,10 @@
 					</FileConfiguration>

 				</File>

 				<File

+					RelativePath="..\..\g7221\common\count.h"

+					>

+				</File>

+				<File

 					RelativePath="..\..\g7221\common\huff_def.h"

 					>

 				</File>

@@ -1034,84 +1050,10 @@
 					RelativePath="..\..\g7221\common\tables.h"

 					>

 				</File>

-				<Filter

-					Name="stl-files"

+				<File

+					RelativePath="..\..\g7221\common\typedef.h"

 					>

-					<File

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

-						>

-						<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\basop32.h"

-						>

-					</File>

-					<File

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

-						>

-					</File>

-					<File

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

-						>

-					</File>

-					<File

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

-						>

-					</File>

-				</Filter>

+				</File>

 			</Filter>

 			<Filter

 				Name="decode"