Index: trunk/build/linux/makefile
===================================================================
--- trunk/build/linux/makefile	(revision 1313)
+++ trunk/build/linux/makefile	(revision 1413)
@@ -9,4 +9,8 @@
 endif
 
+EXTENSION_360_VIDEO?=0
+export EXTENSION_360_VIDEO
+
+
 all:
 	$(MAKE) -C lib/TLibVideoIO 	MM32=$(M32) ADDDEFS=$(ADDDEFS)
@@ -17,4 +21,9 @@
 	$(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,4 +43,10 @@
 	$(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,4 +66,9 @@
 	$(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,4 +89,10 @@
 
 	$(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,4 +112,10 @@
 	$(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,4 +133,9 @@
 	$(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,4 +153,9 @@
 	$(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,4 +173,9 @@
 	$(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
