Context navigation

← Previous change
Next change →

Changeset 1029 in SHVCSoftware for branches/SHM-dev/build/linux/lib/TLibEncoder

Timestamp:

26 Feb 2015, 00:21:54 (10 years ago)

Author:

seregin

Message:

merge with SHM-upgrade branch

Location:

branches/SHM-dev

Files:

: 2 edited

. (modified) (1 prop)
build/linux/lib/TLibEncoder/makefile (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/SHM-dev

Property svn:mergeinfo changed

/branches/SHM-upgrade (added)

merged: 915-922,926-929,931,933,935-936,938-940,945-948,955-957,959,961-963,965,967,970,972,974-975,977,979,981,983,985,987,989,992,994,996,998,1000,1002-1003,1006,1008,1010,1012,1014,1016,1018-1019,1021-1022,1024,1027-1028

branches/SHM-dev/build/linux/lib/TLibEncoder/makefile

-                      r713
+                      r1029
 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

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: