Changeset 1413 in 3DVCSoftware for trunk/build/linux/makefile

Timestamp:

11 Jul 2018, 15:19:49 (6 years ago)

Author:

tech

Message:

Merged HTM-16.2-dev@1412

File:

• trunk/build/linux/makefile (modified) (9 diffs)

trunk/build/linux/makefile

@@ -9 +9 @@
 endif
 
+EXTENSION_360_VIDEO?=0
+export EXTENSION_360_VIDEO
+
+
 all:
         $(MAKE) -C lib/TLibVideoIO      MM32=$(M32) ADDDEFS=$(ADDDEFS)
@@ -17 +21 @@
         $(MAKE) -C lib/TLibExtractor    MM32=$(M32) ADDDEFS=$(ADDDEFS)
         $(MAKE) -C lib/TAppCommon       MM32=$(M32) ADDDEFS=$(ADDDEFS)
+        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
+          $(MAKE) -C lib/TLib360                MM32=$(M32) ; \
+          $(MAKE) -C lib/TAppEncHelper360       MM32=$(M32) ; \
+          $(MAKE) -C app/TApp360Convert         MM32=$(M32) ; \
+        fi
         $(MAKE) -C app/TAppDecoder      MM32=$(M32) ADDDEFS=$(ADDDEFS)
         $(MAKE) -C app/TAppEncoder      MM32=$(M32) ADDDEFS=$(ADDDEFS)
@@ -34 +43 @@
         $(MAKE) -C lib/TLibExtractor    debug MM32=$(M32) ADDDEFS=$(ADDDEFS)
         $(MAKE) -C lib/TAppCommon       debug MM32=$(M32) ADDDEFS=$(ADDDEFS)
+        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
+          $(MAKE) -C lib/TLib360                debug MM32=$(M32) ; \
+          $(MAKE) -C lib/TAppEncHelper360       debug MM32=$(M32) ; \
+          $(MAKE) -C app/TApp360Convert         debug MM32=$(M32) ; \
+        fi
+
         $(MAKE) -C app/TAppDecoder      debug MM32=$(M32) ADDDEFS=$(ADDDEFS)
         $(MAKE) -C app/TAppEncoder      debug MM32=$(M32) ADDDEFS=$(ADDDEFS)
@@ -51 +66 @@
         $(MAKE) -C lib/TLibExtractor    release MM32=$(M32) ADDDEFS=$(ADDDEFS)
         $(MAKE) -C lib/TAppCommon       release MM32=$(M32) ADDDEFS=$(ADDDEFS)
+        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
+          $(MAKE) -C lib/TLib360                release MM32=$(M32) ; \
+          $(MAKE) -C lib/TAppEncHelper360       release MM32=$(M32) ; \
+          $(MAKE) -C app/TApp360Convert         release MM32=$(M32) ; \
+        fi
         $(MAKE) -C app/TAppDecoder      release MM32=$(M32) ADDDEFS=$(ADDDEFS)
         $(MAKE) -C app/TAppEncoder      release MM32=$(M32) ADDDEFS=$(ADDDEFS)
@@ -69 +89 @@
 
         $(MAKE) -C lib/TAppCommon       clean MM32=$(M32)
+        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
+          $(MAKE) -C lib/TLib360                  clean MM32=$(M32) ; \
+          $(MAKE) -C lib/TAppEncHelper360         clean MM32=$(M32) ; \
+          $(MAKE) -C app/TApp360Convert           clean MM32=$(M32) ; \
+        fi
+
         $(MAKE) -C app/TAppDecoder      clean MM32=$(M32)
         $(MAKE) -C app/TAppEncoder      clean MM32=$(M32)
@@ -86 +112 @@
         $(MAKE) -C lib/TLibExtractor    MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
         $(MAKE) -C lib/TAppCommon       MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
+        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
+          $(MAKE) -C lib/TLib360                MM32=$(M32) HIGHBITDEPTH=1 ; \
+          $(MAKE) -C lib/TAppEncHelper360       MM32=$(M32) HIGHBITDEPTH=1 ; \
+          $(MAKE) -C app/TApp360Convert         MM32=$(M32) HIGHBITDEPTH=1 ; \
+        fi
+
         $(MAKE) -C app/TAppDecoder      MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
         $(MAKE) -C app/TAppEncoder      MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
@@ -101 +133 @@
         $(MAKE) -C lib/TLibExtractor    debug M32=$(M32)  HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
         $(MAKE) -C lib/TAppCommon       debug MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
+        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
+          $(MAKE) -C lib/TLib360                debug MM32=$(M32) HIGHBITDEPTH=1 ; \
+          $(MAKE) -C lib/TAppEncHelper360       debug MM32=$(M32) HIGHBITDEPTH=1 ; \
+          $(MAKE) -C app/TApp360Convert         debug MM32=$(M32) HIGHBITDEPTH=1 ; \
+        fi
         $(MAKE) -C app/TAppDecoder      debug MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
         $(MAKE) -C app/TAppEncoder      debug MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
@@ -116 +153 @@
         $(MAKE) -C lib/TLibExtractor    release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
         $(MAKE) -C lib/TAppCommon       release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
+        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
+          $(MAKE) -C lib/TLib360                release MM32=$(M32) HIGHBITDEPTH=1 ; \
+          $(MAKE) -C lib/TAppEncHelper360       release MM32=$(M32) HIGHBITDEPTH=1 ; \
+          $(MAKE) -C app/TApp360Convert         release MM32=$(M32) HIGHBITDEPTH=1 ; \
+        fi
         $(MAKE) -C app/TAppDecoder      release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
         $(MAKE) -C app/TAppEncoder      release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
@@ -131 +173 @@
         $(MAKE) -C lib/TLibExtractor    clean MM32=$(M32) HIGHBITDEPTH=1  
         $(MAKE) -C lib/TAppCommon       clean MM32=$(M32) HIGHBITDEPTH=1
+        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
+          $(MAKE) -C lib/TLib360                  clean MM32=$(M32) HIGHBITDEPTH=1 ; \
+          $(MAKE) -C lib/TAppEncHelper360         clean MM32=$(M32) HIGHBITDEPTH=1 ; \
+          $(MAKE) -C app/TApp360Convert           clean MM32=$(M32) HIGHBITDEPTH=1 ; \
+        fi
         $(MAKE) -C app/TAppDecoder      clean MM32=$(M32) HIGHBITDEPTH=1
         $(MAKE) -C app/TAppEncoder      clean MM32=$(M32) HIGHBITDEPTH=1