Changeset 1313 in 3DVCSoftware for trunk/build/linux/lib/TLibEncoder/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/TLibEncoder/makefile (modified) (3 diffs)

trunk/build/linux/lib/TLibEncoder/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                = TLibEncoder
+PRJ_NAME                = TLibEncoder$(HBD)
 
 # version information
@@ -34 +40 @@
 OBJS            = \
                         $(OBJ_DIR)/NALwrite.o \
+                        $(OBJ_DIR)/SEIEncoder.o \
                         $(OBJ_DIR)/SEIwrite.o \
                         $(OBJ_DIR)/SyntaxElementWriter.o \
@@ -39 +46 @@
                         $(OBJ_DIR)/TEncBinCoderCABACCounter.o \
                         $(OBJ_DIR)/TEncSampleAdaptiveOffset.o \
-                        $(OBJ_DIR)/TEncAnalyze.o \
                         $(OBJ_DIR)/TEncCavlc.o \
                         $(OBJ_DIR)/TEncCu.o \