Index: trunk/build/HM_vc10.sln =================================================================== --- trunk/build/HM_vc10.sln (revision 17) +++ trunk/build/HM_vc10.sln (revision 42) @@ -5,7 +5,4 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppEncoder", "vc10\TAppEncoder_vc10.vcxproj", "{D759E4E1-D33A-4483-B57B-0FD248E022FE}" - ProjectSection(ProjectDependencies) = postProject - {2B298BE6-DFF0-4BD2-8F26-395FFE7F9EB4} = {2B298BE6-DFF0-4BD2-8F26-395FFE7F9EB4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppCommon", "vc10\TAppCommon_vc10.vcxproj", "{D1E8A1C2-15DB-4C94-80E8-4F70CF0A2DC5}" @@ -20,9 +17,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppRenderer", "vc10\TAppRenderer_vc10.vcxproj", "{3A5A8B26-8CA4-4690-944E-AB78559DE848}" - ProjectSection(ProjectDependencies) = postProject - {2B298BE6-DFF0-4BD2-8F26-395FFE7F9EB4} = {2B298BE6-DFF0-4BD2-8F26-395FFE7F9EB4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLibRenderer", "vc10\TLibRenderer_vc10.vcxproj", "{2B298BE6-DFF0-4BD2-8F26-395FFE7F9EB4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLibExtractor", "vc10\TLibExtractor_vc10.vcxproj", "{27E2C758-E3CE-44CA-A226-83491EC7F798}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppExtractor", "vc10\TAppExtractor_vc10.vcxproj", "{F46F95E9-7174-4328-90DD-092450E4DCF6}" EndProject Global @@ -106,4 +104,16 @@ {2B298BE6-DFF0-4BD2-8F26-395FFE7F9EB4}.Release|x64.ActiveCfg = Release|x64 {2B298BE6-DFF0-4BD2-8F26-395FFE7F9EB4}.Release|x64.Build.0 = Release|x64 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Debug|Win32.ActiveCfg = Debug|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Debug|Win32.Build.0 = Debug|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Debug|x64.ActiveCfg = Debug|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Release|Win32.ActiveCfg = Release|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Release|Win32.Build.0 = Release|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Release|x64.ActiveCfg = Release|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Debug|Win32.ActiveCfg = Debug|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Debug|Win32.Build.0 = Debug|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Debug|x64.ActiveCfg = Debug|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Release|Win32.ActiveCfg = Release|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Release|Win32.Build.0 = Release|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution Index: trunk/build/HM_vc8.sln =================================================================== --- trunk/build/HM_vc8.sln (revision 17) +++ trunk/build/HM_vc8.sln (revision 42) @@ -38,4 +38,15 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLibRenderer", "vc8\TLibRenderer_vc8.vcproj", "{5E87AD84-AC4F-4336-B4EE-549CA210EE4A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLibExtractor", "vc8\TLibExtractor_vc8.vcproj", "{27E2C758-E3CE-44CA-A226-83491EC7F798}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppExtractor", "vc8\TAppExtractor_vc8.vcproj", "{F46F95E9-7174-4328-90DD-092450E4DCF6}" + ProjectSection(ProjectDependencies) = postProject + {F8B77A48-AF6C-4746-A89F-B706ABA6AD94} = {F8B77A48-AF6C-4746-A89F-B706ABA6AD94} + {27E2C758-E3CE-44CA-A226-83491EC7F798} = {27E2C758-E3CE-44CA-A226-83491EC7F798} + {5280C25A-D316-4BE7-AE50-29D72108624F} = {5280C25A-D316-4BE7-AE50-29D72108624F} + {78018D78-F890-47E3-A0B7-09D273F0B11D} = {78018D78-F890-47E3-A0B7-09D273F0B11D} + {8783AD3A-A5CA-42B7-AAC4-A07EB845A684} = {8783AD3A-A5CA-42B7-AAC4-A07EB845A684} + EndProjectSection EndProject Global @@ -119,4 +130,16 @@ {5E87AD84-AC4F-4336-B4EE-549CA210EE4A}.Release|x64.ActiveCfg = Release|x64 {5E87AD84-AC4F-4336-B4EE-549CA210EE4A}.Release|x64.Build.0 = Release|x64 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Debug|Win32.ActiveCfg = Debug|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Debug|Win32.Build.0 = Debug|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Debug|x64.ActiveCfg = Debug|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Release|Win32.ActiveCfg = Release|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Release|Win32.Build.0 = Release|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Release|x64.ActiveCfg = Release|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Debug|Win32.ActiveCfg = Debug|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Debug|Win32.Build.0 = Debug|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Debug|x64.ActiveCfg = Debug|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Release|Win32.ActiveCfg = Release|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Release|Win32.Build.0 = Release|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution Index: trunk/build/HM_vc9.sln =================================================================== --- trunk/build/HM_vc9.sln (revision 17) +++ trunk/build/HM_vc9.sln (revision 42) @@ -38,4 +38,15 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLibRenderer", "vc9\TLibRenderer_vc9.vcproj", "{457993C6-AE2C-4B9B-B5F9-71033279A0B9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLibExtractor", "vc9\TLibExtractor_vc9.vcproj", "{27E2C758-E3CE-44CA-A226-83491EC7F798}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppExtractor", "vc9\TAppExtractor_vc9.vcproj", "{F46F95E9-7174-4328-90DD-092450E4DCF6}" + ProjectSection(ProjectDependencies) = postProject + {F8B77A48-AF6C-4746-A89F-B706ABA6AD94} = {F8B77A48-AF6C-4746-A89F-B706ABA6AD94} + {27E2C758-E3CE-44CA-A226-83491EC7F798} = {27E2C758-E3CE-44CA-A226-83491EC7F798} + {5280C25A-D316-4BE7-AE50-29D72108624F} = {5280C25A-D316-4BE7-AE50-29D72108624F} + {78018D78-F890-47E3-A0B7-09D273F0B11D} = {78018D78-F890-47E3-A0B7-09D273F0B11D} + {D1E8A1C2-15DB-4C94-80E8-4F70CF0A2DC5} = {D1E8A1C2-15DB-4C94-80E8-4F70CF0A2DC5} + EndProjectSection EndProject Global @@ -119,4 +130,16 @@ {457993C6-AE2C-4B9B-B5F9-71033279A0B9}.Release|x64.ActiveCfg = Release|x64 {457993C6-AE2C-4B9B-B5F9-71033279A0B9}.Release|x64.Build.0 = Release|x64 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Debug|Win32.ActiveCfg = Debug|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Debug|Win32.Build.0 = Debug|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Debug|x64.ActiveCfg = Debug|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Release|Win32.ActiveCfg = Release|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Release|Win32.Build.0 = Release|Win32 + {27E2C758-E3CE-44CA-A226-83491EC7F798}.Release|x64.ActiveCfg = Release|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Debug|Win32.ActiveCfg = Debug|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Debug|Win32.Build.0 = Debug|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Debug|x64.ActiveCfg = Debug|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Release|Win32.ActiveCfg = Release|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Release|Win32.Build.0 = Release|Win32 + {F46F95E9-7174-4328-90DD-092450E4DCF6}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution Index: trunk/build/linux/lib/TLibExtractor/makefile =================================================================== --- trunk/build/linux/lib/TLibExtractor/makefile (revision 42) +++ trunk/build/linux/lib/TLibExtractor/makefile (revision 42) @@ -0,0 +1,55 @@ +# the SOURCE definiton lets move your makefile to another position +CONFIG = LIBRARY + +# set pathes to the correct directories +SRC_DIR = ../../../../source/Lib/TLibExtractor +INC_DIR = ../../../../source/Lib/TLibExtractor +LIB_DIR = ../../../../lib +BIN_DIR = ../../../../bin + +SRC_DIR1 = +SRC_DIR2 = +SRC_DIR3 = +SRC_DIR4 = + + +USER_INC_DIRS = -I$(SRC_DIR) +USER_LIB_DIRS = + +# intermediate directory for object files +OBJ_DIR = ./objects + +# the library name +PRJ_NAME = TLibExtractor + +# version information +MAJOR_VER = 0 +MINOR_VER = 1 +VER = $(MAJOR_VER).$(MINOR_VER) + +# defines to set +DEFS = -DMSYS_LINUX + +# set objects +OBJS = \ + $(OBJ_DIR)/TExtrTop.o \ + +LIBS = -lpthread + +DEBUG_LIBS = +RELEASE_LIBS = + +STAT_LIBS = +DYN_LIBS = -ldl + +# the libraries to link with +STAT_DEBUG_LIBS = +STAT_RELEASE_LIBS = +DYN_DEBUG_LIBS = +DYN_RELEASE_LIBS = + +# name of the base makefile +MAKE_FILE_NAME = ../../common/makefile.base + +# include the base makefile +include $(MAKE_FILE_NAME) Index: trunk/build/linux/makefile =================================================================== --- trunk/build/linux/makefile (revision 17) +++ trunk/build/linux/makefile (revision 42) @@ -8,4 +8,5 @@ $(MAKE) -C lib/TLibCommon MM32=$(M32) $(MAKE) -C lib/TLibRenderer MM32=$(M32) + $(MAKE) -C lib/TLibExtractor MM32=$(M32) $(MAKE) -C lib/TLibDecoder MM32=$(M32) $(MAKE) -C lib/TLibEncoder MM32=$(M32) @@ -14,4 +15,5 @@ $(MAKE) -C test/TAppEncoder MM32=$(M32) $(MAKE) -C test/TAppRenderer MM32=$(M32) + $(MAKE) -C test/TAppExtractor MM32=$(M32) debug: @@ -19,4 +21,5 @@ $(MAKE) -C lib/TLibCommon debug MM32=$(M32) $(MAKE) -C lib/TLibRenderer debug MM32=$(M32) + $(MAKE) -C lib/TLibExtractor debug MM32=$(M32) $(MAKE) -C lib/TLibDecoder debug MM32=$(M32) $(MAKE) -C lib/TLibEncoder debug MM32=$(M32) @@ -25,4 +28,5 @@ $(MAKE) -C test/TAppEncoder debug MM32=$(M32) $(MAKE) -C test/TAppRenderer debug MM32=$(M32) + $(MAKE) -C test/TAppExtractor debug MM32=$(M32) release: @@ -30,4 +34,5 @@ $(MAKE) -C lib/TLibCommon release MM32=$(M32) $(MAKE) -C lib/TLibRenderer release MM32=$(M32) + $(MAKE) -C lib/TLibExtractor release MM32=$(M32) $(MAKE) -C lib/TLibDecoder release MM32=$(M32) $(MAKE) -C lib/TLibEncoder release MM32=$(M32) @@ -36,4 +41,5 @@ $(MAKE) -C test/TAppEncoder release MM32=$(M32) $(MAKE) -C test/TAppRenderer release MM32=$(M32) + $(MAKE) -C test/TAppExtractor release MM32=$(M32) clean: @@ -41,4 +47,5 @@ $(MAKE) -C lib/TLibCommon clean MM32=$(M32) $(MAKE) -C lib/TLibRenderer clean MM32=$(M32) + $(MAKE) -C lib/TLibExtractor clean MM32=$(M32) $(MAKE) -C lib/TLibDecoder clean MM32=$(M32) $(MAKE) -C lib/TLibEncoder clean MM32=$(M32) @@ -47,4 +54,3 @@ $(MAKE) -C test/TAppEncoder clean MM32=$(M32) $(MAKE) -C test/TAppRenderer clean MM32=$(M32) - - + $(MAKE) -C test/TAppExtractor clean MM32=$(M32) Index: trunk/build/linux/test/TAppExtractor/makefile =================================================================== --- trunk/build/linux/test/TAppExtractor/makefile (revision 42) +++ trunk/build/linux/test/TAppExtractor/makefile (revision 42) @@ -0,0 +1,58 @@ +# the SOURCE definiton lets you move your makefile to another position +CONFIG = CONSOLE + +# set directories to your wanted values +SRC_DIR = ../../../../source/App/TAppExtractor +INC_DIR = ../../../../source/App/TAppExtractor +LIB_DIR = ../../../../lib +BIN_DIR = ../../../../bin + +SRC_DIR1 = +SRC_DIR2 = +SRC_DIR3 = +SRC_DIR4 = + +USER_INC_DIRS = -I$(SRC_DIR) +USER_LIB_DIRS = + +# intermediate directory for object files +OBJ_DIR = ./objects + +# set executable name +PRJ_NAME = TAppExtractor + +# defines to set +DEFS = -DMSYS_LINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DMSYS_UNIX_LARGEFILE + +# set objects +OBJS = \ + $(OBJ_DIR)/extrmain.o \ + $(OBJ_DIR)/TAppExtrCfg.o \ + $(OBJ_DIR)/TAppExtrTop.o \ + +# set libs to link with +LIBS = -ldl + +DEBUG_LIBS = +RELEASE_LIBS = + +STAT_LIBS = -lpthread +DYN_LIBS = + + +DYN_DEBUG_LIBS = -lTLibExtractord -lTLibDecoderd -lTLibCommond -lTLibVideoIOd -lTAppCommond +DYN_DEBUG_PREREQS = $(LIB_DIR)/libTLibExtractord.a $(LIB_DIR)/libTLibDecoderd.a $(LIB_DIR)/libTLibCommond.a $(LIB_DIR)/libTLibVideoIOd.a $(LIB_DIR)/libTAppCommond.a +STAT_DEBUG_LIBS = -lTLibExtractorStaticd -lTLibDecoderStaticd -lTLibCommonStaticd -lTLibVideoIOStaticd -lTAppCommonStaticd +STAT_DEBUG_PREREQS = $(LIB_DIR)/libTLibExtractorStaticd.a $(LIB_DIR)/libTLibDecoderStaticd.a $(LIB_DIR)/libTLibCommonStaticd.a $(LIB_DIR)/libTLibVideoIOStaticd.a $(LIB_DIR)/libTAppCommonStaticd.a + +DYN_RELEASE_LIBS = -lTLibExtractor -lTLibDecoder -lTLibCommon -lTLibVideoIO -lTAppCommon +DYN_RELEASE_PREREQS = $(LIB_DIR)/libTLibExtractor.a $(LIB_DIR)/libTLibDecoder.a $(LIB_DIR)/libTLibCommon.a $(LIB_DIR)/libTLibVideoIO.a $(LIB_DIR)/libTAppCommon.a +STAT_RELEASE_LIBS = -lTLibExtractorStatic -lTLibDecoderStatic -lTLibCommonStatic -lTLibVideoIOStatic -lTAppCommonStatic +STAT_RELEASE_PREREQS = $(LIB_DIR)/libTLibExtractorStatic.a $(LIB_DIR)/libTLibDecoderStatic.a $(LIB_DIR)/libTLibCommonStatic.a $(LIB_DIR)/libTLibVideoIOStatic.a $(LIB_DIR)/libTAppCommonStatic.a + + +# name of the base makefile +MAKE_FILE_NAME = ../../common/makefile.base + +# include the base makefile +include $(MAKE_FILE_NAME) Index: trunk/build/vc8/TAppExtractor_vc8.vcproj =================================================================== --- trunk/build/vc8/TAppExtractor_vc8.vcproj (revision 42) +++ trunk/build/vc8/TAppExtractor_vc8.vcproj (revision 42) @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/build/vc8/TLibExtractor_vc8.vcproj =================================================================== --- trunk/build/vc8/TLibExtractor_vc8.vcproj (revision 42) +++ trunk/build/vc8/TLibExtractor_vc8.vcproj (revision 42) @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/build/vc9/TAppExtractor_vc9.vcproj =================================================================== --- trunk/build/vc9/TAppExtractor_vc9.vcproj (revision 42) +++ trunk/build/vc9/TAppExtractor_vc9.vcproj (revision 42) @@ -0,0 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/build/vc9/TLibExtractor_vc9.vcproj =================================================================== --- trunk/build/vc9/TLibExtractor_vc9.vcproj (revision 42) +++ trunk/build/vc9/TLibExtractor_vc9.vcproj (revision 42) @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +