Changeset 345 in SHVCSoftware for trunk/build

Timestamp:

17 Aug 2013, 06:27:19 (12 years ago)

Author:

seregin

Message:

merge SHM-3.0-dev branch

Location:

trunk

Files:

• . (modified) (1 prop)
• build/HM_vc10.sln (modified) (2 diffs)
• build/linux/app/TAppDownConvert (copied) (copied from branches/SHM-3.0-dev/build/linux/app/TAppDownConvert)
• build/linux/makefile (modified) (4 diffs)
• build/vc10/TAppDownConvert (copied) (copied from branches/SHM-3.0-dev/build/vc10/TAppDownConvert)

trunk/build/HM_vc10.sln

@@ -15 +15 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLibVideoIO", "vc10\TLibVideoIO_vc10.vcxproj", "{5280C25A-D316-4BE7-AE50-29D72108624F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppDownConvert", "vc10\TAppDownConvert\TAppDownConvert.vcxproj", "{FB952E1B-681F-4461-9C8B-4F1F8B70E58B}"
 EndProject
 Global
@@ -80 +82 @@
                 {5280C25A-D316-4BE7-AE50-29D72108624F}.Release|x64.ActiveCfg = Release|x64
                 {5280C25A-D316-4BE7-AE50-29D72108624F}.Release|x64.Build.0 = Release|x64
+                {FB952E1B-681F-4461-9C8B-4F1F8B70E58B}.Debug|Win32.ActiveCfg = Debug|Win32
+                {FB952E1B-681F-4461-9C8B-4F1F8B70E58B}.Debug|Win32.Build.0 = Debug|Win32
+                {FB952E1B-681F-4461-9C8B-4F1F8B70E58B}.Debug|x64.ActiveCfg = Debug|x64
+                {FB952E1B-681F-4461-9C8B-4F1F8B70E58B}.Debug|x64.Build.0 = Debug|x64
+                {FB952E1B-681F-4461-9C8B-4F1F8B70E58B}.Release|Win32.ActiveCfg = Release|Win32
+                {FB952E1B-681F-4461-9C8B-4F1F8B70E58B}.Release|Win32.Build.0 = Release|Win32
+                {FB952E1B-681F-4461-9C8B-4F1F8B70E58B}.Release|x64.ActiveCfg = Release|x64
+                {FB952E1B-681F-4461-9C8B-4F1F8B70E58B}.Release|x64.Build.0 = Release|x64
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

trunk/build/linux/makefile

@@ -12 +12 @@
         $(MAKE) -C app/TAppDecoder      MM32=$(M32)
         $(MAKE) -C app/TAppEncoder      MM32=$(M32)
+        $(MAKE) -C app/TAppDownConvert  MM32=$(M32)     
         $(MAKE) -C utils/annexBbytecount       MM32=$(M32)
         $(MAKE) -C utils/convert_NtoMbit_YCbCr MM32=$(M32)
@@ -23 +24 @@
         $(MAKE) -C app/TAppDecoder      debug MM32=$(M32)
         $(MAKE) -C app/TAppEncoder      debug MM32=$(M32)
+        $(MAKE) -C app/TAppDownConvert  debug MM32=$(M32)
         $(MAKE) -C utils/annexBbytecount       debug MM32=$(M32)
         $(MAKE) -C utils/convert_NtoMbit_YCbCr debug MM32=$(M32)
@@ -34 +36 @@
         $(MAKE) -C app/TAppDecoder      release MM32=$(M32)
         $(MAKE) -C app/TAppEncoder      release MM32=$(M32)
+        $(MAKE) -C app/DownConvert      release MM32=$(M32)
         $(MAKE) -C utils/annexBbytecount       release MM32=$(M32)
         $(MAKE) -C utils/convert_NtoMbit_YCbCr release MM32=$(M32)
@@ -45 +48 @@
         $(MAKE) -C app/TAppDecoder      clean MM32=$(M32)
         $(MAKE) -C app/TAppEncoder      clean MM32=$(M32)
+        $(MAKE) -C app/TAppDownConvert  clean MM32=$(M32)
         $(MAKE) -C utils/annexBbytecount       clean MM32=$(M32)
         $(MAKE) -C utils/convert_NtoMbit_YCbCr clean MM32=$(M32)