Changeset 1413 in 3DVCSoftware for trunk/build/linux
- Timestamp:
- 11 Jul 2018, 15:19:49 (7 years ago)
- Location:
- trunk/build/linux
- Files:
-
- 5 edited
-
app/TAppEncoder/makefile (modified) (1 diff)
-
common/makefile.base (modified) (2 diffs)
-
lib/TLibDecoder/makefile (modified) (1 diff)
-
lib/TLibDecoderAnalyser/makefile (modified) (1 diff)
-
makefile (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/build/linux/app/TAppEncoder/makefile
r1313 r1413 57 57 STAT_RELEASE_PREREQS = $(LIB_DIR)/libTLibEncoder$(HBD)Static.a $(LIB_DIR)/libTLibCommon$(HBD)Static.a $(LIB_DIR)/libTLibVideoIO$(HBD)Static.a $(LIB_DIR)/libTAppCommon$(HBD)Static.a $(LIB_DIR)/libTLibRenderer$(HBD)Static.a 58 58 59 ifeq ($(EXTENSION_360_VIDEO), 1) 60 DYN_DEBUG_LIBS += -lTAppEncHelper360$(HBD)d -lTLib360$(HBD)d 61 DYN_DEBUG_PREREQS += $(LIB_DIR)/libTAppEncHelper360$(HBD)d.a $(LIB_DIR)/libTLib360$(HBD)d.a 62 STAT_DEBUG_LIBS += -lTAppEncHelper360$(HBD)Staticd -lTLib360$(HBD)Staticd 63 STAT_DEBUG_PREREQS += $(LIB_DIR)/libTAppEncHelper360$(HBD)Staticd.a $(LIB_DIR)/libTLib360$(HBD)Staticd.a 64 DYN_RELEASE_LIBS += -lTAppEncHelper360$(HBD) -lTLib360$(HBD) 65 DYN_RELEASE_PREREQS += $(LIB_DIR)/libTAppEncHelper360$(HBD).a $(LIB_DIR)/libTLib360$(HBD).a 66 STAT_RELEASE_LIBS += -lTAppEncHelper360$(HBD)Static -lTLib360$(HBD)Static 67 STAT_RELEASE_PREREQS+= $(LIB_DIR)/libTAppEncHelper360$(HBD)Static.a $(LIB_DIR)/libTLib360$(HBD)Static.a 68 endif 59 69 60 70 # name of the base makefile -
trunk/build/linux/common/makefile.base
r1313 r1413 47 47 48 48 # default cpp flags for all configurations 49 #CPPFLAGS = -Wall -fPIC$(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS)50 CPPFLAGS = -fPIC $(DEFS)$(ADDDEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror49 #CPPFLAGS = -Wall $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) 50 CPPFLAGS = $(DEFS) $(ADDDEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror 51 51 52 52 ########## … … 61 61 ifeq ($(HIGHBITDEPTH), 1) 62 62 CPPFLAGS+="-DRExt__HIGH_BIT_DEPTH_SUPPORT=1" 63 endif 64 65 ifeq ($(EXTENSION_360_VIDEO), 1) 66 CPPFLAGS+=-DEXTENSION_360_VIDEO=1 67 else 68 CPPFLAGS+=-DEXTENSION_360_VIDEO=0 63 69 endif 64 70 -
trunk/build/linux/lib/TLibDecoder/makefile
r1313 r1413 51 51 $(OBJ_DIR)/TDecSlice.o \ 52 52 $(OBJ_DIR)/TDecTop.o \ 53 $(OBJ_DIR)/TDecConformance.o \ 53 54 54 55 LIBS = -lpthread -
trunk/build/linux/lib/TLibDecoderAnalyser/makefile
r1313 r1413 51 51 $(OBJ_DIR)/TDecSlice.o \ 52 52 $(OBJ_DIR)/TDecTop.o \ 53 $(OBJ_DIR)/TDecConformance.o \ 53 54 54 55 LIBS = -lpthread -
trunk/build/linux/makefile
r1313 r1413 9 9 endif 10 10 11 EXTENSION_360_VIDEO?=0 12 export EXTENSION_360_VIDEO 13 14 11 15 all: 12 16 $(MAKE) -C lib/TLibVideoIO MM32=$(M32) ADDDEFS=$(ADDDEFS) … … 17 21 $(MAKE) -C lib/TLibExtractor MM32=$(M32) ADDDEFS=$(ADDDEFS) 18 22 $(MAKE) -C lib/TAppCommon MM32=$(M32) ADDDEFS=$(ADDDEFS) 23 @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \ 24 $(MAKE) -C lib/TLib360 MM32=$(M32) ; \ 25 $(MAKE) -C lib/TAppEncHelper360 MM32=$(M32) ; \ 26 $(MAKE) -C app/TApp360Convert MM32=$(M32) ; \ 27 fi 19 28 $(MAKE) -C app/TAppDecoder MM32=$(M32) ADDDEFS=$(ADDDEFS) 20 29 $(MAKE) -C app/TAppEncoder MM32=$(M32) ADDDEFS=$(ADDDEFS) … … 34 43 $(MAKE) -C lib/TLibExtractor debug MM32=$(M32) ADDDEFS=$(ADDDEFS) 35 44 $(MAKE) -C lib/TAppCommon debug MM32=$(M32) ADDDEFS=$(ADDDEFS) 45 @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \ 46 $(MAKE) -C lib/TLib360 debug MM32=$(M32) ; \ 47 $(MAKE) -C lib/TAppEncHelper360 debug MM32=$(M32) ; \ 48 $(MAKE) -C app/TApp360Convert debug MM32=$(M32) ; \ 49 fi 50 36 51 $(MAKE) -C app/TAppDecoder debug MM32=$(M32) ADDDEFS=$(ADDDEFS) 37 52 $(MAKE) -C app/TAppEncoder debug MM32=$(M32) ADDDEFS=$(ADDDEFS) … … 51 66 $(MAKE) -C lib/TLibExtractor release MM32=$(M32) ADDDEFS=$(ADDDEFS) 52 67 $(MAKE) -C lib/TAppCommon release MM32=$(M32) ADDDEFS=$(ADDDEFS) 68 @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \ 69 $(MAKE) -C lib/TLib360 release MM32=$(M32) ; \ 70 $(MAKE) -C lib/TAppEncHelper360 release MM32=$(M32) ; \ 71 $(MAKE) -C app/TApp360Convert release MM32=$(M32) ; \ 72 fi 53 73 $(MAKE) -C app/TAppDecoder release MM32=$(M32) ADDDEFS=$(ADDDEFS) 54 74 $(MAKE) -C app/TAppEncoder release MM32=$(M32) ADDDEFS=$(ADDDEFS) … … 69 89 70 90 $(MAKE) -C lib/TAppCommon clean MM32=$(M32) 91 @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \ 92 $(MAKE) -C lib/TLib360 clean MM32=$(M32) ; \ 93 $(MAKE) -C lib/TAppEncHelper360 clean MM32=$(M32) ; \ 94 $(MAKE) -C app/TApp360Convert clean MM32=$(M32) ; \ 95 fi 96 71 97 $(MAKE) -C app/TAppDecoder clean MM32=$(M32) 72 98 $(MAKE) -C app/TAppEncoder clean MM32=$(M32) … … 86 112 $(MAKE) -C lib/TLibExtractor MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) 87 113 $(MAKE) -C lib/TAppCommon MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) 114 @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \ 115 $(MAKE) -C lib/TLib360 MM32=$(M32) HIGHBITDEPTH=1 ; \ 116 $(MAKE) -C lib/TAppEncHelper360 MM32=$(M32) HIGHBITDEPTH=1 ; \ 117 $(MAKE) -C app/TApp360Convert MM32=$(M32) HIGHBITDEPTH=1 ; \ 118 fi 119 88 120 $(MAKE) -C app/TAppDecoder MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) 89 121 $(MAKE) -C app/TAppEncoder MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) … … 101 133 $(MAKE) -C lib/TLibExtractor debug M32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) 102 134 $(MAKE) -C lib/TAppCommon debug MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) 135 @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \ 136 $(MAKE) -C lib/TLib360 debug MM32=$(M32) HIGHBITDEPTH=1 ; \ 137 $(MAKE) -C lib/TAppEncHelper360 debug MM32=$(M32) HIGHBITDEPTH=1 ; \ 138 $(MAKE) -C app/TApp360Convert debug MM32=$(M32) HIGHBITDEPTH=1 ; \ 139 fi 103 140 $(MAKE) -C app/TAppDecoder debug MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) 104 141 $(MAKE) -C app/TAppEncoder debug MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) … … 116 153 $(MAKE) -C lib/TLibExtractor release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) 117 154 $(MAKE) -C lib/TAppCommon release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) 155 @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \ 156 $(MAKE) -C lib/TLib360 release MM32=$(M32) HIGHBITDEPTH=1 ; \ 157 $(MAKE) -C lib/TAppEncHelper360 release MM32=$(M32) HIGHBITDEPTH=1 ; \ 158 $(MAKE) -C app/TApp360Convert release MM32=$(M32) HIGHBITDEPTH=1 ; \ 159 fi 118 160 $(MAKE) -C app/TAppDecoder release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) 119 161 $(MAKE) -C app/TAppEncoder release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS) … … 131 173 $(MAKE) -C lib/TLibExtractor clean MM32=$(M32) HIGHBITDEPTH=1 132 174 $(MAKE) -C lib/TAppCommon clean MM32=$(M32) HIGHBITDEPTH=1 175 @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \ 176 $(MAKE) -C lib/TLib360 clean MM32=$(M32) HIGHBITDEPTH=1 ; \ 177 $(MAKE) -C lib/TAppEncHelper360 clean MM32=$(M32) HIGHBITDEPTH=1 ; \ 178 $(MAKE) -C app/TApp360Convert clean MM32=$(M32) HIGHBITDEPTH=1 ; \ 179 fi 133 180 $(MAKE) -C app/TAppDecoder clean MM32=$(M32) HIGHBITDEPTH=1 134 181 $(MAKE) -C app/TAppEncoder clean MM32=$(M32) HIGHBITDEPTH=1
Note: See TracChangeset for help on using the changeset viewer.
