Changeset 1313 in 3DVCSoftware for trunk/build/linux/lib/TLibCommon/makefile

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/build/linux/lib/TLibCommon/makefile (modified) (5 diffs)

trunk/build/linux/lib/TLibCommon/makefile

@@ -17 +17 @@
 USER_LIB_DIRS   =
 
+ifeq ($(HIGHBITDEPTH), 1)
+HBD=HighBitDepth
+else
+HBD=
+endif
+
 # intermediate directory for object files
-OBJ_DIR                 = ./objects
+OBJ_DIR                 = ./objects$(HBD)
 
 # the library name
-PRJ_NAME                = TLibCommon
+PRJ_NAME                = TLibCommon$(HBD)
 
 # version information
@@ -33 +39 @@
 # set objects
 OBJS            = \
+                        $(OBJ_DIR)/Debug.o \
+                        $(OBJ_DIR)/TComPicYuv.o \
+                        $(OBJ_DIR)/TComYuv.o \
                         $(OBJ_DIR)/ContextModel.o \
                         $(OBJ_DIR)/ContextModel3DBuffer.o \
@@ -39 +48 @@
                         $(OBJ_DIR)/TComSampleAdaptiveOffset.o \
                         $(OBJ_DIR)/TComBitStream.o \
+                        $(OBJ_DIR)/TComChromaFormat.o \
                         $(OBJ_DIR)/TComDataCU.o \
                         $(OBJ_DIR)/TComLoopFilter.o \
@@ -45 +55 @@
                         $(OBJ_DIR)/TComPic.o \
                         $(OBJ_DIR)/TComPicSym.o \
-                        $(OBJ_DIR)/TComPicYuv.o \
                         $(OBJ_DIR)/TComPicYuvMD5.o \
                         $(OBJ_DIR)/TComPrediction.o \
@@ -52 +61 @@
                         $(OBJ_DIR)/TComSlice.o \
                         $(OBJ_DIR)/TComTrQuant.o \
-                        $(OBJ_DIR)/TComYuv.o \
+                        $(OBJ_DIR)/TComTU.o \
                         $(OBJ_DIR)/TComInterpolationFilter.o \
                         $(OBJ_DIR)/libmd5.o \